[arch-commits] Commit in audit/repos/staging-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Wed Nov 11 06:56:12 UTC 2020
Date: Wednesday, November 11, 2020 @ 06:56:12
Author: felixonmars
Revision: 400246
archrelease: copy trunk to staging-x86_64
Added:
audit/repos/staging-x86_64/PKGBUILD
(from rev 400244, audit/trunk/PKGBUILD)
audit/repos/staging-x86_64/gcc10.patch
(from rev 400244, audit/trunk/gcc10.patch)
Deleted:
audit/repos/staging-x86_64/PKGBUILD
audit/repos/staging-x86_64/gcc10.patch
-------------+
PKGBUILD | 174 +++++++++++++++++++++++++++++-----------------------------
gcc10.patch | 46 +++++++--------
2 files changed, 110 insertions(+), 110 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-11 06:56:09 UTC (rev 400245)
+++ PKGBUILD 2020-11-11 06:56:12 UTC (rev 400246)
@@ -1,87 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer : Christian Rebischke <Chris.Rebischke at archlinux.org>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: <kang at insecure.ws>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Connor Behan <connor.behan at gmail.com>
-# Contributor: henning mueller <henning at orgizm.net>
-
-pkgbase=audit
-pkgname=('audit' 'python-audit')
-pkgver=2.8.5
-pkgrel=8
-pkgdesc='Userspace components of the audit framework'
-url='https://people.redhat.com/sgrubb/audit'
-arch=('x86_64')
-makedepends=('krb5' 'libcap-ng' 'libldap' 'swig' 'linux-headers' 'python')
-license=('GPL')
-options=('emptydirs')
-source=(${pkgbase}-${pkgver}.tar.gz::https://people.redhat.com/sgrubb/audit/${pkgbase}-${pkgver}.tar.gz
- gcc10.patch)
-sha512sums=('7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a'
- '78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101')
-
-prepare() {
- cd ${pkgbase}-${pkgver}
- sed 's|/var/run/auditd.pid|/run/auditd.pid|' -i init.d/auditd.service
-
- # https://github.com/linux-audit/audit-userspace/issues/123
- patch -Np1 -i ../gcc10.patch
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/audit \
- --enable-gssapi-krb5=yes \
- --enable-systemd=yes \
- --with-libcap-ng=yes
- make
- [ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
-}
-
-package_audit() {
- depends=('krb5' 'libcap-ng')
- provides=('libaudit.so' 'libauparse.so')
- backup=(
- etc/libaudit.conf
- etc/audit/audit-stop.rules
- etc/audit/auditd.conf
- etc/audisp/audispd.conf
- etc/audisp/audisp-remote.conf
- etc/audisp/zos-remote.conf
- etc/audisp/plugins.d/af_unix.conf
- etc/audisp/plugins.d/audispd-zos-remote.conf
- etc/audisp/plugins.d/au-remote.conf
- etc/audisp/plugins.d/syslog.conf
- )
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" INSTALL='install -p' install
-
- cd "${pkgdir}"
- install -d -m 0700 var/log/audit
- rm -rf etc/rc.d \
- etc/sysconfig \
- usr/lib/audit \
- usr/lib/python*
-
- sed -ri 's|/sbin|/usr/bin|' \
- etc/audit/*.conf \
- etc/audisp/plugins.d/*.conf \
- usr/lib/systemd/system/auditd.service
-
- chmod 644 usr/lib/systemd/system/auditd.service
-}
-
-package_python-audit() {
- depends=('python' 'audit')
- pkgdesc+=' (python bindings)'
- cd ${pkgbase}-${pkgver}
- make -C bindings DESTDIR="${pkgdir}" INSTALL='install -p' install
-}
-
-# vim: ts=2 sw=2 et:
Copied: audit/repos/staging-x86_64/PKGBUILD (from rev 400244, audit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-11 06:56:12 UTC (rev 400246)
@@ -0,0 +1,87 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer : Christian Rebischke <Chris.Rebischke at archlinux.org>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: <kang at insecure.ws>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Connor Behan <connor.behan at gmail.com>
+# Contributor: henning mueller <henning at orgizm.net>
+
+pkgbase=audit
+pkgname=('audit' 'python-audit')
+pkgver=2.8.5
+pkgrel=9
+pkgdesc='Userspace components of the audit framework'
+url='https://people.redhat.com/sgrubb/audit'
+arch=('x86_64')
+makedepends=('krb5' 'libcap-ng' 'libldap' 'swig' 'linux-headers' 'python')
+license=('GPL')
+options=('emptydirs')
+source=(${pkgbase}-${pkgver}.tar.gz::https://people.redhat.com/sgrubb/audit/${pkgbase}-${pkgver}.tar.gz
+ gcc10.patch)
+sha512sums=('7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a'
+ '78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ sed 's|/var/run/auditd.pid|/run/auditd.pid|' -i init.d/auditd.service
+
+ # https://github.com/linux-audit/audit-userspace/issues/123
+ patch -Np1 -i ../gcc10.patch
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/audit \
+ --enable-gssapi-krb5=yes \
+ --enable-systemd=yes \
+ --with-libcap-ng=yes
+ make
+ [ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH bindings/swig/python/audit.py
+}
+
+package_audit() {
+ depends=('krb5' 'libcap-ng')
+ provides=('libaudit.so' 'libauparse.so')
+ backup=(
+ etc/libaudit.conf
+ etc/audit/audit-stop.rules
+ etc/audit/auditd.conf
+ etc/audisp/audispd.conf
+ etc/audisp/audisp-remote.conf
+ etc/audisp/zos-remote.conf
+ etc/audisp/plugins.d/af_unix.conf
+ etc/audisp/plugins.d/audispd-zos-remote.conf
+ etc/audisp/plugins.d/au-remote.conf
+ etc/audisp/plugins.d/syslog.conf
+ )
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" INSTALL='install -p' install
+
+ cd "${pkgdir}"
+ install -d -m 0700 var/log/audit
+ rm -rf etc/rc.d \
+ etc/sysconfig \
+ usr/lib/audit \
+ usr/lib/python*
+
+ sed -ri 's|/sbin|/usr/bin|' \
+ etc/audit/*.conf \
+ etc/audisp/plugins.d/*.conf \
+ usr/lib/systemd/system/auditd.service
+
+ chmod 644 usr/lib/systemd/system/auditd.service
+}
+
+package_python-audit() {
+ depends=('python' 'audit')
+ pkgdesc+=' (python bindings)'
+ cd ${pkgbase}-${pkgver}
+ make -C bindings DESTDIR="${pkgdir}" INSTALL='install -p' install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gcc10.patch
===================================================================
--- gcc10.patch 2020-11-11 06:56:09 UTC (rev 400245)
+++ gcc10.patch 2020-11-11 06:56:12 UTC (rev 400246)
@@ -1,23 +0,0 @@
-From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb at redhat.com>
-Date: Fri, 10 Jan 2020 21:13:50 -0500
-Subject: [PATCH] Header definitions need to be external when building with
- -fno-common (which is default in GCC 10) - Tony Jones
-
----
- src/ausearch-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ausearch-common.h b/src/ausearch-common.h
-index 6669203..3040547 100644
---- a/src/ausearch-common.h
-+++ b/src/ausearch-common.h
-@@ -50,7 +50,7 @@ extern pid_t event_pid;
- extern int event_exact_match;
- extern uid_t event_uid, event_euid, event_loginuid;
- extern const char *event_tuid, *event_teuid, *event_tauid;
--slist *event_node_list;
-+extern slist *event_node_list;
- extern const char *event_comm;
- extern const char *event_filename;
- extern const char *event_hostname;
Copied: audit/repos/staging-x86_64/gcc10.patch (from rev 400244, audit/trunk/gcc10.patch)
===================================================================
--- gcc10.patch (rev 0)
+++ gcc10.patch 2020-11-11 06:56:12 UTC (rev 400246)
@@ -0,0 +1,23 @@
+From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
+From: Steve Grubb <sgrubb at redhat.com>
+Date: Fri, 10 Jan 2020 21:13:50 -0500
+Subject: [PATCH] Header definitions need to be external when building with
+ -fno-common (which is default in GCC 10) - Tony Jones
+
+---
+ src/ausearch-common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ausearch-common.h b/src/ausearch-common.h
+index 6669203..3040547 100644
+--- a/src/ausearch-common.h
++++ b/src/ausearch-common.h
+@@ -50,7 +50,7 @@ extern pid_t event_pid;
+ extern int event_exact_match;
+ extern uid_t event_uid, event_euid, event_loginuid;
+ extern const char *event_tuid, *event_teuid, *event_tauid;
+-slist *event_node_list;
++extern slist *event_node_list;
+ extern const char *event_comm;
+ extern const char *event_filename;
+ extern const char *event_hostname;
More information about the arch-commits
mailing list