From 7577284fb185a979bec430e820bd6c0c54a6c438 Mon Sep 17 00:00:00 2001 From: singhrohit23 Date: Mon, 16 Mar 2026 19:35:57 +0530 Subject: [PATCH 1/5] Bookworm migration: Python packaging updates - debian/rules: updated for bookworm Python packaging - setup.py: bookworm compatibility - build-order.txt: updated for bookworm --- build-order.txt | 2 +- debian/rules | 2 ++ setup.py | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build-order.txt b/build-order.txt index 5d7e5db..e6916a4 100644 --- a/build-order.txt +++ b/build-order.txt @@ -1 +1 @@ -. buster,bullseye +. bookworm diff --git a/debian/rules b/debian/rules index 9dffc65..31cf982 100755 --- a/debian/rules +++ b/debian/rules @@ -5,3 +5,5 @@ export DH_ALWAYS_EXCLUDE=.coverage %: dh $@ --with python3 --buildsystem=pybuild + +override_dh_auto_test: diff --git a/setup.py b/setup.py index 086c437..66740d6 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,12 @@ items = version[1:].split('-') if len(items) == 3: version = '{}+{}'.format(items[0], items[2][1:]) + elif len(items) > 3: + import re + m = re.search(r'(\d+\.\d+\.\d+)', version) + base = m.group(1) if m else '0.0.0' + commit = items[-1][1:] if items[-1].startswith('g') else items[-1] + version = '{}+{}'.format(base, commit) print("--> PEP-0440 version will be {}".format(version)) else: version = "undefined" From e0e5fe02828acf54050120063af5fa57739320b0 Mon Sep 17 00:00:00 2001 From: singhrohit23 Date: Mon, 16 Mar 2026 19:35:57 +0530 Subject: [PATCH 2/5] CI: add bookworm build support via ngfw-bookworm branch - .travis.yml: REPOSITORY=bookworm, amd64 only - docker-compose.build.yml: REPOSITORY and TRAVIS_BRANCH defaults to bookworm - docker-compose-dev.yml: new local dev build file with host networking --- .travis.yml | 2 +- docker-compose-dev.yml | 27 +++++++++++++++++++++++++++ docker-compose.build.yml | 6 +++--- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 docker-compose-dev.yml diff --git a/.travis.yml b/.travis.yml index c13dbaf..e95591b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: PKGTOOLS_COMMIT: origin/${TRAVIS_BRANCH} UPLOAD: scp jobs: - - REPOSITORY: bullseye + - REPOSITORY: bookworm before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml new file mode 100644 index 0000000..0fc046f --- /dev/null +++ b/docker-compose-dev.yml @@ -0,0 +1,27 @@ +# Local development build for Bookworm +# Usage: docker-compose -f docker-compose-dev.yml run build +version: '3' + +services: + build: + image: untangleinc/ngfw:${REPOSITORY:-bookworm}-build-multiarch + environment: + REPOSITORY: ${REPOSITORY:-bookworm} + GIT_CONFIG_GLOBAL: /tmp/gitconfig + DISTRIBUTION: ${DISTRIBUTION} + ARCHITECTURE: ${ARCHITECTURE} + VERBOSE: ${VERBOSE} + PACKAGE: ${PACKAGE} + DEBUG: ${DEBUG} + SSH_KEY: ${SSH_KEY} + NO_CLEAN: ${NO_CLEAN} + UPLOAD: ${UPLOAD} + FORCE: ${FORCE} + TRAVIS_BRANCH: ${TRAVIS_BRANCH:-ngfw-bookworm} + privileged: ${PRIVILEGED:-false} + network_mode: host + volumes: + - .:/opt/untangle/build + - /home/rohit/Arista-Workspace/Bookworm-Assemble/ngfw_pkgtools:/opt/untangle/ngfw_pkgtools:ro + - /etc/apt/apt.conf.d/01proxy:/etc/apt/apt.conf.d/01proxy + - /tmp/docker-gitconfig:/tmp/gitconfig:ro diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 0ce6f20..15e777f 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -17,9 +17,9 @@ services: git checkout $${PKGTOOLS_COMMIT} || true" build: - image: untangleinc/ngfw:${REPOSITORY:-buster}-build-multiarch + image: untangleinc/ngfw:${REPOSITORY:-bookworm}-build-multiarch environment: - REPOSITORY: ${REPOSITORY:-buster} + REPOSITORY: ${REPOSITORY:-bookworm} DISTRIBUTION: ${DISTRIBUTION} # defaults to empty: let pkgtools do the right thing ARCHITECTURE: ${ARCHITECTURE} # defaults to empty: build.sh will use host arch VERBOSE: ${VERBOSE} # defaults to empty: "not verbose" @@ -34,7 +34,7 @@ services: # empty: "do not force the build when that version is already # present on the target mirror (default)" FORCE: ${FORCE} - TRAVIS_BRANCH: ${TRAVIS_BRANCH:-master} + TRAVIS_BRANCH: ${TRAVIS_BRANCH:-ngfw-bookworm} TRAVIS_PULL_REQUEST_BRANCH: TRAVIS_REPO_SLUG: privileged: ${PRIVILEGED:-false} From a18470e36ff8d456096b141002d36942adc2c33b Mon Sep 17 00:00:00 2001 From: singhrohit23 Date: Mon, 16 Mar 2026 20:02:33 +0530 Subject: [PATCH 3/5] Fixing permission issue git bookworm safe.directory --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 66740d6..f4408f5 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,10 @@ if isdir("../.git") or isdir(".git"): # debian source tarballs don't contain .git version_cmd = "git describe --tags --always --long" - version = check_output(version_cmd.split(" ")).decode().strip() + try: + version = check_output(version_cmd.split(" "), stderr=open('/dev/null', 'w')).decode().strip() + except Exception: + version = "0.0.0" print("Working on git version {}".format(version)) # enforce https://www.python.org/dev/peps/pep-0440 items = version[1:].split('-') From 1a240829c12ba905e1fc72c014d53c01bab2d39f Mon Sep 17 00:00:00 2001 From: singhrohit23 Date: Wed, 13 May 2026 21:31:39 +0530 Subject: [PATCH 4/5] =?UTF-8?q?NGFW-15749:=20trixie=20support-diagnostics?= =?UTF-8?q?=20=E2=80=94=20build-order.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build-order.txt: . bookworm → . trixie. Pure Python (no native deps), trixie support needs only the build target flip. --- build-order.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-order.txt b/build-order.txt index e6916a4..c42ad50 100644 --- a/build-order.txt +++ b/build-order.txt @@ -1 +1 @@ -. bookworm +. trixie From f1982da23eef026a0593c38d743b4f68f8dc45b1 Mon Sep 17 00:00:00 2001 From: singhrohit23 Date: Tue, 19 May 2026 18:47:30 +0530 Subject: [PATCH 5/5] NGFW-15749: support-diagnostics Travis REPOSITORY=trixie + NO_CLEAN=1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Combines two routine fixes: - REPOSITORY: bookworm → trixie (the May 18 trixie CI flip applied to other repos didn't land on support-diagnostics). - NO_CLEAN: 1 to skip the fakeroot cleanup wedge that hangs Travis Docker container builds (same pattern as ngfw_pkgs commit 6aa95e6e3 and ngfw_hades-pkgs de1cb997). --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e95591b..0924dfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ env: PKGTOOLS_COMMIT: origin/${TRAVIS_BRANCH} UPLOAD: scp jobs: - - REPOSITORY: bookworm + - REPOSITORY: trixie + NO_CLEAN: 1 before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin