From 4ed74d809adc11e6f15c78b47cffff0e93882a804d053ea3efb560064733b173 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 16 Feb 2023 11:35:29 +0000 Subject: [PATCH] - Update shadow-fix-print-login-timeout.patch - Reorder source files OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=141 --- shadow-fix-print-login-timeout.patch | 2 +- shadow.changes | 6 ++++++ shadow.spec | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/shadow-fix-print-login-timeout.patch b/shadow-fix-print-login-timeout.patch index 3982d19..7a6dcbd 100644 --- a/shadow-fix-print-login-timeout.patch +++ b/shadow-fix-print-login-timeout.patch @@ -10,7 +10,7 @@ Calling exit from new handler provides enough time to display full message. 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/login.c b/src/login.c -index 116e2cb3..c55f4de0 100644 +index 116e2cb36..c55f4de0a 100644 --- a/src/login.c +++ b/src/login.c @@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user); diff --git a/shadow.changes b/shadow.changes index c136256..20e3911 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 16 11:31:33 UTC 2023 - Michael Vetter + +- Update shadow-fix-print-login-timeout.patch +- Reorder source files + ------------------------------------------------------------------- Wed Feb 15 10:49:33 UTC 2023 - Ludwig Nussel diff --git a/shadow.spec b/shadow.spec index 17f505e..6d4404a 100644 --- a/shadow.spec +++ b/shadow.spec @@ -28,14 +28,14 @@ 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 -Source: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz -Source1: pamd.tar.bz2 -Source6: shadow.service -Source7: shadow.timer -Source42: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc -Source43: %{name}.keyring +Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz +Source1: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc +Source2: pamd.tar.bz2 +Source3: %{name}.keyring +Source4: shadow.service +Source5: shadow.timer # SOURCE-FEATURE-SUSE shadow-login_defs-check.sh sbrabec@suse.com -- Supplementary script that verifies coverage of variables in shadow-login_defs-unused-by-pam.patch and other patches. -Source44: shadow-login_defs-check.sh +Source40: shadow-login_defs-check.sh # PATCH-FIX-SUSE shadow-login_defs-unused-by-pam.patch kukuk@suse.com -- Remove variables that have no use with PAM. Patch0: shadow-login_defs-unused-by-pam.patch # PATCH-FEATURE-SUSE useradd-default.patch kukuk@suse.com -- Change useradd defaults group to 1000. @@ -53,7 +53,7 @@ Patch8: disable_new_audit_function.patch # PATCH-FIX-UPSTREAM shadow-audit-no-id.patch mvetter@suse.com -- Fix useradd audit event logging of ID field (bsc#1205502) (gh/shadow-maint/shadow#606) Patch9: shadow-audit-no-id.patch # PATCH-FIX-UPSTREAM shadow-fix-print-login-timeout.patch mvetter@suse.com -- Fix print full login timeout message (gh/shadow-maint/shadow#621) -Patch10: https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c.patch#/shadow-fix-print-login-timeout.patch +Patch10: shadow-fix-print-login-timeout.patch BuildRequires: audit-devel > 2.3 BuildRequires: autoconf BuildRequires: automake @@ -153,8 +153,8 @@ autoreconf -fvi # Separate call to install man pages. See https://github.com/shadow-maint/shadow/issues/389 %make_install -C man install-man -install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/shadow.service -install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/shadow.timer +install -Dm644 %{SOURCE4} %{buildroot}%{_unitdir}/shadow.service +install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/shadow.timer # add empty /etc/sub{u,g}id files touch %{buildroot}/%{_sysconfdir}/subuid