From 92db561161bd9eb1bb2f37626c6b391e59a939ef6888e4cf7516e2d106063c76 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 28 May 2019 13:04:19 +0000 Subject: [PATCH 1/2] Accepting request 705901 from home:lnussel:branches:Base:System - don't specify MOTD_FILE in login.defs but fall back to built in defaults of login (boo#1133929) OBS-URL: https://build.opensuse.org/request/show/705901 OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=65 --- shadow-login_defs-suse.patch | 30 ++++++++++++++++++++---------- shadow.changes | 6 ++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/shadow-login_defs-suse.patch b/shadow-login_defs-suse.patch index cb090cb..8893bc0 100644 --- a/shadow-login_defs-suse.patch +++ b/shadow-login_defs-suse.patch @@ -14,7 +14,17 @@ Index: etc/login.defs # # Delay in seconds before being allowed another attempt after a login failure -@@ -53,8 +56,8 @@ MOTD_FILE /etc/motd +@@ -38,8 +41,7 @@ CONSOLE /etc/securetty + # If defined, ":" delimited list of "message of the day" files to + # be displayed upon login. + # +-MOTD_FILE /etc/motd +-#MOTD_FILE /etc/motd:/usr/lib/news/news-motd ++#MOTD_FILE /etc/motd:/usr/share/misc/motd + + # + # If defined, file which maps tty line to TERM environment parameter. +@@ -53,8 +55,8 @@ MOTD_FILE /etc/motd # user's name or shell are found in the file. If not a full pathname, then # hushed mode will be enabled if the file exists in the user's home directory. # @@ -25,7 +35,7 @@ Index: etc/login.defs # If this variable is set to "yes", hostname will be suppressed in the # login: prompt. -@@ -73,9 +76,9 @@ HUSHLOGIN_FILE .hushlogin +@@ -73,9 +75,9 @@ HUSHLOGIN_FILE .hushlogin # ENV_SUPATH is an ENV_ROOTPATH override for su and runuser # (and falback for login). # @@ -38,7 +48,7 @@ Index: etc/login.defs # If this variable is set to "yes" (default is "no"), su will always set # path. every su call will overwrite the PATH variable. -@@ -99,7 +102,7 @@ ALWAYS_SET_PATH no +@@ -99,7 +101,7 @@ ALWAYS_SET_PATH no # set TTYPERM to either 622 or 600. # TTYGROUP tty @@ -47,7 +57,7 @@ Index: etc/login.defs # Default initial "umask" value used by login(1) on non-PAM enabled systems. # Default "umask" value for pam_umask(8) on PAM enabled systems. -@@ -132,8 +135,8 @@ PASS_WARN_AGE 7 +@@ -132,8 +134,8 @@ PASS_WARN_AGE 7 UID_MIN 1000 UID_MAX 60000 # System accounts @@ -58,7 +68,7 @@ Index: etc/login.defs # Extra per user uids SUB_UID_MIN 100000 SUB_UID_MAX 600100000 -@@ -150,8 +153,8 @@ SUB_UID_COUNT 65536 +@@ -150,8 +152,8 @@ SUB_UID_COUNT 65536 GID_MIN 1000 GID_MAX 60000 # System accounts @@ -69,7 +79,7 @@ Index: etc/login.defs # Extra per user group ids SUB_GID_MIN 100000 SUB_GID_MAX 600100000 -@@ -160,7 +163,7 @@ SUB_GID_COUNT 65536 +@@ -160,7 +162,7 @@ SUB_GID_COUNT 65536 # # Max number of login(1) retries if password is bad # @@ -78,7 +88,7 @@ Index: etc/login.defs # # Max time in seconds for login(1) -@@ -176,18 +179,9 @@ LOGIN_TIMEOUT 60 +@@ -176,18 +178,9 @@ LOGIN_TIMEOUT 60 CHFN_RESTRICT rwh # @@ -99,7 +109,7 @@ Index: etc/login.defs # # If set to MD5, MD5-based algorithm will be used for encrypting password -@@ -201,8 +195,8 @@ CHFN_RESTRICT rwh +@@ -201,8 +194,8 @@ CHFN_RESTRICT rwh # Note: If you use PAM, it is recommended to use a value consistent with # the PAM modules configuration. # @@ -110,7 +120,7 @@ Index: etc/login.defs # # Number of rounds for salt. -@@ -271,7 +265,7 @@ USERDEL_POSTCMD /usr/sbin/userde +@@ -271,7 +264,7 @@ USERDEL_POSTCMD /usr/sbin/userde # # This also enables userdel(8) to remove user groups if no members exist. # @@ -119,7 +129,7 @@ Index: etc/login.defs # # If set to a non-zero number, the shadow utilities will make sure that -@@ -290,13 +284,13 @@ USERGROUPS_ENAB yes +@@ -290,13 +283,13 @@ USERGROUPS_ENAB yes # This option is overridden with the -M or -m flags on the useradd(8) # command-line. # diff --git a/shadow.changes b/shadow.changes index f6d2567..a374ef1 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 2 09:45:48 UTC 2019 - lnussel@suse.de + +- don't specify MOTD_FILE in login.defs but fall back to built in + defaults of login (boo#1133929) + ------------------------------------------------------------------- Tue Apr 30 22:27:14 CEST 2019 - sbrabec@suse.com From b1491878079a469a6568d488d22bbb04e6aeaea53d1af18b4923c9874141c94c Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 31 May 2019 06:00:55 +0000 Subject: [PATCH 2/2] Accepting request 706498 from home:pluskalm:branches:Base:System - Make building more verbose - Use spec-cleaner OBS-URL: https://build.opensuse.org/request/show/706498 OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=66 --- shadow.changes | 6 ++++ shadow.spec | 92 +++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/shadow.changes b/shadow.changes index a374ef1..f40c32d 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 30 11:15:49 UTC 2019 - Martin Pluskal + +- Make building more verbose +- Use spec-cleaner + ------------------------------------------------------------------- Thu May 2 09:45:48 UTC 2019 - lnussel@suse.de diff --git a/shadow.spec b/shadow.spec index 0c19d14..59e3ec8 100644 --- a/shadow.spec +++ b/shadow.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Utilities to Manage User and Group Accounts License: BSD-3-Clause AND GPL-2.0-or-later Group: System/Base -Url: https://github.com/shadow-maint/shadow +URL: https://github.com/shadow-maint/shadow Source: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz Source1: pamd.tar.bz2 Source2: README.changes-pwdutils @@ -77,8 +77,8 @@ BuildRequires: pam-devel BuildRequires: xz Requires(pre): group(root) Requires(pre): group(shadow) +Requires(pre): permissions Requires(pre): user(root) -PreReq: permissions Provides: pwdutils = 3.2.20 Obsoletes: pwdutils <= 3.2.19 # Virtual provides for supported variables in login.defs. @@ -123,23 +123,23 @@ export LDFLAGS="-pie" autoreconf -fvi %configure \ - --disable-shadowgrp \ - --enable-account-tools-setuid \ - --with-audit \ - --with-libpam \ - --with-sha-crypt \ - --with-acl \ - --with-attr \ - --with-nscd \ - --with-selinux \ - --without-libcrack \ - --disable-shared \ - --with-group-name-max-length=32 -make + --disable-shadowgrp \ + --enable-account-tools-setuid \ + --with-audit \ + --with-libpam \ + --with-sha-crypt \ + --with-acl \ + --with-attr \ + --with-nscd \ + --with-selinux \ + --without-libcrack \ + --disable-shared \ + --with-group-name-max-length=32 +make %{?_smp_mflags} V=1 %install cp %{SOURCE2} . -make install DESTDIR=%{buildroot} gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs +%make_install gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs # install useradd.local, userdel.local, ... install -m 0755 %{SOURCE3} %{buildroot}/%{_sbindir}/ @@ -291,36 +291,36 @@ rm -rf %{buildroot}%{_mandir}/{??,??_??} %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/useradd.local %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/userdel-pre.local %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/userdel-post.local -%{_mandir}/man1/chage.1* -%{_mandir}/man1/chfn.1* -%{_mandir}/man1/chsh.1* -%{_mandir}/man1/expiry.1* -%{_mandir}/man1/gpasswd.1* -%{_mandir}/man1/newgrp.1* -%{_mandir}/man1/passwd.1* -%{_mandir}/man1/sg.1* -%{_mandir}/man3/shadow.3* -%{_mandir}/man5/login.defs.5* -%{_mandir}/man5/shadow.5* -%{_mandir}/man8/chpasswd.8* -%{_mandir}/man8/groupadd.8* -%{_mandir}/man8/groupdel.8* -%{_mandir}/man8/groupmod.8* -%{_mandir}/man8/grpck.8* -%{_mandir}/man8/lastlog.8* -%{_mandir}/man8/newusers.8* -%{_mandir}/man8/pwck.8* -%{_mandir}/man8/pwconv.8* -%{_mandir}/man8/pwunconv.8* -%{_mandir}/man8/useradd.8* -%{_mandir}/man8/userdel.8* -%{_mandir}/man8/usermod.8* -%{_mandir}/man8/vigr.8* -%{_mandir}/man8/vipw.8* -%{_mandir}/man5/subuid.5* -%{_mandir}/man5/subgid.5* -%{_mandir}/man1/newgidmap.1* -%{_mandir}/man1/newuidmap.1* +%{_mandir}/man1/chage.1%{?ext_man} +%{_mandir}/man1/chfn.1%{?ext_man} +%{_mandir}/man1/chsh.1%{?ext_man} +%{_mandir}/man1/expiry.1%{?ext_man} +%{_mandir}/man1/gpasswd.1%{?ext_man} +%{_mandir}/man1/newgrp.1%{?ext_man} +%{_mandir}/man1/passwd.1%{?ext_man} +%{_mandir}/man1/sg.1%{?ext_man} +%{_mandir}/man3/shadow.3%{?ext_man} +%{_mandir}/man5/login.defs.5%{?ext_man} +%{_mandir}/man5/shadow.5%{?ext_man} +%{_mandir}/man8/chpasswd.8%{?ext_man} +%{_mandir}/man8/groupadd.8%{?ext_man} +%{_mandir}/man8/groupdel.8%{?ext_man} +%{_mandir}/man8/groupmod.8%{?ext_man} +%{_mandir}/man8/grpck.8%{?ext_man} +%{_mandir}/man8/lastlog.8%{?ext_man} +%{_mandir}/man8/newusers.8%{?ext_man} +%{_mandir}/man8/pwck.8%{?ext_man} +%{_mandir}/man8/pwconv.8%{?ext_man} +%{_mandir}/man8/pwunconv.8%{?ext_man} +%{_mandir}/man8/useradd.8%{?ext_man} +%{_mandir}/man8/userdel.8%{?ext_man} +%{_mandir}/man8/usermod.8%{?ext_man} +%{_mandir}/man8/vigr.8%{?ext_man} +%{_mandir}/man8/vipw.8%{?ext_man} +%{_mandir}/man5/subuid.5%{?ext_man} +%{_mandir}/man5/subgid.5%{?ext_man} +%{_mandir}/man1/newgidmap.1%{?ext_man} +%{_mandir}/man1/newuidmap.1%{?ext_man} %{_unitdir}/*