audit-2.7.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11169 ec354946-7b23-47d6-9f5a-488ba84defc7

a/audit/audit-vl.spec

@@ -1,26 +1,35 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+%define _unpackaged_files_terminate_build 1
+%{!?__python3: %global __python3 /usr/bin/python3}
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 %define sca_version 0.4.10
 %define sca_release 4
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.7.18
-Release: 4%{?_dist_release}
+Version: 2.7.7
+Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
-Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-Source1: system-config-audit-ja.po
-Patch10: audit-1.7.18-pthread.patch
-Patch11: audit-1.7.18-krb5.patch
-Patch12: audit-1.7.18-libaudit.patch
+Source0: https://github.com/linux-audit/audit-userspace/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#Patch10: audit-1.7.18-pthread.patch
+#Patch11: audit-1.7.18-krb5.patch
+#Patch12: audit-1.7.18-libaudit.patch
+
+Distribution: Vine Linux
+Vendor: Project Vine
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gettext intltool libtool swig python-devel
+BuildRequires: gettext intltool libtool swig
+BuildRequires: python-devel python3-devel
+BuildRequires: openldap-devel
 BuildRequires: tcp_wrappers
 BuildRequires: krb5-devel
 BuildRequires: kernel-headers >= 2.6.18
+BuildRequires: libcap-ng-devel
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
 Requires: %{name}-libs = %{version}-%{release}
@@ -54,20 +63,29 @@ files needed for developing applications that need to use the audit
 framework libraries.
 
 %package libs-python
-Summary: Python bindings for libaudit
+Summary: Python2 bindings for libaudit
 License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
-and libauparse can be used by python.
+and libauparse can be used by python2.
+
+%package libs-python3
+Summary: Python3 bindings for libaudit
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description libs-python3
+The audit-libs-python3 package contains the bindings so that libaudit
+and libauparse can be used by python3.
 
 %package -n audispd-plugins
 Summary: Plugins for the audit event dispatcher
 License: GPLv2+
 Group: System Environment/Daemons
-BuildRequires: openldap-devel
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: openldap
@@ -78,18 +96,6 @@ interface to the audit system, audispd. These plugins can do things
 like relay events to remote machines or analyze events for suspicious
 behavior.
 
-%package -n system-config-audit
-Summary: Utility for editing audit configuration
-Version: %{sca_version}
-Release: %{sca_release}%{?_dist_release}
-License: GPLv2+
-Group: Applications/System
-BuildRequires: desktop-file-utils
-Requires: pygtk2-libglade usermode usermode-gtk
-
-%description -n system-config-audit
-A graphical utility for editing audit configuration.
-
 %package -n compat32-%{name}-libs
 Summary: Dynamic library for libaudit
 License: LGPLv2+
@@ -101,25 +107,24 @@ applications to use the audit framework.
 
 %prep
 %setup -q
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-cp -f %{SOURCE1} system-config-audit/po/ja.po
+#%patch10 -p1
+#%patch11 -p1
+#%patch12 -p1
 
 %build
-(cd system-config-audit; %configure)
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-libwrap --enable-gssapi-krb5=yes
-make %{?_smp_mflags}
+%configure --sbindir=/sbin --libdir=/%{_lib} \
+    --with-python=yes --with-python3=yes \
+    --with-libcap-ng=yes --with-libwrap --enable-gssapi-krb5=yes
+make CFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,rc.d/init.d}}
+mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,rc.d/init.d,audit/rules.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
-make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
-make -C system-config-audit DESTDIR=$RPM_BUILD_ROOT install-fedora
+make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 # This winds up in the wrong place when libtool is involved
@@ -135,24 +140,16 @@ cd $curdir
 # Remove these items so they don't get picked up.
 rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so
 rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_auparse.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_auparse.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/auparse.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/auparse.la
 
-# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
-touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+find $RPM_BUILD_ROOT -name '*.la' -delete
+find $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages -name '*.a' -delete
 
