From e01a00e9c67dd3303b383321c37b66b23ab530cbf6945c013de6fa418ace32f6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jul 2007 23:18:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audit?expand=0&rev=6 --- audit-1.5.4.tar.gz | 3 --- audit-1.5.5.tar.gz | 3 +++ audit-apparmor-types.patch | 49 ++++++++++++++++++++++++++++++++++++++ audit-libs-python.changes | 5 ++++ audit-libs-python.spec | 18 +++++++++----- audit-no_python.patch | 8 +++++++ audit-no_sca.patch | 28 ++++++++++++++++++++++ audit-swig-attribute.patch | 10 -------- audit.changes | 8 +++++++ audit.spec | 20 ++++++++++++---- 10 files changed, 128 insertions(+), 24 deletions(-) delete mode 100644 audit-1.5.4.tar.gz create mode 100644 audit-1.5.5.tar.gz create mode 100644 audit-apparmor-types.patch create mode 100644 audit-no_sca.patch delete mode 100644 audit-swig-attribute.patch diff --git a/audit-1.5.4.tar.gz b/audit-1.5.4.tar.gz deleted file mode 100644 index 010fe3c..0000000 --- a/audit-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:192fcbd0cc45aa26d44607081acdbb60a002067a750d505822e99c8ab9929931 -size 325636 diff --git a/audit-1.5.5.tar.gz b/audit-1.5.5.tar.gz new file mode 100644 index 0000000..245b514 --- /dev/null +++ b/audit-1.5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c19fa0d43fc034151e6c170857a11918ff27fccb665498a94bd265566e73afd7 +size 986306 diff --git a/audit-apparmor-types.patch b/audit-apparmor-types.patch new file mode 100644 index 0000000..ac4e732 --- /dev/null +++ b/audit-apparmor-types.patch @@ -0,0 +1,49 @@ +From: John Johansen +Subject: AppArmor audit types +Upsteam: yes + +Update auditd for the extended types supported by AppArmor. + +Signed-off-by: John Johansen + +--- + lib/libaudit.h | 10 ++++++++-- + lib/msg_typetab.h | 8 +++++++- + 2 files changed, 15 insertions(+), 3 deletions(-) + +--- a/lib/libaudit.h ++++ b/lib/libaudit.h +@@ -131,8 +131,14 @@ extern "C" { + #endif + #define AUDIT_FIRST_APPARMOR 1500 + #define AUDIT_LAST_APPARMOR 1599 +-#ifndef AUDIT_SD +-#define AUDIT_SD 1500 /* Not upstream yet */ ++#ifndef AUDIT_AA ++#define AUDIT_AA 1500 /* Not upstream yet */ ++#define AUDIT_APPARMOR_AUDIT 1501 ++#define AUDIT_APPARMOR_ALLOWED 1502 ++#define AUDIT_APPARMOR_DENIED 1503 ++#define AUDIT_APPARMOR_HINT 1504 ++#define AUDIT_APPARMOR_STATUS 1505 ++#define AUDIT_APPARMOR_ERROR 1506 + #endif + + #define AUDIT_FIRST_KERN_CRYPTO_MSG 1600 +--- a/lib/msg_typetab.h ++++ b/lib/msg_typetab.h +@@ -105,7 +105,13 @@ _S(AUDIT_MAC_IPSEC_DELSPD, "MA + _S(AUDIT_ANOM_PROMISCUOUS, "ANOM_PROMISCUOUS" ) + _S(AUDIT_ANOM_ABEND, "ANOM_ABEND" ) + #ifdef WITH_APPARMOR +-_S(AUDIT_SD, "APPARMOR" ) ++_S(AUDIT_AA, "APPARMOR" ) ++_S(AUDIT_APPARMOR_AUDIT, "APPARMOR_AUDIT" ) ++_S(AUDIT_APPARMOR_ALLOWED, "APPARMOR_ALLOWED" ) ++_S(AUDIT_APPARMOR_DENIED, "APPARMOR_DENIED" ) ++_S(AUDIT_APPARMOR_HINT, "APPARMOR_HINT" ) ++_S(AUDIT_APPARMOR_STATUS, "APPARMOR_STATUS" ) ++_S(AUDIT_APPARMOR_ERROR, "APPARMOR_ERROR" ) + #endif + _S(AUDIT_KERNEL, "KERNEL" ) + _S(AUDIT_ANOM_LOGIN_FAILURES, "ANOM_LOGIN_FAILURES" ) diff --git a/audit-libs-python.changes b/audit-libs-python.changes index f315dc2..5e08594 100644 --- a/audit-libs-python.changes +++ b/audit-libs-python.changes @@ -1,3 +1,8 @@ +Wed Jul 25 01:13:09 CEST 2007 - tonyj@suse.de + +- Upgrade to 1.5.5 + Drop audit-swig-attribute.patch (upstreamed) + ------------------------------------------------------------------- Fri Jul 13 01:58:29 CEST 2007 - tonyj@suse.de diff --git a/audit-libs-python.spec b/audit-libs-python.spec index bea74e6..b402237 100644 --- a/audit-libs-python.spec +++ b/audit-libs-python.spec @@ -1,5 +1,5 @@ # -# spec file for package audit-libs-python (Version 1.5.4) +# spec file for package audit-libs-python (Version 1.5.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,13 +14,14 @@ Name: audit-libs-python %define _name audit BuildRequires: audit-devel gcc-c++ pkg-config python-devel swig Summary: Python bindings for libaudit -Version: 1.5.4 -Release: 3 +Version: 1.5.5 +Release: 1 License: GPL v2 or later Group: System/Monitoring URL: http://people.redhat.com/sgrubb/audit/ Source0: audit-%{version}.tar.gz -Patch0: audit-swig-attribute.patch +Patch0: audit-no_sca.patch +Patch1: audit-apparmor-types.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: audit-libs = %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' audit-libs`) PreReq: %insserv_prereq %fillup_prereq @@ -37,10 +38,12 @@ Authors: %prep %setup -q -n audit-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build -autoreconf -iv --install +#autoreconf -iv --install +aclocal && autoconf && autoheader && automake export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" ./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --with-apparmor @@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python%{py_ver}/site-packages/audit.py* %changelog +* Wed Jul 25 2007 - tonyj@suse.de +- Upgrade to 1.5.5 + Drop audit-swig-attribute.patch (upstreamed) * Fri Jul 13 2007 - tonyj@suse.de - Fix build errors on ppc * Thu Jul 12 2007 - tonyj@suse.de diff --git a/audit-no_python.patch b/audit-no_python.patch index ecc8be0..56a951e 100644 --- a/audit-no_python.patch +++ b/audit-no_python.patch @@ -1,3 +1,11 @@ +From: Tony Jones +Subject: Disable automatic building of python code +Upsteam: never + +Python code is disabled for audit.spec. Built manually by audit-libs-python.spec. +This is apparantly necessary due to the SuSE build system. Bit of a PITA but +there you have it. + --- audit-1.5.1/configure.ac.orig 2007-03-01 01:54:19.977676000 +0100 +++ audit-1.5.1/configure.ac 2007-03-01 02:09:06.032928000 +0100 @@ -39,7 +39,7 @@ diff --git a/audit-no_sca.patch b/audit-no_sca.patch new file mode 100644 index 0000000..c5ab10c --- /dev/null +++ b/audit-no_sca.patch @@ -0,0 +1,28 @@ +From: Tony Jones +Subject: Disable system-config-audit +Upsteam: never + +Disable system-config-audit. A Yast equivalent would be useful though. + +--- audit-1.5.5/configure.ac.old 2007-07-25 02:13:48.399097000 +0200 ++++ audit-1.5.5/configure.ac 2007-07-25 02:14:25.113347000 +0200 +@@ -108,7 +108,6 @@ + if test x$use_apparmor != xno ; then + AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi + +-AC_CONFIG_SUBDIRS([system-config-audit]) + AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile bindings/Makefile bindings/python/Makefile) + + echo . + +--- audit-1.5.5/Makefile.am.old 2007-07-25 02:14:02.108373000 +0200 ++++ audit-1.5.5/Makefile.am 2007-07-25 02:14:34.180268000 +0200 +@@ -21,7 +21,7 @@ + # Rickard E. (Rik) Faith + # + +-SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs system-config-audit ++SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs + EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec + CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/* + diff --git a/audit-swig-attribute.patch b/audit-swig-attribute.patch deleted file mode 100644 index 912356c..0000000 --- a/audit-swig-attribute.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- audit-1.5.4/swig/auditswig.i 2007-06-14 17:17:00.000000000 +0200 -+++ audit-1.5.4/swig/auditswig.i 2007-07-12 23:27:24.764034000 +0200 -@@ -26,6 +26,7 @@ - %define __signed__ - signed - %enddef -+#define __attribute(x) /* nothing */ - %include "/usr/include/asm/types.h" - %include "/usr/include/linux/audit.h" - #define __extension__ /*nothing*/ diff --git a/audit.changes b/audit.changes index 2e652e8..46bf014 100644 --- a/audit.changes +++ b/audit.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 25 01:13:09 CEST 2007 - tonyj@suse.de + +- Upgrade to 1.5.5 + Correct bug in audit_make_equivalent function (Al Viro) + Local: add AppArmor audit ID (upstream in 1.5.6) + don't build RedHat system-config-audit + ------------------------------------------------------------------- Thu Jul 12 01:38:36 CEST 2007 - tonyj@suse.de diff --git a/audit.spec b/audit.spec index 56d132a..5e13942 100644 --- a/audit.spec +++ b/audit.spec @@ -1,5 +1,5 @@ # -# spec file for package audit (Version 1.5.4) +# spec file for package audit (Version 1.5.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,15 +13,17 @@ Name: audit BuildRequires: gcc-c++ Summary: User Space Tools for 2.6 Kernel Auditing -Version: 1.5.4 -Release: 3 +Version: 1.5.5 +Release: 1 License: GPL v2 or later Group: System/Monitoring URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.gz Source1: auditd.init Source2: auditd.sysconfig -Patch0: audit-no_python.patch +Patch0: audit-no_sca.patch +Patch1: audit-no_python.patch +Patch2: audit-apparmor-types.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-libs = %{version}-%{release} PreReq: %insserv_prereq %fillup_prereq @@ -87,9 +89,12 @@ Authors: %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -autoreconf -iv --install +#autoreconf -iv --install +aclocal && autoconf && autoheader && automake export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" ./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --libexecdir=%{_prefix}/lib/%{name} --with-apparmor @@ -197,6 +202,11 @@ fi %ghost %config(noreplace) /var/log/audit/audit.log %changelog +* Wed Jul 25 2007 - tonyj@suse.de +- Upgrade to 1.5.5 + Correct bug in audit_make_equivalent function (Al Viro) + Local: add AppArmor audit ID (upstream in 1.5.6) + don't build RedHat system-config-audit * Thu Jul 12 2007 - tonyj@suse.de - Upgrade to 1.5.4 Add feed interface to auparse library (John Dennis)