denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Switch to Python 3

Browse Source 
Both swidGenerator and strongTNC were migrated to Python 3.
This allows to migrate all testing scripts to Python 3, too.
This commit is contained in:
Andreas Steffen
2021-09-21 09:47:43 +02:00
committed by Tobias Brunner
parent a5662e8f6e
commit 3e2841572b
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-baseimage
+2 -2
View File
@@ -19,8 +19,8 @@ INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libltdl-dev,wget,gnupg,man-db
INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace
INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev
INC=$INC,python,python-setuptools,python-dev,python-pip,apt-transport-https
INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi,iptables-dev
INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,apt-transport-https
INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3,iptables-dev
INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute
case "$BASEIMGSUITE" in
jessie)
testing/scripts/recipes/011_botan.mk
+1 -1
View File
@@ -23,7 +23,7 @@ all: install
@rm -f .$(PKG)-checkout-* && touch $@
.$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
cd $(PKG) && python ./configure.py $(CONFIG_OPTS) && make -j $(NUM_CPUS)
cd $(PKG) && python3 ./configure.py $(CONFIG_OPTS) && make -j $(NUM_CPUS)
@rm -f .$(PKG)-built-* && touch $@
install: .$(PKG)-built-$(REV)
testing/scripts/recipes/013_strongswan.mk
+2 -2
View File
@@ -129,6 +129,6 @@ build: configure
install: build
cd $(BUILDDIR) && make -j install && \
cd $(DIR)/src/libcharon/plugins/vici/python && python setup.py install
cd $(DIR)/src/libcharon/plugins/vici/python && python3 setup.py install
# for Python-based updown scripts
pip install python-daemon
pip3 install python-daemon
testing/scripts/recipes/014_swid_generator.mk
+1 -1
View File
@@ -17,4 +17,4 @@ $(TAR):
@touch $@
install: .$(PKG)-unpacked-$(REV)
cd $(DIR) && python setup.py install
cd $(DIR) && python3 setup.py install
testing/scripts/recipes/015_strongTNC.mk
+3 -4
View File
@@ -1,7 +1,7 @@
#!/usr/bin/make
PKG = strongTNC
REV = 0.9.9
REV = 1.0
DIR = $(PKG)-$(REV)
ZIP = $(PKG)-$(REV).zip
SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip
@@ -18,10 +18,9 @@ $(ZIP):
.$(PKG)-deps-$(REV): .$(PKG)-unpacked-$(REV)
mkdir -p $(DEPS)
pip download -d $(DEPS) -r $(DIR)/requirements.txt six
pip3 download -d $(DEPS) -r $(DIR)/requirements.txt
@touch $@
install: .$(PKG)-deps-$(REV)
# six is required for djangorestframework-camel-case
pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt six
pip3 install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt
cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc
testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/strongswan.conf
+1 -1
View File
@@ -7,6 +7,6 @@ swanctl {
charon-systemd {
load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default
start-scripts {
updown = /usr/bin/python /etc/updown.py
updown = /usr/bin/python3 /etc/updown.py
}
}
testing/tests/route-based/net2net-xfrmi-ike/hosts/sun/etc/updown.py
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import sys
import vici