diff options
Diffstat (limited to 'packages/hostap')
| -rw-r--r-- | packages/hostap/Jenkinsfile | 4 | ||||
| -rwxr-xr-x | packages/hostap/build.sh | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile index 1aeb4521..91465cf6 100644 --- a/packages/hostap/Jenkinsfile +++ b/packages/hostap/Jenkinsfile @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'wpa', - 'scmCommit': 'debian/2%2.10-10', + 'scmCommit': 'debian/2%2.10-12', 'scmUrl': 'https://salsa.debian.org/debian/wpa', 'buildCmd': '/bin/true'], ['name': 'hostap', @@ -31,4 +31,4 @@ def pkgList = [ ] // Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('hostap', pkgList, null, true, "**/packages/hostap/*") +buildPackage('hostap', pkgList, null, true, "**/packages/hostap/**") diff --git a/packages/hostap/build.sh b/packages/hostap/build.sh index c66bda3d..c356672a 100755 --- a/packages/hostap/build.sh +++ b/packages/hostap/build.sh @@ -16,15 +16,18 @@ fi echo "I: Copy Debian build instructions" cp -a ${SRC_DEB}/debian ${SRC} -# Preserve Debian's default of allowing TLSv1.0 for compatibility -find ${SRC}/debian/patches -mindepth 1 ! -name allow-tlsv1.patch -delete -echo 'allow-tlsv1.patch' > ${SRC}/debian/patches/series +# Preserve Debian's default of allowing TLSv1.0 and legacy renegotiation for +# compatibility with networks that use legacy crypto +cat > ${SRC}/debian/patches/series << EOF +allow-tlsv1.patch +allow-legacy-renegotiation.patch +EOF # Build Debian package cd ${SRC} echo "I: Ensure Debian build dependencies are met" -sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends" +sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends" -Ppkg.wpa.nogui,noudeb echo "I: Create new Debian Package version" version="$(git describe --tags | tr _ .)" |