summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2022-10-02 19:56:36 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2022-10-25 14:51:54 +0200
commit41a9eb6c3afc6de000eaeb0fbe0c691b6c8d1285 (patch)
tree807b7896bad14431b5130c007f703f00d4f0b5e9 /meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch
parentc6a6d0c2680799683d58968c2558a224f27caaa2 (diff)
downloadopenembedded-core-41a9eb6c3afc6de000eaeb0fbe0c691b6c8d1285.tar.gz
base-passwd: Update to 3.6.1
Add a patch to support configuring whether SELinux is enabled or not. Also add a PACKAGECONFIG for SELinux support and enable it if the "selinux" distro feature is enabled. Remove two patches that have been applied upstream. Changes since 3.5.52: * 5928e85: German (thanks, Helge Kreutzmann) * 72cb6a6: Remove constraints unnecessary since buster * 2f71444: Merge branch 'scrub-obsolete' into 'master' * 5a578e7: Drop Build-Depends: dpkg * 44f28e1: Apply wrap-and-sort -at * 1fe0338: Upgrade to debhelper v13 * d77d38c: Simplify some debhelper overrides slightly * 2143651: Implement SELinux awareness when updating /etc/{passwd,group,shadow} * 0b824ad: improve enforcing handling * e2f0c03: update-passwd.c: use raw selinux labeles * 8d45264: selinux_prepare_create_file: return error from setfscreatecon_raw * 2f23448: selinux_after_create_file: save errno * 6953dd1: update-passwd.c: replace goto error handling * 32fbf59: cleanup * 3c3eb67: fixup goto * 585126f: implement feedback * 02a366b: users-and-groups: Update copyright years * 7849c61: users-and-groups: Rename ssh group to _ssh * 06ed6f4: update-passwd.c: set walk to walk->next before removing * ef6baea: users-and-groups: Document libvirt group * 68e02a3: Stop creating the gnats user and group on new installations * cb6e2a9: Restore Build-Depends sorting * 0e1afc1: Tidy up whitespace * 6005a06: Merge branch 'selinux' into 'master' * 24046cb: Bump version to 3.6.0 * c72aa5d: Make it possible to build without debconf support * 2a6d16e: Make it possible to disable the generation of the documentation * 60ece0c: Merge branch 'master' into 'master' * 63d0f94: Add changelog entry * cbae4a5: update-passwd: add format attribute * b71eb04: update-passwd: use strict prototypes * df48ea8: update-passwd: silence potential null dereference * cddc9df: update-passwd: print filename on fclose error * d05f8a3: update-passwd: use correct filename in copy_filemodes * 11e6466: update-passwd: drop t flag from fopen * 347aeb6: update-passwd: open temporary file exclusively * a697493: d/salsa-ci.yml: add standard salsa ci configuration * 2f622f4: configure: replace obsolete macro * 43ebe64: Add changelog entry * e1a186b: frozen the group id for crontab, in order to fix #1012622 * 5ce7773: frozen the group id for crontab, closes: #1012622 * 670c2be: Revert "frozen the group id for crontab, closes: #1012622" * bc1ad19: Revert "Revert "frozen the group id for crontab, closes: #1012622"" * 12122c6: Revert "frozen the group id for crontab, in order to fix #1012622" * 0145e8a: Revert "frozen the group id for crontab, closes: #1012622" * c8125ff: releasing package base-passwd version 3.6.0 * dc157c6: passwd.master: Add _apt user * e50024c: Merge branch 'misc' into 'master' * 7fb5ad8: debian/postinst: Fix several shellcheck issues * 8f07b66: releasing package base-passwd version 3.6.1 Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch')
-rw-r--r--meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch129
1 files changed, 0 insertions, 129 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch
deleted file mode 100644
index 6e236993f5..0000000000
--- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 236d6c8c0dd7e15d9a9795813b94bc87ce09eec5 Mon Sep 17 00:00:00 2001
-From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
-Date: Fri, 29 Apr 2022 19:32:29 +0200
-Subject: [PATCH] Make it possible to build without debconf support
-
-Not all systems have the debconfclient library available.
-
-Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/c72aa5dd25a952da25e307761f4526db2c8c39ec]
-Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
----
- Makefile.am | 1 -
- configure.ac | 13 +++++++++++++
- update-passwd.c | 15 +++++++++++++++
- 3 files changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 223916f..4bdd769 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS = doc man
- sbin_PROGRAMS = update-passwd
-
- update_passwd_SOURCES = update-passwd.c
--update_passwd_LDADD = -ldebconfclient
-
- pkgdata_DATA = passwd.master group.master
-
-diff --git a/configure.ac b/configure.ac
-index 9d1ace5..1e35ad1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,19 @@ AC_SYS_LARGEFILE
- dnl Scan for things we need
- AC_CHECK_FUNCS([putgrent])
-
-+dnl Check for debconf
-+AC_MSG_CHECKING([whether to enable debconf support])
-+AC_ARG_ENABLE([debconf],
-+ [AS_HELP_STRING([--disable-debconf], [disable support for debconf])],
-+ [],
-+ [enable_debconf=yes])
-+AC_MSG_RESULT($enable_debconf)
-+AS_IF([test "x$enable_debconf" != xno],
-+ [AC_CHECK_LIB([debconfclient], [debconfclient_new], [],
-+ [AC_MSG_ERROR(
-+ [debconf support not available (use --disable-debconf to disable)])])
-+ AC_DEFINE([HAVE_DEBCONF], [1], [Define if you have libdebconfclient])])
-+
- dnl Finally output everything
- AC_CONFIG_FILES([Makefile doc/Makefile man/Makefile])
- AC_OUTPUT
-diff --git a/update-passwd.c b/update-passwd.c
-index 3f3dffa..5b49740 100644
---- a/update-passwd.c
-+++ b/update-passwd.c
-@@ -39,7 +39,9 @@
- #include <stdarg.h>
- #include <ctype.h>
-
-+#ifdef HAVE_DEBCONF
- #include <cdebconf/debconfclient.h>
-+#endif
-
- #define DEFAULT_PASSWD_MASTER "/usr/share/base-passwd/passwd.master"
- #define DEFAULT_GROUP_MASTER "/usr/share/base-passwd/group.master"
-@@ -143,6 +145,7 @@ int flag_debconf = 0;
- const char* user_domain = DEFAULT_DEBCONF_DOMAIN;
- const char* group_domain = DEFAULT_DEBCONF_DOMAIN;
-
-+#ifdef HAVE_DEBCONF
- struct debconfclient* debconf = NULL;
-
- /* Abort the program if talking to debconf fails. Use ret exactly once. */
-@@ -162,6 +165,10 @@ struct debconfclient* debconf = NULL;
- DEBCONF_CHECK(debconf_register(debconf, (template), (question)))
- #define DEBCONF_SUBST(question, var, value) \
- DEBCONF_CHECK(debconf_subst(debconf, (question), (var), (value)))
-+#else
-+#define DEBCONF_REGISTER(template, question)
-+#define DEBCONF_SUBST(question, var, value)
-+#endif
-
-
- /* malloc() with out-of-memory checking.
-@@ -621,6 +628,7 @@ void version() {
- * flag. Aborts the problem on any failure.
- */
- int ask_debconf(const char* priority, const char* question) {
-+#ifdef HAVE_DEBCONF
- int ret;
- const char* response;
-
-@@ -640,6 +648,9 @@ int ask_debconf(const char* priority, const char* question) {
- return 1;
- else
- return 0;
-+#else
-+ return 0;
-+#endif
- }
-
-
-@@ -1427,6 +1438,7 @@ int main(int argc, char** argv) {
- /* If DEBIAN_HAS_FRONTEND is set in the environment, we're running under
- * debconf. Enable debconf prompting unless --dry-run was also given.
- */
-+#ifdef HAVE_DEBCONF
- if (getenv("DEBIAN_HAS_FRONTEND")!=NULL && !opt_dryrun) {
- debconf=debconfclient_new();
- if (debconf==NULL) {
-@@ -1435,6 +1447,7 @@ int main(int argc, char** argv) {
- }
- flag_debconf=1;
- }
-+#endif
-
- if (read_passwd(&master_accounts, master_passwd)!=0)
- return 2;
-@@ -1480,8 +1493,10 @@ int main(int argc, char** argv) {
- if (!unlock_files())
- return 5;
-
-+#ifdef HAVE_DEBCONF
- if (debconf!=NULL)
- debconfclient_delete(debconf);
-+#endif
-
- if (opt_dryrun)
- return flag_dirty;