From 23426a606f8f063ee430927c097ddd98feede6c5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 16 Dec 2022 16:24:25 +0000
Subject: [PATCH] audit: Drop package

This package is not very useful as we do not have any sources
configured, nor do we have the audit subsystem enabled in the kernel.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 audit/audit.nm               | 100 -----------------------------------
 audit/systemd/auditd.service |  11 ----
 openssh/openssh.nm           |   3 +-
 3 files changed, 1 insertion(+), 113 deletions(-)
 delete mode 100644 audit/audit.nm
 delete mode 100644 audit/systemd/auditd.service

diff --git a/audit/audit.nm b/audit/audit.nm
deleted file mode 100644
index 094a51b3a..000000000
--- a/audit/audit.nm
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = audit
-version    = 2.5
-release    = 1
-
-groups     = System/Daemons
-url        = http://people.redhat.com/sgrubb/audit/
-license    = GPLv2+
-summary    = User space tools for 2.6 kernel auditing.
-
-description
-	The audit package contains the user space utilities for
-	storing and searching the audit records generate by
-	the audit subsystem in the Linux 2.6 kernel.
-end
-
-source_dl  = http://people.redhat.com/sgrubb/audit/
-
-build
-	requires
-		autoconf
-		automake
-		libcap-ng-devel
-		libtool
-		openldap-devel
-		python-devel
-		swig
-	end
-
-	configure_options += \
-		--without-prelude \
-		--without-libwrap \
-		--enable-gssapi-krb5=no \
-		--with-libcap-ng=yes
-
-	prepare_cmds
-		autoreconf -fvi
-	end
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}/var/log/audit
-
-		rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig}
-	end
-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
-		template LIBS
-	end
-
-	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
-		template DEBUGINFO
-	end
-end
diff --git a/audit/systemd/auditd.service b/audit/systemd/auditd.service
deleted file mode 100644
index 04b0b3633..000000000
--- a/audit/systemd/auditd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Security Auditing Service
-After=syslog.target
-
-[Service]
-ExecStart=/sbin/auditd -n
-ExecStartPost=/sbin/auditctl -R /etc/audit/audit.rules
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index 6df5d41fa..9ae7bf738 100644
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -5,7 +5,7 @@
 
 name       = openssh
 version    = 9.1p1
-release    = 1
+release    = 2
 
 groups     = Application/Internet
 url        = https://www.openssh.com/portable.html
@@ -130,7 +130,6 @@ packages
 		description = %{summary}
 
 		requires
-			audit
 			openssh = %{thisver}
 		end
 
-- 
2.39.2