X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=audit%2Faudit.nm;h=094a51b3afb56d3cbed44dba291096e6d652d56f;hb=fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e;hp=5e36fbb1b5cdd2ee2c263f21af2ad02240f22630;hpb=c8a19fb4502045811be3f620e197e4e82b7e43ec;p=ipfire-3.x.git

diff --git a/audit/audit.nm b/audit/audit.nm
index 5e36fbb1b..094a51b3a 100644
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = audit
-version    = 2.0.5
+version    = 2.5
 release    = 1
 
 groups     = System/Daemons
@@ -32,9 +32,6 @@ build
 	end
 
 	configure_options += \
-		--sysconfdir=/etc \
-		--sbindir=/sbin \
-		--libdir=/lib \
 		--without-prelude \
 		--without-libwrap \
 		--enable-gssapi-krb5=no \
@@ -45,12 +42,7 @@ build
 	end
 
 	install_cmds
-		rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so
-		ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so
-		ln -svf ../../lib/libauparse.so.0 %{BUILDROOT}/usr/lib/libauparse.so
-
-		mkdir -pv %{BUILDROOT}/usr/sbin/
-		mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
+		mkdir -pv %{BUILDROOT}/var/log/audit
 
 		rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig}
 	end
@@ -58,6 +50,25 @@ end
 
 packages
 	package %{name}
+		prerequires += systemd-units
+
+		script postin
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			/bin/systemctl --no-reload disable auditd.service >/dev/null 2>&1 || :
+			/bin/systemctl stop auditd.service >/dev/null 2>&1 || :
+		end
+
+		script postun
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			/bin/systemctl try-restart auditd.service >/dev/null 2>&1 || :
+		end
 	end
 
 	package %{name}-libs
@@ -66,6 +77,21 @@ packages
 
 	package %{name}-devel
 		template DEVEL
+
+		# Just require the libs to link
+		# against them.
+		requires
+			%{name}-libs = %{thisver}
+		end
+	end
+
+	package python-%{name}
+		summary = Python bindings for libaudit.
+		description = %{summary}
+
+		files
+			%{libdir}/python*/
+		end
 	end
 
 	package %{name}-debuginfo