From 4406ca8e3508bec5e0435afe5651c364cb817a2e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:00:58 +0000 Subject: [PATCH] import UBI filesystem-3.18-16.el10 --- .filesystem.metadata | 0 SPECS/filesystem.spec => filesystem.spec | 194 +++++++++++++++------ SOURCES/iso_3166.sed => iso_3166.sed | 0 SOURCES/iso_639.sed => iso_639.sed | 0 SOURCES/lang-exceptions => lang-exceptions | 0 5 files changed, 139 insertions(+), 55 deletions(-) delete mode 100644 .filesystem.metadata rename SPECS/filesystem.spec => filesystem.spec (82%) rename SOURCES/iso_3166.sed => iso_3166.sed (100%) rename SOURCES/iso_639.sed => iso_639.sed (100%) rename SOURCES/lang-exceptions => lang-exceptions (100%) diff --git a/.filesystem.metadata b/.filesystem.metadata deleted file mode 100644 index e69de29..0000000 diff --git a/SPECS/filesystem.spec b/filesystem.spec similarity index 82% rename from SPECS/filesystem.spec rename to filesystem.spec index 16a222a..4b03222 100644 --- a/SPECS/filesystem.spec +++ b/filesystem.spec @@ -1,16 +1,28 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 16; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + Summary: The basic directory layout for a Linux system Name: filesystem -Version: 3.8 -Release: 6%{?dist} -License: Public Domain +Version: 3.18 +Release: %autorelease +License: LicenseRef-Fedora-Public-Domain URL: https://pagure.io/filesystem -Group: System Environment/Base Source1: https://pagure.io/filesystem/raw/master/f/lang-exceptions Source2: iso_639.sed Source3: iso_3166.sed BuildRequires: iso-codes Requires(pre): setup +Provides: filesystem-afs = %{version}-%{release} +Obsoletes: filesystem-afs <= 3.14-2 + %description The filesystem package is one of the basic packages that is installed on a Linux system. Filesystem contains the basic directory layout @@ -19,14 +31,12 @@ the directories. %package content Summary: Directory ownership content of the filesystem package -License: Public Domain %description content This subpackage of filesystem package contains just the file with the directories owned by the filesystem package. This can be used during the build process instead of calling rpm -ql filesystem. - %prep rm -f $RPM_BUILD_DIR/filelist @@ -40,14 +50,17 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed cd %{buildroot} -mkdir -p boot dev \ - etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d} \ - home media mnt opt proc root run srv sys tmp \ - usr/{bin,games,include,%{_lib}/{bpf,games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,sse2},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \ - var/{adm,empty,ftp,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp} +Paths=( + afs boot dev \ + etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,keys/ima,pki,bash_completion.d,default,rwtab.d,statetab.d} \ + home media mnt opt root run srv tmp \ + usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,systemd/{system,user},sysusers.d,tmpfiles.d},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,fish/vendor_completions.d,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11/fonts,wayland-sessions,zsh/site-functions},src,src/kernels,src/debug} \ + var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp} +) +for i in "${Paths[@]}"; do + mkdir -p "$i" +done -#do not create the symlink atm. -#ln -snf etc/sysconfig etc/default ln -snf ../var/tmp usr/tmp ln -snf spool/mail var/mail ln -snf usr/bin bin @@ -122,9 +135,6 @@ mkdir -p %{buildroot}/usr/share/filesystem find %{buildroot} -mindepth 0 | sed -e 's|%{buildroot}|/|' -e 's|//|/|' \ | LC_ALL=C sort | grep -v filesystem >%{buildroot}%{_datadir}/filesystem/paths -%clean -rm -rf %{buildroot} - %pretrans -p --# If we are running in pretrans in a fresh root, there is no /usr and --# symlinks. We cannot be sure, to be the very first rpm in the @@ -155,17 +165,8 @@ posix.symlink("usr/%{_lib}", "/%{_lib}") posix.mkdir("/run") posix.mkdir("/proc") posix.mkdir("/sys") - -st = posix.stat("/proc") -if st and st.mode ~= 0555 then - posix.chmod("/proc", 0555) -end - -st = posix.stat("/sys") -if st and st.mode ~= 0555 then - posix.chmod("/sys", 0555) -end - +posix.chmod("/proc", 0555) +posix.chmod("/sys", 0555) st = posix.stat("/media") if st and st.type == "link" then os.remove("/media") @@ -175,38 +176,39 @@ posix.symlink("../run", "/var/run") posix.symlink("../run/lock", "/var/lock") return 0 -%posttrans -#we need to restorecon on some dirs created in %pretrans or by other packages -restorecon /var 2>/dev/null >/dev/null || : -restorecon /var/run 2>/dev/null >/dev/null || : -restorecon /var/lock 2>/dev/null >/dev/null || : -restorecon -r /usr/lib/debug/ 2>/dev/null >/dev/null || : -restorecon /sys 2>/dev/null >/dev/null || : -restorecon /boot 2>/dev/null >/dev/null || : -restorecon /proc 2>/dev/null >/dev/null || : -restorecon /dev 2>/dev/null >/dev/null || : -restorecon /media 2>/dev/null >/dev/null || : +%posttrans -p +--# we need to restorecon on some dirs created in %pretrans or by other packages +if posix.access ("/usr/sbin/restorecon", "x") then + rpm.execute("/usr/sbin/restorecon", "/var", "/var/run", "/var/lock", "/sys", "/boot", "/dev", "/media", "/afs") + rpm.execute("/usr/sbin/restorecon", "-r", "/usr/lib/debug") +end %files content %dir %{_datadir}/filesystem %{_datadir}/filesystem/paths + + %files -f filelist %defattr(0755,root,root,0755) %dir %attr(555,root,root) / /bin %attr(555,root,root) /boot +%attr(555,root,root) /afs /dev %dir /etc /etc/X11 /etc/xdg /etc/opt /etc/pm -/etc/xinetd.d /etc/skel /etc/sysconfig +/etc/keys /etc/pki /etc/bash_completion.d/ +%dir /etc/default +%dir /etc/rwtab.d +%dir /etc/statetab.d /home /lib %ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64 @@ -216,11 +218,11 @@ restorecon /media 2>/dev/null >/dev/null || : %dir /mnt %dir /opt %ghost %attr(555,root,root) /proc -%ghost %attr(555,root,root) /sys %attr(550,root,root) /root /run /sbin /srv +%ghost %attr(555,root,root) /sys %attr(1777,root,root) /tmp %dir /usr %attr(555,root,root) /usr/bin @@ -228,6 +230,11 @@ restorecon /media 2>/dev/null >/dev/null || : /usr/include %dir %attr(555,root,root) /usr/lib %dir /usr/lib/sysimage +%dir /usr/lib/systemd +/usr/lib/systemd/system +/usr/lib/systemd/user +%dir /usr/lib/sysusers.d +%dir /usr/lib/tmpfiles.d %dir /usr/lib/locale %dir /usr/lib/modules %dir /usr/lib/debug @@ -235,7 +242,7 @@ restorecon /media 2>/dev/null >/dev/null || : %ghost /usr/lib/debug/bin %ghost /usr/lib/debug/lib %ghost /usr/lib/debug/%{_lib} -%ghost /usr/lib/debug/usr +%ghost %dir /usr/lib/debug/usr %ghost /usr/lib/debug/usr/bin %ghost /usr/lib/debug/usr/sbin %ghost /usr/lib/debug/usr/lib @@ -243,13 +250,11 @@ restorecon /media 2>/dev/null >/dev/null || : %ghost /usr/lib/debug/usr/.dwz %ghost /usr/lib/debug/sbin %attr(555,root,root) /usr/lib/games -%attr(555,root,root) /usr/lib/sse2 %ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64 %attr(555,root,root) /usr/%{_lib} %else -%attr(555,root,root) /usr/lib/tls -%attr(555,root,root) /usr/lib/X11 %attr(555,root,root) /usr/lib/bpf +%attr(555,root,root) /usr/lib/X11 %attr(555,root,root) /usr/lib/pm-utils %endif /usr/libexec @@ -268,6 +273,7 @@ restorecon /media 2>/dev/null >/dev/null || : /usr/share/dict /usr/share/doc %attr(555,root,root) %dir /usr/share/empty +/usr/share/fish /usr/share/games /usr/share/gnome /usr/share/help @@ -285,8 +291,10 @@ restorecon /media 2>/dev/null >/dev/null || : /usr/share/sounds /usr/share/themes /usr/share/xsessions -/usr/share/X11 +%dir /usr/share/X11 +/usr/share/X11/fonts /usr/share/wayland-sessions +/usr/share/zsh /usr/src /usr/tmp %dir /var @@ -297,7 +305,6 @@ restorecon /media 2>/dev/null >/dev/null || : /var/empty /var/ftp /var/games -/var/gopher /var/lib /var/local %ghost /var/lock @@ -314,15 +321,90 @@ restorecon /media 2>/dev/null >/dev/null || : /var/yp %changelog -* Mon Jun 21 2021 Pavel Zhukov - 3.8-6 -- Make /proc and /sys ghost to workaround issue in container -- Revert restorecon change +## START: Generated by rpmautospec +* Tue Oct 29 2024 Troy Dawson - 3.18-16 +- Bump release for October 2024 mass rebuild: -* Thu Apr 23 2020 Pavel Zhukov - 3.8-4 -- Do not restore content of /proc (#1827087) +* Tue Jun 25 2024 Martin Osvald - 3.18-15 +- Add ownership of /etc/default -* Wed Apr 22 2020 Pavel Zhukov - 3.8-3 -- Add BPF directories (#1788999) +* Mon Jun 24 2024 Troy Dawson - 3.18-9 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 3.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Peter Robinson - 3.18-6 +- Add /etc/keys for initrd/kernel related keys + +* Wed Jul 19 2023 Fedora Release Engineering - 3.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Feb 21 2023 Than Ngo - 3.18-4 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 3.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 09 2022 Martin Osvald - 3.18-2 +- Filesystem has a dependency on /bin/sh (rhbz#1306489) + +* Tue Jul 26 2022 Martin Osvald - 3.18-1 +- Filesystem has a dependency on /bin/sh (#1306489) +- Add /usr/share/X11/fonts/ to default filesystem (#2107447) +- Remove obsolete and forbidden Group tag +- Own zsh and fish completions directories (rhbz#1312594) +- Improve directory creation to avoid 'Argument list too long' error + +* Mon Jul 25 2022 Debarshi Ray - 3.17-1 +- Assume ownership of /usr/lib/tmpfiles.d + +* Thu Jul 21 2022 Fedora Release Engineering - 3.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Petr Menšík - 3.16-3 +- Include systemd directories for %unitdir and similar + +* Thu Jan 20 2022 Fedora Release Engineering - 3.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Aug 3 2021 Pavel Zhukov - 3.15-1 +- Move /afs into main package + +* Fri Aug 07 2020 Pavel Raiskup - 3.14-4 +- /proc and /sys made %%ghost to allow filesystem package updates in rootless + container environments (rhbz#1548403) + +* Mon Jan 27 2020 Ondrej Vasik - 3.14-1 +- do not restore context of /proc (#1722766) + +* Wed Dec 18 2019 Ondrej Vasik - 3.13-1 +- add ownership for eBPF bytecode files directories (#1781646) + +* Thu Jun 20 2019 David Howells - 3.12-1 +- add new -afs supbackage for /afs directory (#FPC888,#1720232) + +* Mon Apr 29 2019 Ondrej Vasik - 3.11-1 +- drop ownership for /etc/xinet.d (#1691146) +- drop ownership for %{_libdir}/tls, %{_libdir}/sse2 (#1702329) + +* Mon Feb 11 2019 Ondrej Vasik - 3.10-1 +- drop legacy /var/gopher (#1667231) + +* Thu Jan 31 2019 Fedora Release Engineering - 3.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 21 2018 Ondrej Vasik - 3.9-1 +- add ownership of /etc/rwtab.d and /etc/statetab.d + +* Tue Feb 20 2018 Adam Jackson - 3.8-3 +- own /etc/X11/xinit/{,{xinitrc,xinput}.d} * Wed Feb 07 2018 Fedora Release Engineering - 3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -436,7 +518,7 @@ restorecon /media 2>/dev/null >/dev/null || : * Sun Jun 30 2013 Ondrej Vasik - 3.2-17 - .dwz symlink is needed as well (#974130) -* Wed Jun 20 2013 Ondrej Vasik - 3.2-16 +* Thu Jun 20 2013 Ondrej Vasik - 3.2-16 - /var/run and /var/lock can't be in payload for some reason * Wed Jun 19 2013 Ondrej Vasik - 3.2-15 @@ -864,7 +946,7 @@ restorecon /media 2>/dev/null >/dev/null || : * Mon Aug 28 1999 Preston Brown - added /opt, /var/state, /var/cache for FHS compliance (#3966) -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 4) * Sun Jan 17 1999 Jeff Johnson @@ -901,3 +983,5 @@ restorecon /media 2>/dev/null >/dev/null || : * Wed Apr 16 1997 Erik Troan - Changed /proc to 555 - Removed /var/spool/mqueue (which is owned by sendmail) + +## END: Generated by rpmautospec diff --git a/SOURCES/iso_3166.sed b/iso_3166.sed similarity index 100% rename from SOURCES/iso_3166.sed rename to iso_3166.sed diff --git a/SOURCES/iso_639.sed b/iso_639.sed similarity index 100% rename from SOURCES/iso_639.sed rename to iso_639.sed diff --git a/SOURCES/lang-exceptions b/lang-exceptions similarity index 100% rename from SOURCES/lang-exceptions rename to lang-exceptions