[packages/audit] stop overriding LIBCAP_NG_PATH macro with obsolete version; rel 2

atler atler at pld-linux.org
Thu Jun 1 17:34:40 CEST 2023


commit 01341f8ba12dfe5389284ec52109f6f6c21a51ab
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jun 1 17:21:54 2023 +0200

    stop overriding LIBCAP_NG_PATH macro with obsolete version; rel 2
    
    unbreaks pkgconfig file which contains:
    
    Requires.private: @CAPNG_PKG@

 audit-m4.patch | 45 ---------------------------------------------
 audit.spec     |  4 +---
 2 files changed, 1 insertion(+), 48 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index b12b134..762a331 100644
--- a/audit.spec
+++ b/audit.spec
@@ -24,7 +24,7 @@ Summary:	User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:		audit
 Version:	3.1.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 Source0:	https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
@@ -32,7 +32,6 @@ Source0:	https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Source2:	%{name}d.init
 Source3:	%{name}d.sysconfig
 Patch0:		%{name}-install.patch
-Patch1:		%{name}-m4.patch
 Patch2:		%{name}-nolibs.patch
 Patch3:		%{name}-systemd-notonly.patch
 Patch5:		%{name}-no-refusemanualstop.patch
@@ -182,7 +181,6 @@ Interfejs Pythona 3.x do biblioteki libaudit.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
diff --git a/audit-m4.patch b/audit-m4.patch
deleted file mode 100644
index 94fd850..0000000
--- a/audit-m4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN audit-2.0.org/acinclude.m4 audit-2.0/acinclude.m4
---- audit-2.0.org/acinclude.m4	1970-01-01 01:00:00.000000000 +0100
-+++ audit-2.0/acinclude.m4	2009-08-18 11:11:24.700738677 +0200
-@@ -0,0 +1,41 @@
-+# libcap-ng.m4 - Checks for the libcap-ng support
-+# 	Copyright (c) 2009 Steve Grubb sgrubb at redhat.com
-+#
-+AC_DEFUN([LIBCAP_NG_PATH],
-+[
-+  AC_ARG_WITH(libcap-ng,
-+    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
-+    with_libcap_ng=auto)
-+
-+  # Check for Libcap-ng API
-+  #
-+  # libcap-ng detection
-+
-+  if test x$with_libcap_ng = xno ; then
-+      have_libcap_ng=no;
-+  else
-+      # Start by checking for header file
-+      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
-+
-+      # See if we have libcap-ng library
-+      AC_CHECK_LIB(cap-ng, capng_clear,
-+	         CAPNG_LDADD=-lcap-ng,)
-+
-+      # Check results are usable
-+      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
-+         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
-+      fi
-+      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
-+         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
-+      fi
-+  fi
-+  AC_SUBST(CAPNG_LDADD)
-+  AC_MSG_CHECKING(whether to use libcap-ng)
-+  if test x$CAPNG_LDADD != x ; then
-+      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
-+      AC_MSG_RESULT(yes)
-+  else
-+      AC_MSG_RESULT(no)
-+  fi
-+])
-+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/c7fb68218d7ae403f94217dd7fdf4e97a40b0d89



More information about the pld-cvs-commit mailing list