From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 15 Aug 2025 12:45:13 +0000 (+0200)
Subject: testing: Install required packages in venv of updated strongTNC
X-Git-Tag: 6.0.3dr1~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1cd747126278789f749101fc27023b09d79aca;p=thirdparty%2Fstrongswan.git

testing: Install required packages in venv of updated strongTNC

Update revision for some dependency updates.  While python3-setuptools is
installed on the system, the venv apparently can't use it.  legacy-cgi is
required to use that old Django version with newer Python releases.
---

diff --git a/testing/scripts/recipes/015_strongTNC.mk b/testing/scripts/recipes/015_strongTNC.mk
index 673b4b09e9..f95d8a72e9 100644
--- a/testing/scripts/recipes/015_strongTNC.mk
+++ b/testing/scripts/recipes/015_strongTNC.mk
@@ -1,13 +1,15 @@
 #!/usr/bin/make
 
 PKG = strongTNC
-REV = 1.0.2
+REV = f0ed6fa8ef6bcde56283c6da1bdbdaa3d651eb11
 DIR = $(PKG)-$(REV)
 ZIP = $(PKG)-$(REV).zip
 SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip
 DEPS = $(PKG)-deps
 VENV = /usr/local/venvs/tnc
 
+EXTRAS = setuptools legacy-cgi
+
 all: install
 
 $(ZIP):
@@ -19,10 +21,10 @@ $(ZIP):
 
 .$(PKG)-deps-$(REV): .$(PKG)-unpacked-$(REV)
 	python3 -m venv $(VENV)
-	$(VENV)/bin/pip download -d $(DEPS) -r $(DIR)/requirements.txt
+	$(VENV)/bin/pip download -d $(DEPS) -r $(DIR)/requirements.txt $(EXTRAS)
 	@touch $@
 
 install: .$(PKG)-deps-$(REV)
 	python3 -m venv $(VENV)
-	$(VENV)/bin/pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt
+	$(VENV)/bin/pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt $(EXTRAS)
 	cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc