packages: system-config-audit/system-config-audit.spec, system-config-audit...

[glen]

Author: glen                         Date: Sat Mar  3 11:30:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix auditd restaring

---- Files affected:
packages/system-config-audit:
   system-config-audit.spec (1.5 -> 1.6) , auditd-restart.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/system-config-audit/system-config-audit.spec
diff -u packages/system-config-audit/system-config-audit.spec:1.5 packages/system-config-audit/system-config-audit.spec:1.6
--- packages/system-config-audit/system-config-audit.spec:1.5	Sat Mar  3 12:26:03 2012
+++ packages/system-config-audit/system-config-audit.spec	Sat Mar  3 12:30:04 2012
@@ -9,6 +9,7 @@
 Source0:	https://fedorahosted.org/releases/s/y/system-config-audit/%{name}-%{version}.tar.xz
 # Source0-md5:	1fe70708385f6e3b4c3a84c9d0bb07ee
 URL:		https://fedorahosted.org/system-config-audit/
+Patch0:		auditd-restart.patch
 BuildRequires:	audit-libs-devel
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	intltool
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e 's,/main\.py,/main.pyc,' src/system-config-audit.in
 
@@ -66,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/03/03 11:30:04  glen
+- fix auditd restaring
+
 Revision 1.5  2012/03/03 11:26:03  glen
 - up to 0.4.20; R: python-audit
 

================================================================
Index: packages/system-config-audit/auditd-restart.patch
diff -u /dev/null packages/system-config-audit/auditd-restart.patch:1.1
--- /dev/null	Sat Mar  3 12:30:10 2012
+++ packages/system-config-audit/auditd-restart.patch	Sat Mar  3 12:30:04 2012
@@ -0,0 +1,11 @@
+--- system-config-audit-0.4.20/src/server.c~	2012-02-06 19:41:42.000000000 +0200
++++ system-config-audit-0.4.20/src/server.c	2012-03-03 13:27:30.704519782 +0200
+@@ -344,7 +344,7 @@
+ 
+   assert (SOCKET_FILENO == STDIN_FILENO);
+   /* system() uses "sh -c ...", so the "exec " avoids one fork (). */
+-  res = system ("exec /sbin/service auditd condrestart "
++  res = system ("exec /sbin/service auditd try-restart "
+ 		STR(SOCKET_FILENO) "</dev/null");
+   if (res == -1)
+     err = errno;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-audit/system-config-audit.spec?r1=1.5&r2=1.6&f=u