From 87bc3dd49c21a9b09e74bb464c4259300733615ebdb4d8a6cb953d352555926a Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Wed, 4 Dec 2013 07:41:29 +0000 Subject: [PATCH] Accepting request 209366 from home:jones_tony:branches:security OBS-URL: https://build.opensuse.org/request/show/209366 OBS-URL: https://build.opensuse.org/package/show/security/audit?expand=0&rev=58 --- audit-fix-implicit-defn.patch | 16 ---------------- audit-no_plugins.patch | 33 --------------------------------- audit-secondary.changes | 2 ++ audit-secondary.spec | 4 ++-- audit.spec | 5 ++--- auditd.sysconfig | 15 --------------- 6 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 audit-fix-implicit-defn.patch delete mode 100644 audit-no_plugins.patch delete mode 100644 auditd.sysconfig diff --git a/audit-fix-implicit-defn.patch b/audit-fix-implicit-defn.patch deleted file mode 100644 index e6dbb6d..0000000 --- a/audit-fix-implicit-defn.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Tony Jones -Subject: fix implicit definition warnings -Upstream: pending - -Fixes "W: audit-secondary implicit-pointer-decl auvirt.c:984" - ---- a/tools/auvirt/auvirt.c -+++ b/tools/auvirt/auvirt.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/audit-no_plugins.patch b/audit-no_plugins.patch deleted file mode 100644 index 94925da..0000000 --- a/audit-no_plugins.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Tony Jones -Subject: Disable automatic building of plugins -Upsteam: never - -Non builtin plugins is build as part of phase2 by audit-secondary.spec. -Conf files for builtins are still installed - ---- - audisp/plugins/Makefile.am | 2 +- - docs/Makefile.am | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - ---- a/audisp/plugins/Makefile.am -+++ b/audisp/plugins/Makefile.am -@@ -22,7 +22,7 @@ - - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - --SUBDIRS = builtins zos-remote remote -+SUBDIRS = builtins - #SUBDIRS = builtins zos-remote - if HAVE_PRELUDE - SUBDIRS += prelude ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -53,6 +53,5 @@ ausearch_add_expression.3 ausearch_add_t - ausearch_clear.3 \ - ausearch_next_event.3 ausearch_set_stop.3 \ - autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \ --audispd.8 audispd.conf.5 audispd-zos-remote.8 libaudit.conf.5 \ --zos-remote.conf.5 -+audispd.8 audispd.conf.5 libaudit.conf.5 - diff --git a/audit-secondary.changes b/audit-secondary.changes index dabec0d..f32f09a 100644 --- a/audit-secondary.changes +++ b/audit-secondary.changes @@ -8,6 +8,8 @@ Tue Nov 26 18:28:58 UTC 2013 - tonyj@suse.com stop/restart. - /etc/sysconfig/audit still existed but was no longer referenced by systemd, so remove +- Delete audit-no_plugins.patch, it was stale (no longer referenced + by specfiles) but had not been removed. ------------------------------------------------------------------- Wed Oct 2 12:48:50 UTC 2013 - opensuse@cboltz.de diff --git a/audit-secondary.spec b/audit-secondary.spec index fda5e39..5fa21e4 100644 --- a/audit-secondary.spec +++ b/audit-secondary.spec @@ -165,7 +165,7 @@ if [ -f /etc/auditd.conf ]; then fi if [ -f /etc/audit.rules ]; then mv /etc/audit.rules /etc/audit/audit.rules -elif [ ! -f /etc/audit/auditd.conf ]; then +elif [ ! -f /etc/audit/audit.rules ]; then cp /etc/audit/rules.d/audit.rules /etc/audit/audit.rules fi %service_add_post auditd.service @@ -222,9 +222,9 @@ fi %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf %ghost /etc/auditd.conf %ghost /etc/audit.rules +%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf %dir %attr(750,root,root) /etc/audit/rules.d %config %attr(640,root,root) /etc/audit/rules.d/audit.rules -%ghost /etc/audit/auditd.conf %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf %dir %attr(700,root,root) /var/log/audit %ghost %config(noreplace) /var/log/audit/audit.log diff --git a/audit.spec b/audit.spec index 6809116..410eb3f 100644 --- a/audit.spec +++ b/audit.spec @@ -24,9 +24,8 @@ Version: 2.3.2 Release: 0 Url: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz -Source2: auditd.sysconfig -Source3: baselibs.conf -Source4: README-BEFORE-ADDING-PATCHES +Source1: baselibs.conf +Source2: README-BEFORE-ADDING-PATCHES Patch1: audit-no_m4_dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.12 diff --git a/auditd.sysconfig b/auditd.sysconfig deleted file mode 100644 index 75fac98..0000000 --- a/auditd.sysconfig +++ /dev/null @@ -1,15 +0,0 @@ -# -## Type: string -## Default: "yes" -# -# This option is used to determine if rules & watches should be deleted on -# shutdown. This is beneficial in most cases so that a watch doesn't linger -# on a drive that is being unmounted. If set to no, it will NOT be cleaned up. -AUDITD_CLEAN_STOP="yes" -# -## Type: yesno -## Default: yes -# -# This option disables syscall auditing by default. This can also be -# accomplished by auditctl -e. -AUDITD_DISABLE_CONTEXTS="yes"