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

@@ -1,16 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-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 <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <ctype.h>
- #include <locale.h>
- #include <string.h>
- #include <regex.h>

audit-no_plugins.patch

@@ -1,33 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-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
- 

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

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

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

auditd.sysconfig

@@ -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"