rpms/ppp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: don't ship /var/lock/ppp in rpm payload

Browse Source 
Recent changes in filesystem package prevent installation of ppp in
chroot because /run/lock directory is not created by filesystem
package anymore. To make things work again, we create ppp subdir in
%post scriptlet and mark it as %ghost.

Resolves: #980100
This commit is contained in:
Michal Sekletar 2013-07-12 15:45:34 +02:00
parent f2801bcfd9
commit f6b684d242
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ppp.spec
View File

@ -1,7 +1,7 @@
Summary: The Point-to-Point Protocol daemon Summary: The Point-to-Point Protocol daemon
Name: ppp Name: ppp
Version: 2.4.5 Version: 2.4.5
Release: 31%{?dist} Release: 32%{?dist}
License: BSD and LGPLv2+ and GPLv2+ and Public Domain License: BSD and LGPLv2+ and GPLv2+ and Public Domain
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.samba.org/ppp URL: http://www.samba.org/ppp
@ -129,6 +129,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ppp
%pre %pre
getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || : getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
%post
mkdir -p %{_localstatedir}/lock/ppp
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/chat %{_sbindir}/chat
@ -146,7 +149,7 @@ getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
%{_libdir}/pppd %{_libdir}/pppd
%dir %{_sysconfdir}/ppp %dir %{_sysconfdir}/ppp
%dir %{_localstatedir}/run/ppp %dir %{_localstatedir}/run/ppp
%dir %{_localstatedir}/lock/ppp %ghost %dir %{_localstatedir}/lock/ppp
%dir %{_sysconfdir}/logrotate.d %dir %{_sysconfdir}/logrotate.d
%attr(700, root, root) %dir %{_localstatedir}/log/ppp %attr(700, root, root) %dir %{_localstatedir}/log/ppp
%config %{_prefix}/lib/tmpfiles.d/ppp.conf %config %{_prefix}/lib/tmpfiles.d/ppp.conf
@ -165,6 +168,9 @@ getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
%doc PLUGINS %doc PLUGINS
%changelog %changelog
* Fri Jul 12 2013 Michal Sekletar <msekleta@redhat.com> - 2.4.5-32
- don't ship /var/lock/ppp in rpm payload and create it in %post instead
* Thu Jul 04 2013 Michal Sekletar <msekleta@redhat.com> - 2.4.5-31 * Thu Jul 04 2013 Michal Sekletar <msekleta@redhat.com> - 2.4.5-31
- fix possible NULL pointer dereferencing - fix possible NULL pointer dereferencing