Accepting request 540279 from security

- Rename python binding packages to match current python packaging
  standards
- Update python build dependencies to resolve future split of
  python2/3 (forwarded request 540272 from pluskalm)

OBS-URL: https://build.opensuse.org/request/show/540279
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audit?expand=0&rev=84

audit-2.7.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98e22549444c313187dc98c2e137f36a9882efa0874b559b0457e5f87ae178ef
-size 1110512

audit-2.8.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1becde92ff6e81798fa8878820ab2497d867036a6596f55109504b37c8b33b6c
+size 1120440

audit-implicit-writev.patch

@@ -1,24 +0,0 @@
-Index: audit-2.7.7/audisp/audispd.c
-===================================================================
---- audit-2.7.7.orig/audisp/audispd.c
-+++ audit-2.7.7/audisp/audispd.c
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/wait.h>
-+#include <sys/uio.h> // for writev() and readv()
- #include <pthread.h>
- #include <dirent.h>
- #include <fcntl.h>
-Index: audit-2.7.7/audisp/audispd-builtins.c
-===================================================================
---- audit-2.7.7.orig/audisp/audispd-builtins.c
-+++ audit-2.7.7/audisp/audispd-builtins.c
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <sys/un.h>
- #include <sys/stat.h>
-+#include <sys/uio.h> // for writev()
- #include <fcntl.h>
- #include "audispd-pconfig.h"
- #include "audispd-builtins.h"

audit-secondary.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Nov  9 16:21:23 UTC 2017 - mpluskal@suse.com
+
+- Rename python binding packages to match current python packaging
+  standards
+- Update python build dependencies to resolve future split of
+  python2/3
+
+-------------------------------------------------------------------
+Sat Nov  4 21:11:35 UTC 2017 - aavindraa@gmail.com
+
+- Update to version 2.8.1. See audit.spec (libaudit1) for upstream
+  changelog
+- Remove audit-implicit-writev.patch (fixed upstream across 2
+  commits)
+  * 3b30db20ad983274989ce9a522120c3c225436b3
+  * 07132c22314e9abbe64d1031fd8734243285bb3f
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Fri Aug 18 08:50:02 UTC 2017 - dimstar@opensuse.org
 

audit-secondary.spec

@@ -20,7 +20,7 @@
 # The seperation is required to minimize unnecessary build cycles.
 %define 	_name audit
 Name:           audit-secondary
-Version:        2.7.7
+Version:        2.8.1
 Release:        0
 Summary:        Linux kernel audit subsystem utilities
 License:        GPL-2.0+
@@ -31,21 +31,19 @@ Patch1:         audit-plugins-path.patch
 Patch2:         audit-no-gss.patch
 Patch3:         audit-allow-manual-stop.patch
 Patch4:         audit-ausearch-do-not-require-tclass.patch
-Patch5:         audit-implicit-writev.patch
 BuildRequires:  audit-devel = %{version}
 BuildRequires:  autoconf >= 2.12
 BuildRequires:  gcc-c++
 BuildRequires:  kernel-headers >= 2.6.30
 BuildRequires:  libtool
 BuildRequires:  openldap2-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  python3-devel
 BuildRequires:  swig
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(libcap-ng)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The audit package contains the user space utilities for storing and
@@ -65,21 +63,25 @@ The audit package contains the user space utilities for storing and
 processing the audit records generated by the audit subsystem in the
 Linux kernel.
 
-%package -n audit-libs-python
+%package -n     python2-audit
 Summary:        Python Bindings for libaudit
 License:        LGPL-2.1+
 Group:          Development/Languages/Python
+Provides:       audit-libs-python = %{version}
+Obsoletes:      audit-libs-python < %{version}
 
-%description -n audit-libs-python
+%description -n python2-audit
 The audit-libs-python package contains the bindings for using libaudit
 by python.
 
-%package -n audit-libs-python3
+%package -n python3-audit
 Summary:        Python3 Bindings for libaudit
 License:        LGPL-2.1+
 Group:          Development/Languages/Python
+Provides:       audit-libs-python3 = %{version}
+Obsoletes:      audit-libs-python3 < %{version}
 
-%description -n audit-libs-python3
+%description -n python3-audit
 The audit-libs-python3 package contains the bindings for using libaudit
 by python3.
 
