- Dont build lastlog (lastlog.legacy) anymore since we
use lastlog2 by default now. OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=150
This commit is contained in:
Michael Vetter
Git OBS Bridge
parent
51ee267bd3
commit
d8c5f764fa
16
my.patch
16
my.patch
@ -1,16 +0,0 @@
|
||||
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
|
||||
index cc24901e..227d8fb4 100644
|
||||
--- a/libmisc/Makefile.am
|
||||
+++ b/libmisc/Makefile.am
|
||||
@@ -17,9 +17,11 @@ libmisc_la_SOURCES = \
|
||||
age.c \
|
||||
agetpass.c \
|
||||
alloc.c \
|
||||
+ alloc.h \
|
||||
audit_help.c \
|
||||
basename.c \
|
||||
bit.c \
|
||||
+ bit.h \
|
||||
chkname.c \
|
||||
chkname.h \
|
||||
chowndir.c \
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6d894c706156cdf69bc320cf3c587a7a93631046d21669960425e8874f992911
|
||||
size 3382521
|
||||
3
shadow-4.14.0.tar.xz
Normal file
3
shadow-4.14.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b76d61c06f6ffea93a2585630c18cf5f6c6da7f2a4fb5979424f21fed5299b07
|
||||
size 1787272
|
||||
@ -8,6 +8,8 @@ Thu Aug 3 17:09:55 UTC 2023 - Michael Vetter <jubalh@iodoru.org>
|
||||
* shadow-audit-no-id.patch
|
||||
* shadow-fix-print-login-timeout.patch
|
||||
* shadow-CVE-2023-29383.patch
|
||||
- Dont build lastlog (lastlog.legacy) anymore since we
|
||||
use lastlog2 by default now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 18 15:39:47 UTC 2023 - Michael Vetter <mvetter@suse.com>
|
||||
|
||||
28
shadow.spec
28
shadow.spec
@ -30,7 +30,7 @@ Group: System/Base
|
||||
URL: https://github.com/shadow-maint/shadow
|
||||
#Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz/
|
||||
#Source0: https://github.com/shadow-maint/shadow/releases/download/4.14.0-rc1/shadow-4.14.0-rc1.tar.xz#/shadow-%{version}.tar.xz
|
||||
Source0: https://github.com/shadow-maint/shadow/archive/refs/tags/4.14.0-rc1.tar.gz#/shadow-%{version}.tar.gz
|
||||
Source0: https://github.com/shadow-maint/shadow/releases/download/4.14.0-rc4/shadow-4.14.0-rc4.tar.xz#/shadow-%{version}.tar.xz
|
||||
Source1: pamd.tar.bz2
|
||||
#Source2: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc
|
||||
Source3: %{name}.keyring
|
||||
@ -50,20 +50,18 @@ 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
|
||||
Patch6: my.patch
|
||||
BuildRequires: audit-devel > 2.3
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libattr-devel
|
||||
# we need libbsd or glibc >= 2.38
|
||||
BuildRequires: libbsd-devel
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: libsemanage-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: xz
|
||||
# todo
|
||||
BuildRequires: byacc
|
||||
Requires: login_defs >= %{version}
|
||||
Requires(pre): group(root)
|
||||
Requires(pre): group(shadow)
|
||||
@ -111,7 +109,7 @@ Requires: libsubid4 = %{version}
|
||||
Development files for libsubid4.
|
||||
|
||||
%prep
|
||||
%setup -q -a 1 -n shadow-4.14.0-rc1
|
||||
%setup -q -a 1 -n shadow-4.14.0-rc4
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
@ -120,7 +118,6 @@ Development files for libsubid4.
|
||||
%if 0%{?suse_version} < 1330
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%patch6 -p1
|
||||
|
||||
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
|
||||
mv -v doc/HOWTO.utf8 doc/HOWTO
|
||||
@ -143,8 +140,7 @@ autoreconf -fvi
|
||||
--without-libcrack \
|
||||
--with-group-name-max-length=32 \
|
||||
--enable-vendordir=%{_distconfdir}
|
||||
#%make_build
|
||||
make -j1
|
||||
%make_build
|
||||
# --disable-shared \ currently doesn't build with this. See https://github.com/shadow-maint/shadow/issues/336
|
||||
|
||||
%install
|
||||
@ -226,12 +222,6 @@ if [ ! -d %{buildroot}%{_distconfdir} ]; then
|
||||
fi
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
|
||||
|
||||
%if 0%{?suse_version} >= 1599
|
||||
# Rename lastlog to lastlog.legacy, as it got replaced by lastlog2
|
||||
mv %{buildroot}/%{_bindir}/lastlog %{buildroot}/%{_bindir}/lastlog.legacy
|
||||
mv %{buildroot}/%{_mandir}/man8/lastlog.8 %{buildroot}/%{_mandir}/man8/lastlog.legacy.8
|
||||
%endif
|
||||
|
||||
%find_lang shadow
|
||||
|
||||
%pre
|
||||
@ -331,11 +321,6 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
|
||||
%verify(not mode) %attr(4755,root,shadow) %{_bindir}/passwd
|
||||
%verify(not mode) %attr(4755,root,shadow) %{_bindir}/newgidmap
|
||||
%verify(not mode) %attr(4755,root,shadow) %{_bindir}/newuidmap
|
||||
%if 0%{?suse_version} >= 1599
|
||||
%{_bindir}/lastlog.legacy
|
||||
%else
|
||||
%{_bindir}/lastlog
|
||||
%endif
|
||||
%{_bindir}/sg
|
||||
%{_bindir}/getsubids
|
||||
%attr(0755,root,root) %{_sbindir}/groupadd
|
||||
@ -367,11 +352,6 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
|
||||
%{_mandir}/man8/groupdel.8%{?ext_man}
|
||||
%{_mandir}/man8/groupmod.8%{?ext_man}
|
||||
%{_mandir}/man8/grpck.8%{?ext_man}
|
||||
%if 0%{?suse_version} >= 1599
|
||||
%{_mandir}/man8/lastlog.legacy.8%{?ext_man}
|
||||
%else
|
||||
%{_mandir}/man8/lastlog.8%{?ext_man}
|
||||
%endif
|
||||
%{_mandir}/man8/newusers.8%{?ext_man}
|
||||
%{_mandir}/man8/pwck.8%{?ext_man}
|
||||
%{_mandir}/man8/pwconv.8%{?ext_man}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user