diff --git a/setup-2.14.3.tar.bz2 b/setup-2.14.3.tar.bz2 deleted file mode 100644 index 4e2327f..0000000 Binary files a/setup-2.14.3.tar.bz2 and /dev/null differ diff --git a/setup-2.14.5.tar.bz2 b/setup-2.14.5.tar.bz2 new file mode 100644 index 0000000..c556451 Binary files /dev/null and b/setup-2.14.5.tar.bz2 differ diff --git a/setup.spec b/setup.spec index dfa6351..5646199 100644 --- a/setup.spec +++ b/setup.spec @@ -1,13 +1,12 @@ Summary: A set of system configuration and setup files Name: setup -Version: 2.14.3 -Release: 4 +Version: 2.14.5 +Release: 1 License: Public Domain Group: System Environment/Base URL: https://pagure.io/setup/ Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Patch0: support-filesystems-xfs.patch -Patch1: source-cshlocal-when-login.patch BuildArch: noarch BuildRequires: systemd BuildRequires: bash tcsh perl-interpreter @@ -22,6 +21,7 @@ setup files, such as passwd, group, and profile. %prep %autosetup -n %{name}-%{version} -p1 +./generate-sysusers-fragments.sh ./shadowconvert.sh %build @@ -35,6 +35,8 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/etc/profile.d mkdir -p %{buildroot}/etc/motd.d cp -ar * %{buildroot}/etc +mkdir -p %(dirname %{buildroot}%{_sysusersdir}) +mv %{buildroot}/etc/sysusers.d %{buildroot}%{_sysusersdir} mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/ rm -f %{buildroot}/etc/uidgid rm -f %{buildroot}/etc/COPYING @@ -59,10 +61,18 @@ chmod 0644 %{buildroot}%{_tmpfilesdir}/%{name}.conf rm -f %{buildroot}/etc/Makefile rm -f %{buildroot}/etc/serviceslint rm -f %{buildroot}/etc/uidgidlint +rm -f %{buildroot}/etc/generate-sysusers-fragments.sh rm -f %{buildroot}/etc/shadowconvert.sh rm -f %{buildroot}/etc/setup.spec rm -rf %{buildroot}/etc/contrib +# make setup a protected package +install -p -d -m 755 %{buildroot}/etc/dnf/protected.d/ +touch %{name}.conf +echo setup > %{name}.conf +install -p -c -m 0644 %{name}.conf %{buildroot}/etc/dnf/protected.d/ +rm -f %{name}.conf + #throw away useless and dangerous update stuff until rpm will be able to #handle it ( http://rpm.org/ticket/6 ) %post -p @@ -117,8 +127,14 @@ end %config(noreplace) %verify(not md5 size mtime) /etc/shells %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab %{_tmpfilesdir}/%{name}.conf +%{_sysusersdir}/20-setup-groups.conf +%{_sysusersdir}/20-setup-users.conf +/etc/dnf/protected.d/%{name}.conf %changelog +* Wed Jan 31 2024 hongjinghao - 2.14.5-1 +- update to 2.14.5 + * Tue Aug 29 2023 hongjinghao - 2.14.3-4 - Revert "set TMOUT=300" diff --git a/source-cshlocal-when-login.patch b/source-cshlocal-when-login.patch deleted file mode 100644 index 44e8f5f..0000000 --- a/source-cshlocal-when-login.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/csh.login b/csh.login -index 51902e8..b6ef2e8 100644 ---- a/csh.login -+++ b/csh.login -@@ -22,7 +22,7 @@ set history=1000 - - if ( -d /etc/profile.d ) then - set nonomatch -- foreach i ( /etc/profile.d/*.csh ) -+ foreach i ( /etc/profile.d/*.csh /etc/profile.d/csh.local ) - if ( -r "$i" ) then - if ($?prompt) then - source "$i"