- updated to 3.1.1

diff --git a/audit-am.patch b/audit-am.patch
deleted file mode 100644 (file)
index abae4ec..0000000
--- a/audit-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- audit-3.0.9/configure.ac.orig      2022-05-21 09:09:05.738660955 +0200
-+++ audit-3.0.9/configure.ac   2022-05-21 09:10:25.904893324 +0200
-@@ -31,7 +31,7 @@ define([AC_INIT_NOTICE],
- AC_REVISION($Revision: 1.3 $)dnl
- AC_INIT(audit,3.0.9)
- AC_PREREQ(2.12)dnl
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- echo Configuring auditd $VERSION
- 

diff --git a/audit-nolibs.patch b/audit-nolibs.patch
index bb3cd7539ab771b0df4bdcf8d5c79f72ad4a838a..9b662f43c1cb814c55d045748dacb4502d3a8400 100644 (file)
--- a/audit-nolibs.patch
+++ b/audit-nolibs.patch
@@ -1,6 +1,6 @@
---- audit-2.1.1/configure.ac.orig      2011-04-20 22:53:56.000000000 +0200
-+++ audit-2.1.1/configure.ac   2011-04-23 08:24:34.033844797 +0200
-@@ -193,8 +193,6 @@
+--- audit-3.1.1/configure.ac.orig      2023-04-27 19:26:56.000000000 +0200
++++ audit-3.1.1/configure.ac   2023-05-13 23:10:52.198788053 +0200
+@@ -421,8 +421,6 @@ AC_ARG_WITH(libwrap,
                AC_CHECK_HEADER(tcpd.h, [],
                        AC_MSG_ERROR([Could not find libwrap headers]),)
                AC_CHECK_LIB(wrap, request_init, [ LIBWRAP_LIBS="-lwrap" ])
@@ -9,7 +9,7 @@
                ;;
        *)
                AC_MSG_RESULT(yes)
-@@ -206,8 +204,6 @@
+@@ -434,8 +432,6 @@ AC_ARG_WITH(libwrap,
                AC_CHECK_HEADER(tcpd.h, [],
                        AC_MSG_ERROR([Could not find libwrap headers]))
                AC_CHECK_LIB(wrap, request_init, [])
@@ -17,4 +17,4 @@
 -                      LIBWRAP_LIBS="$LIBWRAP_LIBS -lnsl" ])
                OLDLIBS="$LIBS"
                LIBS="$LIBWRAP_LIBS $LIBS"
-               AC_TRY_LINK([ int allow_severity; int deny_severity; ],
+               AC_LINK_IFELSE([AC_LANG_PROGRAM(

diff --git a/audit-systemd-notonly.patch b/audit-systemd-notonly.patch
index ba809a815e5f7c759ee5e67fd4517b109bc3befc..fc40d7b868934dcf8bd36ca21ec92e34db066537 100644 (file)
--- a/audit-systemd-notonly.patch
+++ b/audit-systemd-notonly.patch
@@ -1,5 +1,5 @@
---- audit-3.0.8/init.d/Makefile.am.orig        2022-05-21 09:06:39.026122432 +0200
-+++ audit-3.0.8/init.d/Makefile.am     2022-05-21 09:08:48.412088155 +0200
+--- audit-3.1.1/init.d/Makefile.am.orig        2023-05-13 23:11:37.245210682 +0200
++++ audit-3.1.1/init.d/Makefile.am     2023-05-14 07:07:46.290438881 +0200
 @@ -29,12 +29,11 @@ EXTRA_DIST = auditd.init auditd.service
        audit-stop.rules augenrules audit-functions
  libconfig = libaudit.conf
@@ -42,7 +42,7 @@
 -      $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
  endif
 +      $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
-       chmod 0750 $(DESTDIR)$(sbindir)/augenrules
+       chmod 0755 $(DESTDIR)$(sbindir)/augenrules
  
  
  uninstall-hook:

diff --git a/audit.spec b/audit.spec
index 2bbdda95b21e72295a3c51eebaaaad9297dd9e4d..b12b13401ee43e96b56642a31d339550c24bf479 100644 (file)
--- a/audit.spec
+++ b/audit.spec
@@ -23,19 +23,18 @@
 Summary:       User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8):     Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:          audit
-Version:       3.0.9
+Version:       3.1.1
 Release:       1
 License:       GPL v2+
 Group:         Daemons
 Source0:       https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5: b10d29cc8454316eb0ec34f4c0345c2d
+# Source0-md5: 75363550690ee057f2fcf4f13eddcb4d
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-m4.patch
 Patch2:                %{name}-nolibs.patch
 Patch3:                %{name}-systemd-notonly.patch
-Patch4:                %{name}-am.patch
 Patch5:                %{name}-no-refusemanualstop.patch
 Patch7:                golang-paths.patch
 Patch8:                %{name}-flex-array-workaround.patch
@@ -46,7 +45,7 @@ BuildRequires:        automake >= 1:1.12.6
 BuildRequires: glibc-headers >= 6:2.3.6
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libcap-ng-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libwrap-devel
 BuildRequires: linux-libc-headers >= 7:2.6.30
 %{?with_zos_remote:BuildRequires:      openldap-devel}
@@ -186,12 +185,11 @@ Interfejs Pythona 3.x do biblioteki libaudit.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch7 -p1
 
 %if %{with flex_array_fix}
-# workaround flexible array member (char buf[]) incompatible with swig<=4.0.2
+# workaround flexible array member (char buf[]) incompatible with swig<=4.1.1
 cp /usr/include/linux/audit.h lib
 %patch8 -p1
 %endif
@@ -215,6 +213,7 @@ sed 's/swig//' -i bindings/Makefile.am
        %{?with_kerberos5:--enable-gssapi-krb5} \
        --enable-systemd \
        --with-apparmor \
+       --with-io_uring \
        --with-libwrap \
        %{!?with_zos_remote:--disable-zos-remote}
 
@@ -241,10 +240,10 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd
 
 install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libaudit.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libaudit.so
-mv -f $RPM_BUILD_ROOT%{_libdir}/libauparse.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libauparse.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libauparse.so
 
@@ -328,6 +327,7 @@ fi
 %attr(750,root,root) %{_sbindir}/aureport
 %attr(750,root,root) %{_sbindir}/ausearch
 %attr(750,root,root) %{_sbindir}/autrace
+%attr(755,root,root) %{_sbindir}/audisp-af_unix
 %attr(755,root,root) %{_sbindir}/audisp-remote
 %attr(755,root,root) %{_sbindir}/audisp-syslog
 %{_libexecdir}/audit-functions
@@ -352,6 +352,7 @@ fi
 %{_mandir}/man5/auditd-plugins.5*
 %{_mandir}/man5/ausearch-expression.5*
 %{_mandir}/man7/audit.rules.7*
+%{_mandir}/man8/audisp-af_unix.8*
 %{_mandir}/man8/audisp-remote.8*
 %{_mandir}/man8/audisp-syslog.8*
 %{_mandir}/man8/auditctl.8*