forked from pool/glibc
Accepting request 230181 from home:a_jaeger:FactoryFix
Use /run instead of /var/run OBS-URL: https://build.opensuse.org/request/show/230181 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=360
This commit is contained in:
Andreas Schwab
Git OBS Bridge
parent
6addb61a16
commit
fdfb701f1a
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 11:00:59 UTC 2014 - aj@suse.com
|
||||
|
||||
- Use /run for nscd instead of /var/run.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 09:06:32 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
@ -887,9 +887,9 @@ popd
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/var/run/nscd
|
||||
touch %{buildroot}/var/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -971,7 +971,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/var/run/nscd
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
%endif # i686
|
||||
|
||||
%endif # %{normal_build}
|
||||
@ -1021,7 +1021,7 @@ done
|
||||
|
||||
%pre -n nscd
|
||||
getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /run/nscd nscd
|
||||
%service_add_pre nscd.service
|
||||
|
||||
%preun -n nscd
|
||||
@ -1029,7 +1029,7 @@ getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nsc
|
||||
|
||||
%post -n nscd
|
||||
%service_add_post nscd.service
|
||||
mkdir -p /var/run/nscd
|
||||
mkdir -p /run/nscd
|
||||
# Previously we had nscd.socket, remove it
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || :
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || :
|
||||
@ -1274,14 +1274,14 @@ exit 0
|
||||
/usr/lib/systemd/system/nscd.service
|
||||
%dir /usr/lib/tmpfiles.d
|
||||
/usr/lib/tmpfiles.d/nscd.conf
|
||||
%dir %attr(0755,root,root) %ghost /var/run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 11:00:59 UTC 2014 - aj@suse.com
|
||||
|
||||
- Use /run for nscd instead of /var/run.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 09:06:32 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
@ -887,9 +887,9 @@ popd
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/var/run/nscd
|
||||
touch %{buildroot}/var/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -971,7 +971,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/var/run/nscd
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
%endif # i686
|
||||
|
||||
%endif # %{normal_build}
|
||||
@ -1021,7 +1021,7 @@ done
|
||||
|
||||
%pre -n nscd
|
||||
getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /run/nscd nscd
|
||||
%service_add_pre nscd.service
|
||||
|
||||
%preun -n nscd
|
||||
@ -1029,7 +1029,7 @@ getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nsc
|
||||
|
||||
%post -n nscd
|
||||
%service_add_post nscd.service
|
||||
mkdir -p /var/run/nscd
|
||||
mkdir -p /run/nscd
|
||||
# Previously we had nscd.socket, remove it
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || :
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || :
|
||||
@ -1274,14 +1274,14 @@ exit 0
|
||||
/usr/lib/systemd/system/nscd.service
|
||||
%dir /usr/lib/tmpfiles.d
|
||||
/usr/lib/tmpfiles.d/nscd.conf
|
||||
%dir %attr(0755,root,root) %ghost /var/run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 11:00:59 UTC 2014 - aj@suse.com
|
||||
|
||||
- Use /run for nscd instead of /var/run.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 7 09:06:32 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
28
glibc.spec
28
glibc.spec
@ -887,9 +887,9 @@ popd
|
||||
cp nscd/nscd.conf %{buildroot}/etc
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
|
||||
mkdir -p %{buildroot}/var/run/nscd
|
||||
touch %{buildroot}/var/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
|
||||
mkdir -p %{buildroot}/run/nscd
|
||||
touch %{buildroot}/run/nscd/{passwd,group,hosts,services,netgroup}
|
||||
touch %{buildroot}/run/nscd/{socket,nscd.pid}
|
||||
|
||||
#
|
||||
# Create ld.so.conf
|
||||
@ -971,7 +971,7 @@ rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
|
||||
rm -f %{buildroot}/etc/*nscd* %{buildroot}%{_sbindir}/*nscd*
|
||||
rm -rf %{buildroot}/usr/lib/systemd
|
||||
rm -rf %{buildroot}/usr/lib/tmpfiles.d
|
||||
rm -rf %{buildroot}/var/run/nscd
|
||||
rm -rf %{buildroot}/run/nscd
|
||||
%endif # i686
|
||||
|
||||
%endif # %{normal_build}
|
||||
@ -1021,7 +1021,7 @@ done
|
||||
|
||||
%pre -n nscd
|
||||
getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
|
||||
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /run/nscd nscd
|
||||
%service_add_pre nscd.service
|
||||
|
||||
%preun -n nscd
|
||||
@ -1029,7 +1029,7 @@ getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nsc
|
||||
|
||||
%post -n nscd
|
||||
%service_add_post nscd.service
|
||||
mkdir -p /var/run/nscd
|
||||
mkdir -p /run/nscd
|
||||
# Previously we had nscd.socket, remove it
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket 2>/dev/null || :
|
||||
test -x /usr/bin/systemctl && /usr/bin/systemctl disable nscd.socket 2>/dev/null || :
|
||||
@ -1274,14 +1274,14 @@ exit 0
|
||||
/usr/lib/systemd/system/nscd.service
|
||||
%dir /usr/lib/tmpfiles.d
|
||||
/usr/lib/tmpfiles.d/nscd.conf
|
||||
%dir %attr(0755,root,root) %ghost /var/run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/netgroup
|
||||
%dir %attr(0755,root,root) %ghost /run/nscd
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
|
||||
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/passwd
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/hosts
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/services
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/netgroup
|
||||
%endif # !i686
|
||||
|
||||
%if %{build_profile}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user