diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-01-17 18:55:03 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-01-17 18:55:28 +0100 |
| commit | 77ae2d506449c86b8618e9590eb5cdf6062b9db5 (patch) | |
| tree | 9378d68a555d3b5b6927227a9f9d70ccd823a1df /packages | |
| parent | 634ad661d992d14c0b3e2d148c313f831611f120 (diff) | |
| download | vyos-build-77ae2d506449c86b8618e9590eb5cdf6062b9db5.tar.gz vyos-build-77ae2d506449c86b8618e9590eb5cdf6062b9db5.zip | |
packages: T3164: Debian Buster requires an older Dropbear version
... because of build time dependencies
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/dropbear/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/dropbear/patches/0001-Enable-PAM-support.patch | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/packages/dropbear/Jenkinsfile b/packages/dropbear/Jenkinsfile index 11550238..476ccfd3 100644 --- a/packages/dropbear/Jenkinsfile +++ b/packages/dropbear/Jenkinsfile @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'dropbear', - 'scmCommit': 'debian/2020.81-5', + 'scmCommit': 'debian/2019.78-2', 'scmUrl': 'https://salsa.debian.org/debian/dropbear.git', 'buildCmd': 'cd ..; ./build.sh'], ] diff --git a/packages/dropbear/patches/0001-Enable-PAM-support.patch b/packages/dropbear/patches/0001-Enable-PAM-support.patch index 66361cba..e1077876 100644 --- a/packages/dropbear/patches/0001-Enable-PAM-support.patch +++ b/packages/dropbear/patches/0001-Enable-PAM-support.patch @@ -1,6 +1,6 @@ -From 3ac8b338e248801eca917e6091ff6b601e55a1fc Mon Sep 17 00:00:00 2001 +From 23f4e8789b1bdcc0442b6d57216e5184c1bd97c8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger <christian@poessinger.com> -Date: Sun, 16 Jan 2022 21:04:35 +0100 +Date: Mon, 17 Jan 2022 06:43:26 +0000 Subject: [PATCH] Enable PAM support --- @@ -9,21 +9,23 @@ Subject: [PATCH] Enable PAM support 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules -index 673a5a3..4092be7 100755 +index 3e944d8..3a9f7a7 100755 --- a/debian/rules +++ b/debian/rules -@@ -27,5 +27,5 @@ override_dh_installinit: +@@ -28,7 +28,7 @@ override_dh_installinit: dh_installinit -R --name dropbear override_dh_auto_configure: - dh_auto_configure -- --disable-bundled-libtom \ + dh_auto_configure -- --disable-bundled-libtom --enable-pam \ CC='$(CC)' CFLAGS='$(CFLAGS)' $(CONFFLAGS) + + override_dh_install: diff --git a/default_options.h b/default_options.h -index 375506d..e4fc5bf 100644 +index 9000fcc..0db7366 100644 --- a/default_options.h +++ b/default_options.h -@@ -193,7 +193,7 @@ group1 in Dropbear server too */ +@@ -179,7 +179,7 @@ group1 in Dropbear server too */ /* Authentication Types - at least one required. RFC Draft requires pubkey auth, and recommends password */ @@ -32,7 +34,7 @@ index 375506d..e4fc5bf 100644 /* Note: PAM auth is quite simple and only works for PAM modules which just do * a simple "Login: " "Password: " (you can edit the strings in svr-authpam.c). -@@ -201,7 +201,7 @@ group1 in Dropbear server too */ +@@ -187,7 +187,7 @@ group1 in Dropbear server too */ * but there's an interface via a PAM module. It won't work for more complex * PAM challenge/response. * You can't enable both PASSWORD and PAM. */ |