updated 3 packages

audit-3.0.1-1

initscripts-8.91.16-6

libsigsegv-2.13-1

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

a/audit/audit-vl.spec

@@ -1,37 +1,40 @@
+%bcond_with systemd
+
 %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: 2.8.5
-Release: 1%{?_dist_release}
+Version: 3.0.1
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 License: GPLv2+
-Group: System Environment/Daemons
-URL: http://people.redhat.com/sgrubb/audit/
-Source0: https://github.com/linux-audit/audit-userspace/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch1: audit-2.8.6-memleak.patch
-
+Group: system,admin-tools
 Distribution: Vine Linux
 Vendor: Project Vine
 
+URL: http://people.redhat.com/sgrubb/audit/
+Source0: https://github.com/linux-audit/audit-userspace/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch1: audit-3.0.2-sockaddr.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext intltool libtool swig
-BuildRequires: python-devel python3-devel
+BuildRequires: python-devel python-rpm-macros
+BuildRequires: python3-devel python3-rpm-macros
 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
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+%endif
 Requires: %{name}-libs = %{version}-%{release}
-Requires: chkconfig
 Requires(pre): coreutils
 
 %description
@@ -39,19 +42,21 @@ The audit package contains the user space utilities for
 storing and searching the audit records generate by
 the audit subsystem in the Linux 2.6 kernel.
 
+
 %package libs
 Summary: Dynamic library for libaudit
 License: LGPLv2+
-Group: Development/Libraries
+Group: system
 
 %description libs
 The audit-libs package contains the dynamic libraries needed for 
 applications to use the audit framework.
 
+
 %package libs-devel
 Summary: Header files and static library for libaudit
 License: LGPLv2+
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kernel-headers >= 2.6.18
 
@@ -60,20 +65,22 @@ The audit-libs-devel package contains the static libraries and header
 files needed for developing applications that need to use the audit 
 framework libraries.
 
+
 %package libs-python
 Summary: Python2 bindings for libaudit
 License: LGPLv2+
-Group: Development/Libraries
+Group: programming
 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 python2.
 
+
 %package libs-python3
 Summary: Python3 bindings for libaudit
 License: LGPLv2+
-Group: Development/Libraries
+Group: programming
 Provides: python-audit = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -81,14 +88,14 @@ Requires: %{name}-libs = %{version}-%{release}
 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
+Group: system
 License: GPLv2+
-Group: System Environment/Daemons
 Provides: python3-audit = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
-Requires: openldap
 
 %description -n audispd-plugins
 The audispd-plugins package provides plugins for the real-time
@@ -96,32 +103,66 @@ 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 audispd-plugins-zos
+Summary: z/OS plugin for the audit event dispatcher
+Group: system
+License: GPLv2+
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: openldap
+
+%description -n audispd-plugins-zos
+The audispd-plugins-zos package provides a plugin that will forward all
+incoming audit events, as they happen, to a configured z/OS SMF (Service
+Management Facility) database, through an IBM Tivoli Directory Server
+(ITDS) set for Remote Audit service.
+
+
 %package -n compat32-%{name}-libs
 Summary: Dynamic library for libaudit
 License: LGPLv2+
-Group: Development/Libraries
+Group: system
 
 %description -n compat32-%{name}-libs
 The audit-libs package contains the dynamic libraries needed for 
 applications to use the audit framework.
 
+
+%debug_package
+
+
 %prep
-%setup -q
+%setup -q -n audit-userspace-%{version}
 %patch1 -p1
 
+autoreconf -vif
+# Remove the ids code, its not ready
+sed -i 's/ ids / /' audisp/plugins/Makefile.in
+
+
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} \
     --with-python=yes --with-python3=yes \
-    --with-libcap-ng=yes --with-libwrap --enable-gssapi-krb5=yes
+    --with-libcap-ng=yes --enable-gssapi-krb5=yes \
+    --enable-zos-remote \
+    --enable-experimental \
+%if %{with systemd}
+    --enable-systemd
+%else
+    %{nil}
+%endif
 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,audit/rules.d}}
+mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audit/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
+mkdir -p --mode=0700 $RPM_BUILD_ROOT/%{_var}/log/audit
+mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/audit
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
@@ -149,17 +190,19 @@ mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
 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
+%if %{with systemd}
+rm -rf %{buildroot}%{_libexecdir}/initscripts
+mkdir -p %{buildroot}%{_unitdir}
+mv %{buildroot}/usr/lib/systemd/system/auditd.service %{buildroot}%{_unitdir}/
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf zos-remote-policy
 
-%post libs -p /sbin/ldconfig
 
 %post
-/sbin/chkconfig --add auditd
 # This is to migrate users from audit-1.0.x installations
 if [ -f /etc/auditd.conf ]; then
    mv /etc/auditd.conf /etc/audit/auditd.conf
@@ -179,24 +222,49 @@ if [ -f /etc/audit/auditd.conf ]; then
       fi
    fi
 fi
