[arch-commits] Commit in audit/trunk (PKGBUILD gcc10.patch)

[Levente Polyak]

    Date: Wednesday, January 13, 2021 @ 22:35:47
  Author: anthraxx
Revision: 406207

upgpkg: audit 3.0-1

Modified:
  audit/trunk/PKGBUILD
Deleted:
  audit/trunk/gcc10.patch

-------------+
 PKGBUILD    |   33 ++++++++++++++-------------------
 gcc10.patch |   23 -----------------------
 2 files changed, 14 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-13 22:22:00 UTC (rev 406206)
+++ PKGBUILD	2021-01-13 22:35:47 UTC (rev 406207)
@@ -8,25 +8,21 @@
 
 pkgbase=audit
 pkgname=('audit' 'python-audit')
-pkgver=2.8.5
-pkgrel=9
+pkgver=3.0
+pkgrel=1
 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')
+makedepends=('glibc' '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')
+source=(https://people.redhat.com/sgrubb/audit/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88')
+b2sums=('f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617')
 
 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() {
@@ -44,19 +40,18 @@
 }
 
 package_audit() {
-  depends=('krb5' 'libcap-ng')
+  depends=('glibc' '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
+    etc/audit/audisp-remote.conf
+    etc/audit/zos-remote.conf
+    etc/audit/plugins.d/af_unix.conf
+    etc/audit/plugins.d/au-remote.conf
+    etc/audit/plugins.d/audispd-zos-remote.conf
+    etc/audit/plugins.d/syslog.conf
   )
 
   cd ${pkgbase}-${pkgver}
@@ -71,7 +66,7 @@
 
   sed -ri 's|/sbin|/usr/bin|' \
     etc/audit/*.conf \
-    etc/audisp/plugins.d/*.conf \
+    etc/audit/plugins.d/*.conf \
     usr/lib/systemd/system/auditd.service
 
   chmod 644 usr/lib/systemd/system/auditd.service

Deleted: gcc10.patch
===================================================================
--- gcc10.patch	2021-01-13 22:22:00 UTC (rev 406206)
+++ gcc10.patch	2021-01-13 22:35:47 UTC (rev 406207)
@@ -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;