From b61dc19e89ba79b3baa27d2f2f6a5c843a6cfe4e5dbad9a27035aa1faa95b26d Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 13 Feb 2024 15:32:50 +0000 Subject: [PATCH] Accepting request 1146447 from home:jubalh:branches:Base:System - Update to 4.14.4: * Build system: + Link correctly with libdl. + Install pam configs for chpasswd(8) and newusers(8) when using ./configure --with-libpam --disable-account-tools-setuid. * libshadow: + Fix build error (parameter name omitted). + Fix off-by-one bug. + Remove warning. - Add shadow-4.14.4-chgpasswd-typo.patch: to fix build. See #926 - Update patch macro `patchN` -> `patch -P N` OBS-URL: https://build.opensuse.org/request/show/1146447 OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=166 --- shadow-4.14.3.tar.xz | 3 -- shadow-4.14.3.tar.xz.asc | 16 ---------- shadow-4.14.4-chgpasswd-typo.patch | 47 ++++++++++++++++++++++++++++++ shadow-4.14.4.tar.xz | 3 ++ shadow-4.14.4.tar.xz.asc | 16 ++++++++++ shadow.changes | 15 ++++++++++ shadow.spec | 17 ++++++----- 7 files changed, 91 insertions(+), 26 deletions(-) delete mode 100644 shadow-4.14.3.tar.xz delete mode 100644 shadow-4.14.3.tar.xz.asc create mode 100644 shadow-4.14.4-chgpasswd-typo.patch create mode 100644 shadow-4.14.4.tar.xz create mode 100644 shadow-4.14.4.tar.xz.asc diff --git a/shadow-4.14.3.tar.xz b/shadow-4.14.3.tar.xz deleted file mode 100644 index 8b7f33b..0000000 --- a/shadow-4.14.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 -size 1799112 diff --git a/shadow-4.14.3.tar.xz.asc b/shadow-4.14.3.tar.xz.asc deleted file mode 100644 index 0ba5732..0000000 --- a/shadow-4.14.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmWlu4sACgkQnowa+77/ -2zKCIw//Ts0DjkUGf8j7T6SyLGBWpK0pMxXRFxK4SNlLAsirMMAvxjKZH59YpyY3 -G2RR7UdRDBHRFSQaWERW3B9YTwzyu9ficYCvQO3Jq/sYSBkuF59R0Q8pPB1zB0t2 -sRX+9IGdk6en6NTEmfehjbTb7oaf7etsMHe1UK4hgfQA22Pse8pMI1+9mcsNRIaK -gFsJl9oXV2qwyJXCqkMfatYD7gF5rTJPTa8fXlBC4dqx6/ew9wzfG7Pu+9OXrX6W -TosrwjYrpe00NhHlhN5iJoWyCUALipVazXgHW5zhGfvoIcYh97pJVm1FpLJS2l6C -u3Y7A6HnKCaWFsIvWbmuop2ldFMgZgmtJkwcse9v8K0ZC/ncqWMp9VVEdMnbgfFe -eGvQKwpwj+B9LPx++s4H4NGt8iOtBAFZ4nmKXGNMegmgiMUbakdmiPpOwKQuS0kD -5lTWBQRbaxFuAxTxKy+i2cb5nEF1ZjQk/G9K8JilgFLSMefLHXliA7kNXK+pOtAC -eib17E9U20B0Mr0o7aDrBmJR/UoGmxmjIHL0OtXqvOWeT8aFCemKsjyv+E0v6Gva -es6PukZA0AzoWoJDtl7BpN6nKQNhHr68pm4QxuEW/g3FsoY0Zd1d8bChjVeyg9qZ -NZJ9peXzf4uNcakHgJJ7fHnN+nw89UAZap+21RO1a3vEQh590kU= -=vpSr ------END PGP SIGNATURE----- diff --git a/shadow-4.14.4-chgpasswd-typo.patch b/shadow-4.14.4-chgpasswd-typo.patch new file mode 100644 index 0000000..2f826cc --- /dev/null +++ b/shadow-4.14.4-chgpasswd-typo.patch @@ -0,0 +1,47 @@ +From 8e8a817a87782a562b69c60db108b914d742419a Mon Sep 17 00:00:00 2001 +From: Alejandro Colomar +Date: Tue, 13 Feb 2024 13:17:44 +0100 +Subject: [PATCH] etc/pam.d/Makefile.am: Fix typo + +The commit we're fixing mentions that it wanted to move 'chpasswd', but +it removed 'ch_g_passwd' from 'pamd_acct_tools_files' and added +'chpasswd' to 'pamd_files'. It seems it removed the wrong thing by +accident. + +Fixes: 341d80c2c751 ("Makefile: move chpasswd and newusers to pamd target") +Link: +Link: +Reported-by: Dominique Leuenberger +Reported-by: Michael Vetter +Cc: loqs +Cc: David Runge +Cc: Iker Pedrosa +Co-developed-by: Dominique Leuenberger +Signed-off-by: Dominique Leuenberger +Signed-off-by: Alejandro Colomar +--- + etc/pam.d/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: shadow-4.14.4/etc/pam.d/Makefile.am +=================================================================== +--- shadow-4.14.4.orig/etc/pam.d/Makefile.am ++++ shadow-4.14.4/etc/pam.d/Makefile.am +@@ -12,7 +12,7 @@ pamd_files = \ + + pamd_acct_tools_files = \ + chage \ +- chpasswd \ ++ chgpasswd \ + groupadd \ + groupdel \ + groupmod \ +Index: shadow-4.14.4/etc/pam.d/chgpasswd +=================================================================== +--- /dev/null ++++ shadow-4.14.4/etc/pam.d/chgpasswd +@@ -0,0 +1,4 @@ ++#%PAM-1.0 ++auth sufficient pam_rootok.so ++account required pam_permit.so ++password include system-auth diff --git a/shadow-4.14.4.tar.xz b/shadow-4.14.4.tar.xz new file mode 100644 index 0000000..d4e7830 --- /dev/null +++ b/shadow-4.14.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:396a5cb7e2f0f7c21b7227ab88ae17ec8c02d6abc5257fd17d6167baf9c4e3fc +size 1805956 diff --git a/shadow-4.14.4.tar.xz.asc b/shadow-4.14.4.tar.xz.asc new file mode 100644 index 0000000..84b4343 --- /dev/null +++ b/shadow-4.14.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmXJV6kACgkQnowa+77/ +2zLfwQ/+M10pWMF+Nlqt+tdaGei17HFvfci2nRNfGtofiAk42G46CYbbiXNExMIg +TkCyIESsP0aQM9KGSFb02jUPNv9wY0KCSzPeJnO++ciU9Q4nb3TqXtsZWPRahhHP +HWsjSCi0QgbJeWGIBEl9aR0LUEB11/h4sDMO5lJAU021DXp+L2gua2pdq9afpO56 +sl7geJPYzXjYukjm2Z77LN77Aw5PAvkbzjDispGkYnGgpKXzQ7HuXQjMLuvIJPJF +iNKvDv/xdKkyv+UEHmlHqC22Fr/Fwp4QT6eESeAGZeTVtJ7Dgc/sEyhHzBf6QFBH +0kwtMaANzx68gsI8FvXl73idxQHXa7ad2yYCdXEuEWPldOvNH1b3RzJ0h3T0OEUF +th5tN+34b58YiZNsZbzX8+Gco8Y6UoXCH6cZFEEc85i7hMkyv+GLkY5+yb2InDM5 +XfA1MKsUwyY+ZpuUEcdfv4qka9sFHEtVu/2DFDlS1kBnwFYH1d26k5jofmQruTLJ +ljiGlYuY1Y5oQ/RBdkBkv3FEEO3Y+swaYuBnIlzyYbf+qC4D0CCBYxUCq82XxpXW +tG+JbdZZY+IwVfnuijRR2UL9Pzc58WRW9Y8dirfztGjf3ASawWhAQPZOFrEpyG8/ +NI3iZLulGmrTrXVhQPnFSgxLkiQ50LGGzhTMBT5sM3ESgWyQs5A= +=I266 +-----END PGP SIGNATURE----- diff --git a/shadow.changes b/shadow.changes index afb04cf..3952d65 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Feb 12 19:37:52 UTC 2024 - Michael Vetter + +- Update to 4.14.4: + * Build system: + + Link correctly with libdl. + + Install pam configs for chpasswd(8) and newusers(8) when using + ./configure --with-libpam --disable-account-tools-setuid. + * libshadow: + + Fix build error (parameter name omitted). + + Fix off-by-one bug. + + Remove warning. +- Add shadow-4.14.4-chgpasswd-typo.patch: to fix build. See #926 +- Update patch macro `patchN` -> `patch -P N` + ------------------------------------------------------------------- Tue Jan 16 06:57:35 UTC 2024 - Michael Vetter diff --git a/shadow.spec b/shadow.spec index f738a53..6682eda 100644 --- a/shadow.spec +++ b/shadow.spec @@ -22,7 +22,7 @@ %define no_config 1 %endif Name: shadow -Version: 4.14.3 +Version: 4.14.4 Release: 0 Summary: Utilities to Manage User and Group Accounts License: BSD-3-Clause AND GPL-2.0-or-later @@ -48,6 +48,8 @@ Patch3: shadow-login_defs-comments.patch Patch4: shadow-login_defs-suse.patch # PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions. Patch5: disable_new_audit_function.patch +# PATCH-FIX-UPSTREAM shadow-4.14.4-chgpasswd-typo.patch mvetter@suse.com -- Fix chgpasswd typo gh#926 +Patch6: shadow-4.14.4-chgpasswd-typo.patch BuildRequires: audit-devel > 2.3 BuildRequires: autoconf BuildRequires: automake @@ -108,14 +110,15 @@ Development files for libsubid4. %prep %setup -q -a 1 -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 +%patch -P 0 +%patch -P 1 +%patch -P 2 +%patch -P 3 +%patch -P 4 %if 0%{?suse_version} < 1330 -%patch5 -p1 +%patch -P 5 -p1 %endif +%patch -P 6 -p1 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 mv -v doc/HOWTO.utf8 doc/HOWTO