@@ -103,7 +105,6 @@ rm -rf audisp/plugins/prelude
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 autoreconf -fi
@@ -121,7 +122,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 
 mkdir -p %{buildroot}%{_localstatedir}/log/audit/
 touch %{buildroot}%{_localstatedir}/log/audit/audit.log
@@ -193,7 +194,6 @@ fi
 %service_del_postun auditd.service
 
 %files -n audit
-%defattr(-,root,root,-)
 %doc README COPYING ChangeLog rules/[0-9]* rules/README-rules init.d/auditd.cron
 %attr(644,root,root) %{_mandir}/man8/audispd.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
@@ -246,20 +246,17 @@ fi
 %{_unitdir}/auditd.service
 %{_sbindir}/rcauditd
 
-%files -n audit-libs-python
+%files -n python2-audit
-%defattr(-,root,root,-)
 %attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/_audit.so
 %attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/auparse.so
 %{_libdir}/python%{py_ver}/site-packages/audit.py*
 
-%files -n audit-libs-python3
+%files -n python3-audit
-%defattr(-,root,root,-)
 %attr(755,root,root) %{_libdir}/python%{py3_ver}/site-packages/_audit.so
 %attr(755,root,root) %{_libdir}/python%{py3_ver}/site-packages/auparse.so
 %{_libdir}/python%{py3_ver}/site-packages/audit.py*
 
 %files -n audit-audispd-plugins
-%defattr(-,root,root,-)
 %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
 %attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz

audit.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Nov  4 21:12:09 UTC 2017 - aavindraa@gmail.com
+
+- Update to version 2.8.1 release (includes 2.8 and 2.7.8 changes)
+  * many features added to auparse_normalize
+  * cli option added to auditd and audispd for setting config dir
+  * in auditd, restore the umask after creating a log file
+  * option added to auditd for skipping email verification
+-  Full changelog: http://people.redhat.com/sgrubb/audit/ChangeLog
+
 -------------------------------------------------------------------
 Mon Jul 24 13:59:06 UTC 2017 - jengelh@inai.de
 

audit.spec

@@ -17,7 +17,7 @@
 
 
 Name:           audit
-Version:        2.7.7
+Version:        2.8.1
 Release:        0
 Summary:        Linux kernel audit subsystem utilities
 License:        GPL-2.0+
@@ -33,7 +33,6 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  tcpd-devel
 Requires:       %{name}-libs = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The audit package contains the user space utilities for storing and
@@ -98,7 +97,7 @@ make DESTDIR=%{buildroot} install -C lib
 make DESTDIR=%{buildroot} install -C auparse
 make DESTDIR=%{buildroot} install -C docs
 rm -rf %{buildroot}/%{_mandir}/man[578]
-mkdir -p %{buildroot}/etc
+mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}/%{_includedir}
 mkdir -p %{buildroot}/%{_mandir}/man5
 # We manually install this since Makefile doesn't
@@ -106,7 +105,7 @@ install -m 0644 lib/libaudit.h %{buildroot}/%{_includedir}
 install -D -m 0644 ./m4/audit.m4  %{buildroot}%{_datadir}/aclocal/audit.m4
 # Install libaudit.conf files by hand
 install -m 0644 docs/libaudit.conf.5 %{buildroot}/%{_mandir}/man5
-install -m 0644 init.d/libaudit.conf %{buildroot}/etc
+install -m 0644 init.d/libaudit.conf %{buildroot}%{_sysconfdir}
 
 find %{buildroot} -type f -name "*.la" -delete -print
 
@@ -120,17 +119,14 @@ make %{?_smp_mflags} check -C auparse
 %postun -n libauparse0 -p /sbin/ldconfig
 
 %files -n libaudit1
-%defattr(-,root,root)
 %{_libdir}/libaudit.so.*
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/libaudit.conf
-%{_mandir}/man5/libaudit.conf.5.gz
+%{_mandir}/man5/libaudit.conf.5%{ext_man}
 
 %files -n libauparse0
-%defattr(-,root,root)
 %{_libdir}/libauparse.so.*
 
 %files -n audit-devel
-%defattr(-,root,root)
 %doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.so
 %{_libdir}/libauparse.so