-%find_lang system-config-audit
+# Move the pkgconfig file
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
 
-desktop-file-install					\
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
-	--delete-original				\
-	system-config-audit/system-config-audit.desktop
+# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
+touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
 
 #% check
 #make check
@@ -204,12 +201,17 @@ fi
 
 %files libs
 %defattr(-,root,root)
-%attr(755,root,root) /%{_lib}/libaudit.*
-%attr(755,root,root) /%{_lib}/libauparse.*
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
+/%{_lib}/libaudit.*
+/%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+%{_mandir}/man5/libaudit.conf.5.gz
 
 %files libs-devel
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
 %doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
@@ -218,6 +220,9 @@ fi
 %{_includedir}/libaudit.h
 %{_includedir}/auparse.h
 %{_includedir}/auparse-defs.h
+%{_datadir}/aclocal/audit.m4
+%{_libdir}/pkgconfig/audit.pc
+%{_libdir}/pkgconfig/auparse.pc
 %{_mandir}/man3/*
 
 %files libs-python
@@ -226,9 +231,15 @@ fi
 %attr(755,root,root) %{python_sitearch}/auparse.so
 %{python_sitearch}/audit.py*
 
+%files libs-python3
+%defattr(-,root,root,-)
+%attr(755,root,root) %{python3_sitearch}/*
+
 %files
 %defattr(-,root,root,-)
-%doc  README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/stig.rules init.d/auditd.cron
+%doc README ChangeLog rules init.d/auditd.cron
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %attr(644,root,root) %{_mandir}/man8/audispd.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditd.8.gz
@@ -237,6 +248,8 @@ fi
 %attr(644,root,root) %{_mandir}/man8/autrace.8.gz
 %attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
 %attr(644,root,root) %{_mandir}/man8/aulast.8.gz
+%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
+%attr(644,root,root) %{_mandir}/man8/augenrules.8.gz
 %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
 %attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
 %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
@@ -248,20 +261,25 @@ fi
 %attr(755,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
 %attr(750,root,root) /sbin/audispd
+%attr(750,root,root) /sbin/augenrules
 %attr(750,root,root) %{_bindir}/aulastlog
 %attr(750,root,root) %{_bindir}/aulast
 %attr(755,root,root) %{_bindir}/ausyscall
+%attr(755,root,root) %{_bindir}/auvirt
 %attr(755,root,root) /etc/rc.d/init.d/auditd
-%attr(750,root,root) %{_var}/log/audit
+%attr(750,root,root) %dir %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit
+%attr(750,root,root) %dir /etc/audit/rules.d
 %attr(750,root,root) %dir /etc/audisp
 %attr(750,root,root) %dir /etc/audisp/plugins.d
-%attr(750,root,root) %dir %{_libdir}/audit
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
-%config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
+%ghost %config(noreplace) %attr(640,root,root) /etc/audit/rules.d/audit.rules
+%ghost %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
+%config(noreplace) %attr(640,root,root) /etc/audit/audit-stop.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 
 %files -n audispd-plugins
 %defattr(-,root,root,-)
@@ -277,29 +295,23 @@ fi
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
-%files -n system-config-audit -f system-config-audit.lang
-%defattr(-,root,root,-)
-%doc system-config-audit/AUTHORS
-%doc system-config-audit/COPYING
-%doc system-config-audit/ChangeLog
-%doc system-config-audit/NEWS
-%doc system-config-audit/README
-%{_bindir}/system-config-audit
-%{_datadir}/applications/system-config-audit.desktop
-%{_datadir}/system-config-audit
-%{_libexecdir}/system-config-audit-server-real
-%{_libexecdir}/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
 %defattr(-,root,root)
 %attr(755,root,root) /%{_lib}/libaudit.*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %endif
 
 %changelog
+* Sat Sep 09 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.7-1
+- new upstream release.
+- dropped all patches.
+- dropped system-config-audit.
+- added python3 bindings.
+
 * Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.18-4
 - fix sca_release