From 8ed4de84e360c212eaf16da234a15d2d38b1a746 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 30 Oct 2020 02:36:17 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/filesystem.git#bceee1afe19a83bf101c95fdc3517c3f704d93c1 --- filesystem.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 5372dc1..fad947c 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,7 +1,7 @@ Summary: The basic directory layout for a Linux system Name: filesystem Version: 3.14 -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain URL: https://pagure.io/filesystem Group: System Environment/Base @@ -50,7 +50,7 @@ cd %{buildroot} mkdir -p afs boot dev \ etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,pki,bash_completion.d,rwtab.d,statetab.d} \ - home media mnt opt proc root run srv sys tmp \ + 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},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,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp} @@ -158,6 +158,10 @@ posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz") posix.symlink("usr/sbin", "/usr/lib/debug/sbin") posix.symlink("usr/%{_lib}", "/%{_lib}") posix.mkdir("/run") +posix.mkdir("/proc") +posix.mkdir("/sys") +posix.chmod("/proc", 0555) +posix.chmod("/sys", 0555) st = posix.stat("/media") if st and st.type == "link" then os.remove("/media") @@ -213,12 +217,12 @@ restorecon /afs 2>/dev/null >/dev/null || : /media %dir /mnt %dir /opt -%attr(555,root,root) /proc +%ghost %attr(555,root,root) /proc %attr(550,root,root) /root /run /sbin /srv -%attr(555,root,root) /sys +%ghost %attr(555,root,root) /sys %attr(1777,root,root) /tmp %dir /usr %attr(555,root,root) /usr/bin @@ -309,6 +313,10 @@ restorecon /afs 2>/dev/null >/dev/null || : /var/yp %changelog +* 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 Jul 27 2020 Fedora Release Engineering - 3.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild