From 53ceb249883ed0dafef2c30db6ff9bef621aba1e Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 22 Dec 2024 12:00:10 +0100 Subject: T6674: move patches to "package/" subfolder This prevents the accidental applying of a patch to multiple source directories defined in package.toml. Example FRR: Package consits of build instructions for libyang, rtrlib and frr itself. Previously patches in frr/patches folder got applied to libyang, rtrlib and frr which made no sense and could also fail a build. --- .../dropbear/patches/0001-Enable-PAM-support.patch | 61 ---------------------- .../patches/dropbear/0001-Enable-PAM-support.patch | 61 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 scripts/package-build/dropbear/patches/0001-Enable-PAM-support.patch create mode 100644 scripts/package-build/dropbear/patches/dropbear/0001-Enable-PAM-support.patch (limited to 'scripts/package-build/dropbear/patches') diff --git a/scripts/package-build/dropbear/patches/0001-Enable-PAM-support.patch b/scripts/package-build/dropbear/patches/0001-Enable-PAM-support.patch deleted file mode 100644 index fa6cf620..00000000 --- a/scripts/package-build/dropbear/patches/0001-Enable-PAM-support.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 861bfb53de5909e25a952a83654c63de61af02b5 Mon Sep 17 00:00:00 2001 -From: Christian Breunig -Date: Sun, 28 May 2023 15:45:32 +0200 -Subject: [PATCH] Enable PAM support - ---- - debian/control | 1 + - debian/rules | 2 +- - default_options.h | 4 ++-- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/debian/control b/debian/control -index 77ea036..b252b97 100644 ---- a/debian/control -+++ b/debian/control -@@ -6,6 +6,7 @@ Build-Depends: debhelper, - debhelper-compat (= 13), - libtomcrypt-dev (>= 1.18.2~), - libtommath-dev (>= 1.2.0~), -+ libpam0g-dev, - libz-dev - Rules-Requires-Root: no - Standards-Version: 4.6.1 -diff --git a/debian/rules b/debian/rules -index 7dab64c..ce11aa4 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -24,7 +24,7 @@ endif - dh $@ - - override_dh_auto_configure: -- dh_auto_configure -- --disable-bundled-libtom \ -+ dh_auto_configure -- --disable-bundled-libtom --enable-pam \ - CC='$(CC)' CFLAGS='$(CFLAGS)' $(CONFFLAGS) - - execute_before_dh_auto_build: -diff --git a/default_options.h b/default_options.h -index 5132775..e7d274c 100644 ---- a/default_options.h -+++ b/default_options.h -@@ -223,7 +223,7 @@ group1 in Dropbear server too */ - - /* Authentication Types - at least one required. - RFC Draft requires pubkey auth, and recommends password */ --#define DROPBEAR_SVR_PASSWORD_AUTH 1 -+#define DROPBEAR_SVR_PASSWORD_AUTH 0 - - /* 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). -@@ -231,7 +231,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. */ --#define DROPBEAR_SVR_PAM_AUTH 0 -+#define DROPBEAR_SVR_PAM_AUTH 1 - - /* ~/.ssh/authorized_keys authentication. - * You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */ --- -2.30.2 - diff --git a/scripts/package-build/dropbear/patches/dropbear/0001-Enable-PAM-support.patch b/scripts/package-build/dropbear/patches/dropbear/0001-Enable-PAM-support.patch new file mode 100644 index 00000000..fa6cf620 --- /dev/null +++ b/scripts/package-build/dropbear/patches/dropbear/0001-Enable-PAM-support.patch @@ -0,0 +1,61 @@ +From 861bfb53de5909e25a952a83654c63de61af02b5 Mon Sep 17 00:00:00 2001 +From: Christian Breunig +Date: Sun, 28 May 2023 15:45:32 +0200 +Subject: [PATCH] Enable PAM support + +--- + debian/control | 1 + + debian/rules | 2 +- + default_options.h | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/debian/control b/debian/control +index 77ea036..b252b97 100644 +--- a/debian/control ++++ b/debian/control +@@ -6,6 +6,7 @@ Build-Depends: debhelper, + debhelper-compat (= 13), + libtomcrypt-dev (>= 1.18.2~), + libtommath-dev (>= 1.2.0~), ++ libpam0g-dev, + libz-dev + Rules-Requires-Root: no + Standards-Version: 4.6.1 +diff --git a/debian/rules b/debian/rules +index 7dab64c..ce11aa4 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -24,7 +24,7 @@ endif + dh $@ + + override_dh_auto_configure: +- dh_auto_configure -- --disable-bundled-libtom \ ++ dh_auto_configure -- --disable-bundled-libtom --enable-pam \ + CC='$(CC)' CFLAGS='$(CFLAGS)' $(CONFFLAGS) + + execute_before_dh_auto_build: +diff --git a/default_options.h b/default_options.h +index 5132775..e7d274c 100644 +--- a/default_options.h ++++ b/default_options.h +@@ -223,7 +223,7 @@ group1 in Dropbear server too */ + + /* Authentication Types - at least one required. + RFC Draft requires pubkey auth, and recommends password */ +-#define DROPBEAR_SVR_PASSWORD_AUTH 1 ++#define DROPBEAR_SVR_PASSWORD_AUTH 0 + + /* 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). +@@ -231,7 +231,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. */ +-#define DROPBEAR_SVR_PAM_AUTH 0 ++#define DROPBEAR_SVR_PAM_AUTH 1 + + /* ~/.ssh/authorized_keys authentication. + * You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */ +-- +2.30.2 + -- cgit v1.2.3