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

[Evangelos Foutras]

    Date: Monday, November 9, 2020 @ 12:13:09
  Author: foutrelis
Revision: 399702

Fix build with GCC 10

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

-------------+
 PKGBUILD    |    9 +++++++--
 gcc10.patch |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-09 12:08:37 UTC (rev 399701)
+++ PKGBUILD	2020-11-09 12:13:09 UTC (rev 399702)
@@ -16,12 +16,17 @@
 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)
-sha512sums=('7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a')
+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() {

Added: gcc10.patch
===================================================================
--- gcc10.patch	                        (rev 0)
+++ gcc10.patch	2020-11-09 12:13:09 UTC (rev 399702)
@@ -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;