-
-%post -n compat32-%{name}-libs -p /sbin/ldconfig
+# Copy default rules into place on new installation
+files=`ls /etc/audit/rules.d/ 2>/dev/null | wc -w`
+if [ "$files" -eq 0 ] ; then
+# FESCO asked for audit to be off by default. #1117953
+	if [ -e %{_datadir}/%{name}/sample-rules/10-no-audit.rules ] ; then
+		cp %{_datadir}/%{name}/sample-rules/10-no-audit.rules /etc/audit/rules.d/audit.rules
+	else
+		touch /etc/audit/rules.d/audit.rules
+	fi
+	chmod 0600 /etc/audit/rules.d/audit.rules
+fi
+%if %{with systemd}
+%systemd_post auditd.service
+%else
+/sbin/chkconfig --add auditd
+%endif
 
 %preun
-if [ $1 -eq 0 ]; then
+%if %{with systemd}
+%systemd_preun auditd.service
+%else
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then
    /sbin/service auditd stop > /dev/null 2>&1
    /sbin/chkconfig --del auditd
 fi
-
-%postun libs -p /sbin/ldconfig
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart auditd.service
+%else
 if [ $1 -ge 1 ]; then
    /sbin/service auditd condrestart > /dev/null 2>&1 || :
 fi
+%endif
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post -n compat32-%{name}-libs -p /sbin/ldconfig
 %postun -n compat32-%{name}-libs -p /sbin/ldconfig
 
+
 %files libs
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
@@ -238,61 +306,71 @@ fi
 %doc README ChangeLog rules init.d/auditd.cron
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/sample-rules
+%attr(644,root,root) %{_datadir}/%{name}/sample-rules/*
 %attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditd.8.gz
 %attr(644,root,root) %{_mandir}/man8/aureport.8.gz
 %attr(644,root,root) %{_mandir}/man8/ausearch.8.gz
 %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/aulastlog.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
-%attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
+%attr(644,root,root) %{_mandir}/man5/auditd-plugins.5.gz
 %attr(750,root,root) /sbin/auditctl
 %attr(750,root,root) /sbin/auditd
 %attr(755,root,root) /sbin/ausearch
 %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) %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 /etc/audit/plugins.d
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %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/audit/plugins.d/af_unix.conf
+%if %{with systemd}
+%attr(644,root,root) %{_unitdir}/auditd.service
+%else
 %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
+%attr(755,root,root) /etc/rc.d/init.d/auditd
+%endif
 
 %files -n audispd-plugins
 %defattr(-,root,root,-)
-%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
-%attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
-%attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
-%attr(750,root,root) /sbin/audispd-zos-remote
-%config(noreplace) %attr(640,root,root) /etc/audisp/audisp-remote.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/audisp-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/syslog.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/audisp-statsd.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-statsd.conf
 %attr(750,root,root) /sbin/audisp-remote
+%attr(750,root,root) /sbin/audisp-syslog
+%attr(750,root,root) /sbin/audisp-statsd
+%attr(700,root,root) %dir %{_var}/spool/audit
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
+%attr(644,root,root) %{_mandir}/man8/audisp-syslog.8.gz
+%attr(644,root,root) %{_mandir}/man8/audisp-statsd.8.gz
 
+%files -n audispd-plugins-zos
+%attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
+%attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/audispd-zos-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/zos-remote.conf
+%attr(750,root,root) /sbin/audispd-zos-remote
 
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
@@ -303,7 +381,13 @@ fi
 %attr(755,root,root) /%{_lib}/libauparse.*
 %endif
 
+
 %changelog
+* Fri Feb 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.1-1
+- new upstream release.
+- dropped Patch1.
+- imported Patch1 from rawhide.
+
 * Sun Aug 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.5-1
 - new upstream release.
 - imported Patch1 from rawhide.

i/initscripts/initscripts-vl.spec

@@ -5,7 +5,7 @@ Summary:      The inittab file and the /etc/rc.d scripts.
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Name:         initscripts
 Version:      8.91.16
-Release:      5%{?_dist_release}
+Release:      6%{?_dist_release}
 Group:        system
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -463,6 +463,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Feb 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-6
+- made to set MTU of physical devices in an network bridge.
+
 * Sat Dec 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-5
 - made to run alternatives in %%post.
 

lib/libs/libsigsegv/libsigsegv-vl.spec

@@ -1,16 +1,16 @@
 Name: libsigsegv
 Summary: Library for handling page faults in user mode
-Version: 2.12
+Version: 2.13
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv2
-Group: System Environment/Libraries
 URL: https://www.gnu.org/software/libsigsegv/
 Source0: https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 This is a library for handling page faults in user mode. A page fault
 occurs when a program tries to access to a region of memory that is
@@ -26,19 +26,25 @@ technique for implementing:
 
 %package devel
 Summary: Development libraries and headers for %{name}
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description devel
 Development libraries and headers for %{name}.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --enable-shared --enable-static
 make
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall
@@ -49,12 +55,14 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
+%license COPYING
 %{_libdir}/*.so.*
 
 %files devel
@@ -66,7 +74,11 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 #%{_libdir}/*.la
 
+
 %changelog
+* Fri Feb 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.13-1
+- new upstream release.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.12-1
 - new upstream release.