Author: glen Date: Thu Mar 15 23:47:31 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- use /var/db/sudo for timedir (upstream default) -- do not lecture users with
each systemd boot
---- Files affected:
packages/sudo:
sudo.spec (1.191 -> 1.192) , sudo.tmpfiles (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/sudo/sudo.spec
diff -u packages/sudo/sudo.spec:1.191 packages/sudo/sudo.spec:1.192
--- packages/sudo/sudo.spec:1.191 Sun Feb 12 14:57:50 2012
+++ packages/sudo/sudo.spec Fri Mar 16 00:47:25 2012
@@ -22,7 +22,7 @@
Summary(uk.UTF-8): Дозволяє вказаним користувачам виконувати команди від
імені root
Name: sudo
Version: 1.7.8p2
-Release: 4
+Release: 5
Epoch: 1
License: BSD
Group: Applications/System
@@ -31,7 +31,6 @@
Source1: %{name}.pamd
Source2: %{name}-i.pamd
Source3: %{name}.logrotate
-Source4: %{name}.tmpfiles
Patch0: %{name}-libtool.patch
Patch1: %{name}-env.patch
Patch2: config.patch
@@ -159,7 +158,6 @@
%configure \
NROFFPROG=nroff \
--with-incpath=/usr/include/security \
- --with-timedir=/var/run/sudo \
--with-pam \
--with-pam-login \
--with-logging=both \
@@ -183,8 +181,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log/sudo-io,run/sudo},%{_mandir}/man8}
\
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/log/sudo-io,%{_mandir}/man8}
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -196,7 +193,6 @@
cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
touch $RPM_BUILD_ROOT/var/log/sudo
@@ -228,6 +224,10 @@
%service -q ldap restart
fi
+%triggerpostun -- %{name} < 1:1.7.8p2-5
+mv -f /var/run/sudo/* /var/db/sudo 2>/dev/null
+rmdir /var/run/sudo 2>/dev/null
+
%files
%defattr(644,root,root,755)
%doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
@@ -251,8 +251,7 @@
%attr(600,root,root) %ghost /var/log/sudo
%attr(700,root,root) /var/log/sudo-io
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/sudo
-%attr(700,root,root) %dir /var/run/sudo
-/usr/lib/tmpfiles.d/%{name}.conf
+%attr(700,root,root) %dir /var/db/sudo
%files -n openldap-schema-sudo
%defattr(644,root,root,755)
@@ -264,6 +263,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.192 2012/03/15 23:47:25 glen
+- use /var/db/sudo for timedir (upstream default) -- do not lecture users with
each systemd boot
+
Revision 1.191 2012/02/12 13:57:50 baggins
- rel 4
- really don't use pam's system-auth session
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sudo/sudo.spec?r1=1.191&r2=1.192&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
