[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2024-07-14 Thread Sam James
commit: c2d50c79cc88f5dc8272e987278bc2d35a805619
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 03:31:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 03:31:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d50c79

sys-process/audit: fix modern C issues

Revbump for two reasons:
1) the general modern C rationale per the wiki page and ML post, but also
2) the patch changes behaviour to drop e.g. printf in the library side.

Closes: https://bugs.gentoo.org/936080
Signed-off-by: Sam James  gentoo.org>

 .../{audit-3.1.4.ebuild => audit-3.1.4-r1.ebuild}  |   4 +
 sys-process/audit/files/audit-3.1.4-c99.patch  | 599 +
 2 files changed, 603 insertions(+)

diff --git a/sys-process/audit/audit-3.1.4.ebuild 
b/sys-process/audit/audit-3.1.4-r1.ebuild
similarity index 99%
rename from sys-process/audit/audit-3.1.4.ebuild
rename to sys-process/audit/audit-3.1.4-r1.ebuild
index 0d70c01f9efe..33f5402ee966 100644
--- a/sys-process/audit/audit-3.1.4.ebuild
+++ b/sys-process/audit/audit-3.1.4-r1.ebuild
@@ -51,6 +51,10 @@ QA_CONFIG_IMPL_DECL_SKIP=(
strndupa
 )
 
+PATCHES=(
+   "${FILESDIR}"/${P}-c99.patch
+)
+
 src_prepare() {
# audisp-remote moved in multilib_src_install_all
sed -i \

diff --git a/sys-process/audit/files/audit-3.1.4-c99.patch 
b/sys-process/audit/files/audit-3.1.4-c99.patch
new file mode 100644
index ..e78d26038645
--- /dev/null
+++ b/sys-process/audit/files/audit-3.1.4-c99.patch
@@ -0,0 +1,599 @@
+https://bugs.gentoo.org/936080
+https://github.com/linux-audit/audit-userspace/commit/ec6763ed29a034b452a6fb568b226c57c7be30e7
+
+From ec6763ed29a034b452a6fb568b226c57c7be30e7 Mon Sep 17 00:00:00 2001
+From: Yanase Yuki <41878038+z...@users.noreply.github.com>
+Date: Tue, 14 May 2024 04:51:35 +0900
+Subject: [PATCH] Implicit builtin functions (#372)
+
+Correct a number of places where printf is being used without a prototype.
+All cases are in libraries which should not be using printf. Change them
+to return an error rather than communicate the problem.
+
+This is a backport of 8c7eaa7
+
+Co-authored-by: Steve Grubb 
+--- a/audisp/audispd-llist.c
 b/audisp/audispd-llist.c
+@@ -69,15 +69,13 @@ unsigned int plist_count_active(const conf_llist *l)
+   return cnt;
+ }
+ 
+-void plist_append(conf_llist *l, plugin_conf_t *p)
++int plist_append(conf_llist *l, plugin_conf_t *p)
+ {
+   lnode* newnode;
+ 
+   newnode = malloc(sizeof(lnode));
+-  if (newnode == NULL) {
+-  printf("Out of memory. Check %s file, %d line", __FILE__, 
__LINE__);
+-  return;
+-  }
++  if (newnode == NULL)
++  return 1;
+ 
+   if (p) {
+   void *pp = malloc(sizeof(struct plugin_conf));
+@@ -98,6 +96,8 @@ void plist_append(conf_llist *l, plugin_conf_t *p)
+   // make newnode current
+   l->cur = newnode;
+   l->cnt++;
++
++  return 0;
+ }
+ 
+ void plist_clear(conf_llist* l)
+--- a/audisp/audispd-llist.h
 b/audisp/audispd-llist.h
+@@ -1,6 +1,6 @@
+ /*
+ * audispd-llist.h - Header file for ausearch-conf_llist.c
+-* Copyright (c) 2007,2013 Red Hat Inc., Durham, North Carolina.
++* Copyright (c) 2007,2013 Red Hat Inc.
+ * All Rights Reserved.
+ *
+ * This software may be freely redistributed and/or modified under the
+@@ -51,7 +51,7 @@ unsigned int plist_count_active(const conf_llist *l);
+ void plist_last(conf_llist *l);
+ lnode *plist_next(conf_llist *l);
+ static inline lnode *plist_get_cur(conf_llist *l) { return l->cur; }
+-void plist_append(conf_llist *l, plugin_conf_t *p);
++int plist_append(conf_llist *l, plugin_conf_t *p);
+ void plist_clear(conf_llist* l);
+ void plist_mark_all_unchecked(conf_llist* l);
+ lnode *plist_find_unchecked(conf_llist* l);
+--- a/auparse/normalize-llist.c
 b/auparse/normalize-llist.c
+@@ -1,6 +1,6 @@
+ /*
+  * normalize-llist.c - Minimal linked list library
+- * Copyright (c) 2016-17 Red Hat Inc., Durham, North Carolina.
++ * Copyright (c) 2016-17 Red Hat Inc.
+  * All Rights Reserved. 
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -61,15 +61,14 @@ data_node *cllist_next(cllist *l)
+   return l->cur;
+ }
+ 
+-void cllist_append(cllist *l, uint32_t num, void *data)
++// Returns 0 on success and 1 on error
++int cllist_append(cllist *l, uint32_t num, void *data)
+ {
+   data_node *newnode;
+ 
+   newnode = malloc(sizeof(data_node));
+-  if (newnode == NULL) {
+-  printf("Out of memory. Check %s file, %d line", __FILE__, 
__LINE__);
+-  return;
+-  }
++  if (newnode == NULL)
++  return 1;
+ 
+   newnode->num = num;
+   newnode->data = data;
+@@ -84,5 +83,6 @@ void cllist_append(cllist *l, uint32_t num, void *data)
+   // make newnode current
+   l->cur = newnode;
+   l->cnt++;
++  return 0;
+ }
+ 
+--- a/auparse/normalize-llist.h
 b/auparse/normalize-llist.h
+@@ -1,

[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2024-07-14 Thread Jason Zaman
commit: 06f2781c70fab797c05d34fdccd3abca5391946e
Author: Jason Zaman  gentoo  org>
AuthorDate: Sun Jul 14 22:43:21 2024 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sun Jul 14 23:13:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f2781c

sys-process/audit: drop 3.1.1

Signed-off-by: Jason Zaman  gentoo.org>

 sys-process/audit/Manifest |   1 -
 sys-process/audit/audit-3.1.1.ebuild   | 196 -
 .../files/audit-3.0.8-linux-headers-5.17.patch |  41 -
 3 files changed, 238 deletions(-)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index a4241527b24b..32dd6e54f424 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,4 +1,3 @@
-DIST audit-3.1.1.tar.gz 1218111 BLAKE2B 
a804684e438efc5f35b387708b3dc91bf857eeb56624261e0f75543556c436bfe638b792f63289f049c11541b10b2dc0e9f17b22f44b913da0168b1cf20684fc
 SHA512 
4917970cc4c7f786c464a6d101bf66d55d55ac4716cf415ff97177f08176a6301e946716d28cf5b16054538469b3140b97db99d55a28686a9a807eea60c070f3
 DIST audit-3.1.2.tar.gz 1219860 BLAKE2B 
dfdec470bf12cce6c570b3d260e65e2b49e8ac0761e6a6fbf7b4f4a57f92e88367cd74bfcb88e6d718619b88fea27ce963a977c9f4346c95d18a5310e217accb
 SHA512 
a97003a294ed3671df01e2952688e7d5eef59a35f6891feb53e67c4c7eab9ae8c2d18de41a5b5b20e0ad7156fac93aec05f32f6bc5eea706b42b6f27f676446a
 DIST audit-3.1.3.tar.gz 1225761 BLAKE2B 
97ee35fc722083d541e164b27fd318ec7be2a4e4e8774767d14c6a2e800092a37b7042a272db5d208c913fb36d295c5343bd6082237caf0fb561ec3c7a2883db
 SHA512 
7d6399ca97b171d5ea3cf7f7566bdabe9d5677a3a54c75411146dc2971106809a90d1a9cd0b1ba9b8af4cc409e6bee5876c7f2a0c54c42400fdcf9cfade58a8c
 DIST audit-3.1.4.tar.gz 1225648 BLAKE2B 
c6875f7d031e810469511ac8f86f05b2de7f19c044dbf67bc9d66430167fcf0f031e0279ce170a496b672a6fc99ee18b8cc39943e6faf3c19a24a381d2701439
 SHA512 
d26c498c91e838d97d3f199630650f509bb1e82b44d364306b20db32d4116fa73d775ef56c0fed2ec8d548b19215052691cbc80c74699bc87f2a0ea08cf664f5

diff --git a/sys-process/audit/audit-3.1.1.ebuild 
b/sys-process/audit/audit-3.1.1.ebuild
deleted file mode 100644
index 97910e182b7e..
--- a/sys-process/audit/audit-3.1.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# As with sys-libs/libcap-ng, same maintainer in Fedora as upstream, so
-# check Fedora's packaging 
(https://src.fedoraproject.org/rpms/audit/tree/rawhide)
-# on bumps (or if hitting a bug) to see what they've done there.
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info 
systemd usr-ldscript
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
-IUSE="gssapi io-uring ldap python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   sys-libs/libcap-ng
-   gssapi? ( virtual/krb5 )
-   ldap? ( net-nds/openldap:= )
-   python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-2.6.34
-   test? ( dev-libs/check )
-"
-BDEPEND="python? (
-   dev-lang/swig
-   $(python_gen_cond_dep '
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   ' python3_12)
-   )
-"
-
-CONFIG_CHECK="~AUDIT"
-
-PATCHES=(
-   # See bug #836702 before removing / verify builds fine w/ USE=python
-   # with latest kernel headers.
-   "${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
-   "${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-   # missing on musl. Uses handrolled AC_LINK_IFELSE but fails at link time
-   # for older compilers regardless. bug #898828
-   strndupa
-)
-
-src_prepare() {
-   # audisp-remote moved in multilib_src_install_all
-   sed -i \
-   -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
-   audisp/plugins/remote/au-remote.conf || die
-
-   # Disable installing sample rules so they can be installed as docs.
-   echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null || die
-
-   default
-   eautoreconf
-}
-
-multilib_src_configure() {
-   local myeconfargs=(
-   --sbindir="${EPREFIX}"/sbin
-   $(use_enable gssapi gssapi-krb5)
-   $(use_enable ldap zos-remote)
-   $(use_enable static-libs static)
-   $(use_with io-uring io_uring)
-   --enable-systemd
-   --without-golang
-   --without-libwrap
-   --without-python
- 

[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2022-08-15 Thread Sam James
commit: 7ed0e40edb8ce9b75521efca7fc14e71e3ac431a
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 16 00:09:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 16 00:10:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed0e40e

sys-process/audit: fix musl build

Closes: https://bugs.gentoo.org/837275
Signed-off-by: Sam James  gentoo.org>

 sys-process/audit/audit-3.0.8.ebuild   |  3 ++-
 .../audit/files/audit-3.0.8-musl-malloc.patch  | 28 ++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/sys-process/audit/audit-3.0.8.ebuild 
b/sys-process/audit/audit-3.0.8.ebuild
index 4c4bfe08a040..44a6d4ffd6c5 100644
--- a/sys-process/audit/audit-3.0.8.ebuild
+++ b/sys-process/audit/audit-3.0.8.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
# See bug #836702 before removing / verify builds fine w/ USE=python
# with latest kernel headers.
"${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
+   "${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch
 )
 
 src_prepare() {
@@ -72,7 +73,7 @@ multilib_src_configure() {
mkdir -p "${BUILD_DIR}" || die
pushd "${BUILD_DIR}" &>/dev/null || die
 
-   ECONF_SOURCE=${S} econf "${myeconfargs[@]}" 
--with-python3
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" 
--with-python3
 
popd &>/dev/null || die
}

diff --git a/sys-process/audit/files/audit-3.0.8-musl-malloc.patch 
b/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
new file mode 100644
index ..17814dbe29fc
--- /dev/null
+++ b/sys-process/audit/files/audit-3.0.8-musl-malloc.patch
@@ -0,0 +1,28 @@
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch?id=ad978133a1a10d609bb2545882a2f720a2572f3d
+https://bugs.gentoo.org/837275
+
+From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 9 Aug 2022 23:57:03 -0700
+Subject: [PATCH] Replace __attribute_malloc__ with 
+ __attribute__((__malloc__))
+
+__attribute_malloc__ is not available on musl
+
+Fixes
+| ../../git/auparse/auparse.h:54:2: error: expected function body after 
function declarator
+| __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
+| ^
+
+Signed-off-by: Khem Raj 
+--- a/auparse/auparse.h
 b/auparse/auparse.h
+@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
+ void auparse_destroy(auparse_state_t *au);
+ void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
+ auparse_state_t *auparse_init(ausource_t source, const void *b)
+-  __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
++  __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
+ int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
+   __attr_access ((__read_only__, 2, 3));
+ int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)



[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2022-04-06 Thread Sam James
commit: b0fbaa7cc15c6663e4a854c0caca4e7d1ff9
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  7 03:03:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  7 03:37:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0fbaa7c

sys-process/audit: add 3.0.8

Signed-off-by: Sam James  gentoo.org>

 sys-process/audit/Manifest |   1 +
 sys-process/audit/audit-3.0.8.ebuild   | 175 +
 .../files/audit-3.0.8-linux-headers-5.17.patch |  41 +
 3 files changed, 217 insertions(+)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 84d6a8474b9b..66d3b1f8fc41 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,3 +1,4 @@
 DIST audit-3.0.6.tar.gz 1190011 BLAKE2B 
93a7efad1cbea6771a73222b05aacbabc4ac61d1efb9fc2532607a94804bcac6512d0be2f4d89aa62d94fb85ba5818ffae4bf0a72676e8d549ddbec766e83e9c
 SHA512 
74734e1b1fddea086db9c5dc8c4b7817917fdf17bc7ca4e5b440aae975484d020a17c3f485f6a37b6b150a307d809e50d559d31a8cbd6f1e554933719551bcd1
 DIST audit-3.0.7.tar.gz 1180226 BLAKE2B 
706db746fb779913619da794bab24a9e890e1655bbd0abb007cbc909b32ab1d643e93953a23ef864d5e189f3447a7ddb4dca1478144cdc226f5a5594545bd28f
 SHA512 
b5662b32082fc2ac54e247aa0db5442d76afa30134ebba1d624a17004e9ccf6856bb75344af4ce9d9a0a66c03e1c6f18b7d45658d7df13ea71af0c8362e08d70
+DIST audit-3.0.8.tar.gz 1182432 BLAKE2B 
38a35a7540e608127cfc54a2de2cb12df8c29e778799ca53318824c84565a67b7ea131f9bba455fa469ce9139a27908738f571a6e383ce9a3274f70c09d27ec7
 SHA512 
8379bf425d68381d182300e628e42de8460d2f3e15b2395e10880f94b9989656852a50a9bece75b632ec8a04c40c9e666ff4c9d6b25ace3a8f50d2011506afab
 DIST audit-3.0.tar.gz 1109442 BLAKE2B 
f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617
 SHA512 
b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88

diff --git a/sys-process/audit/audit-3.0.8.ebuild 
b/sys-process/audit/audit-3.0.8.ebuild
new file mode 100644
index ..5b0d02d64cbe
--- /dev/null
+++ b/sys-process/audit/audit-3.0.8.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# As with sys-libs/libcap-ng, same maintainer in Fedora as upstream, so
+# check Fedora's packaging 
(https://src.fedoraproject.org/rpms/audit/tree/rawhide)
+# on bumps (or if hitting a bug) to see what they've done there.
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info 
systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86"
+IUSE="gssapi ldap python static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+   ldap? ( net-nds/openldap:= )
+   python? ( ${PYTHON_DEPS} )
+   sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-2.6.34
+   test? ( dev-libs/check )"
+BDEPEND="python? ( dev-lang/swig )"
+
+CONFIG_CHECK="~AUDIT"
+
+PATCHES=(
+   # See bug #836702 before removing / verify builds fine w/ USE=python
+   # with latest kernel headers.
+   "${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch
+)
+
+src_prepare() {
+   # audisp-remote moved in multilib_src_install_all
+   sed -i \
+   -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
+   audisp/plugins/remote/au-remote.conf || die
+
+   # Disable installing sample rules so they can be installed as docs.
+   echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null || die
+
+   default
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local -a myeconfargs=(
+   --sbindir="${EPREFIX}/sbin"
+   $(use_enable gssapi gssapi-krb5)
+   $(use_enable ldap zos-remote)
+   $(use_enable static-libs static)
+   --enable-systemd
+   --without-golang
+   --without-python
+   --without-python3
+   )
+
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+   if multilib_is_native_abi && use python; then
+   python_configure() {
+   mkdir -p "${BUILD_DIR}" || die
+   pushd "${BUILD_DIR}" &>/dev/null || die
+
+   ECONF_SOURCE=${S} econf "${myeconfargs[@]}" 
--with-python3
+
+   popd &>/dev/null || die
+   }
+
+   python_foreach_impl python_configure
+   fi
+}
+
+src_configure() {
+   tc-export_

[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2021-01-01 Thread Michał Górny
commit: a4761b5340cae19f0acab4528bb7fc3f3a75c954
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  1 22:55:19 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  1 22:57:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4761b53

sys-process/audit: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 sys-process/audit/Manifest |   4 -
 sys-process/audit/audit-2.6.4.ebuild   | 230 -
 sys-process/audit/audit-2.7.1.ebuild   | 230 -
 sys-process/audit/audit-2.8.2.ebuild   | 228 
 sys-process/audit/audit-2.8.3.ebuild   | 228 
 .../audit/files/audit-2.1.3-ia64-compile-fix.patch | 212 ---
 sys-process/audit/files/audit.rules|  24 ---
 7 files changed, 1156 deletions(-)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 2890c29de36..d5276de092b 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,8 +1,4 @@
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 
60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f
 SHA512 
78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
-DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 
056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5
 SHA512 
69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
-DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 
10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96
 SHA512 
37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
-DIST audit-2.8.2.tar.gz 1121970 BLAKE2B 
bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549
 SHA512 
888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
-DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 
21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f
 SHA512 
aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
 DIST audit-2.8.4.tar.gz 1123889 BLAKE2B 
b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42
 SHA512 
5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
 DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 
64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358
 SHA512 
7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B 
adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4
 SHA512 
7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a

diff --git a/sys-process/audit/audit-2.6.4.ebuild 
b/sys-process/audit/audit-2.6.4.ebuild
deleted file mode 100644
index fe6c17834e6..000
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools ltprune multilib multilib-minimal toolchain-funcs 
preserve-libs python-r1 linux-info systemd usr-ldscript
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="gssapi ldap python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
-RESTRICT="test"
-
-RDEPEND="gssapi? ( virtual/krb5 )
-   ldap? ( net-nds/openldap )
-   sys-libs/libcap-ng
-   python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-2.6.34
-   python? ( dev-lang/swig:0 )"
-# Do not use os-headers as this is linux specific
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-   linux-info_pkg_setup
-

[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2020-12-31 Thread Michał Górny
commit: 7494ff77d198e87226f368af01769e2ebb38cb61
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  1 02:00:44 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  1 02:00:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7494ff77

sys-process/audit: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 sys-process/audit/Manifest |   4 -
 sys-process/audit/audit-2.6.4.ebuild   | 230 -
 sys-process/audit/audit-2.7.1.ebuild   | 230 -
 sys-process/audit/audit-2.8.2.ebuild   | 228 
 sys-process/audit/audit-2.8.3.ebuild   | 228 
 .../audit/files/audit-2.1.3-ia64-compile-fix.patch | 212 ---
 sys-process/audit/files/audit.rules|  24 ---
 sys-process/audit/files/audit.rules.stop.post  |  12 --
 sys-process/audit/files/audit.rules.stop.pre   |  15 --
 9 files changed, 1183 deletions(-)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 2890c29de36..d5276de092b 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,8 +1,4 @@
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 
60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f
 SHA512 
78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
-DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 
056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5
 SHA512 
69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
-DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 
10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96
 SHA512 
37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
-DIST audit-2.8.2.tar.gz 1121970 BLAKE2B 
bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549
 SHA512 
888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
-DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 
21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f
 SHA512 
aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
 DIST audit-2.8.4.tar.gz 1123889 BLAKE2B 
b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42
 SHA512 
5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
 DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 
64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358
 SHA512 
7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B 
adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4
 SHA512 
7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a

diff --git a/sys-process/audit/audit-2.6.4.ebuild 
b/sys-process/audit/audit-2.6.4.ebuild
deleted file mode 100644
index fe6c17834e6..000
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools ltprune multilib multilib-minimal toolchain-funcs 
preserve-libs python-r1 linux-info systemd usr-ldscript
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="gssapi ldap python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
-RESTRICT="test"
-
-RDEPEND="gssapi? ( virtual/krb5 )
-   ldap? ( net-nds/openldap )
-   sys-libs/libcap-ng
-   python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-2.6.34
-   python? ( dev-lang/swig:0 )"
-

[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/, sys-process/audit/

2015-08-17 Thread Jason Zaman
commit: 7b1821119f093af1396b20cfd26c24188d5936f1
Author: Jason Zaman  gentoo  org>
AuthorDate: Tue Aug 18 04:27:33 2015 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Aug 18 04:29:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b182111

sys-process/audit: Remove lock from init script

The lock in the init script was only needed in Redhat. OpenRC keeps track of if
the process is started so not required.  Also fix perms on the systemd unit.

Gentoo-Bug: https://bugs.gentoo.org/556436
Gentoo-Bug: https://bugs.gentoo.org/449990

Package-Manager: portage-2.2.20.1

 sys-process/audit/audit-2.4.3-r1.ebuild | 225 
 sys-process/audit/files/auditd-init.d-2.4.3 |  91 +++
 2 files changed, 316 insertions(+)

diff --git a/sys-process/audit/audit-2.4.3-r1.ebuild 
b/sys-process/audit/audit-2.4.3-r1.ebuild
new file mode 100644
index 000..e7284e5
--- /dev/null
+++ b/sys-process/audit/audit-2.4.3-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/";
+SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ldap python"
+# Testcases are pretty useless as they are built for RedHat users/groups and
+# kernels.
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+   sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-2.6.34
+   python? (
+   ${PYTHON_DEPS}
+   dev-lang/swig:0
+   )"
+# Do not use os-headers as this is linux specific
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   epatch_user
+
+   # Do not build GUI tools
+   sed -i \
+   -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+   "${S}"/configure.ac || die
+   sed -i \
+   -e 's,system-config-audit,,g' \
+   "${S}"/Makefile.am || die
+   rm -rf "${S}"/system-config-audit
+
+   if ! use ldap; then
+   sed -i \
+   -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+   "${S}"/configure.ac || die
+   sed -i \
+   -e '/^SUBDIRS/s,zos-remote,,g' \
+   "${S}"/audisp/plugins/Makefile.am || die
+   fi
+
+   # Don't build static version of Python module.
+   epatch "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+   # glibc/kernel upstreams suck with both defining ia64_fpreg
+   # This patch is a horribly workaround that is only valid as long as you
+   # don't need the OTHER definitions in fpu.h.
+   epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+   # there is no --without-golang conf option
+   sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+   # Regenerate autotooling
+   eautoreconf
+
+   # Bug 352198: Avoid parallel build fail
+   cd "${S}"/src/mt
+   [[ ! -s private.h ]] && ln -s ../../lib/private.h .
+}
+
+multilib_src_configure() {
+   local ECONF_SOURCE=${S}
+   econf \
+   --sbindir=/sbin \
+   --enable-systemd \
+   --without-python \
+   --without-python3
+
+   if multilib_is_native_abi; then
+   python_configure() {
+   mkdir -p "${BUILD_DIR}" || die
+   cd "${BUILD_DIR}" || die
+
+   if python_is_python3; then
+   econf --without-python --with-python3
+   else
+   econf --with-python --without-python3
+   fi
+   }
+
+   use python && python_foreach_impl python_configure
+   fi
+}
+
+multilib_src_compile() {
+   if multilib_is_native_abi; then
+   default
+
+   python_compile() {
+   local pysuffix pydef
+   if python_is_python3; then
+   pysuffix=3
+   pydef='USE_PYTHON3=true'
+   else
+   pysuffix=2
+   pydef='HAVE_PYTHON=true'
+   fi
+
+   emake -C "${BUILD_DIR}"/bindings/swig \
+   VPATH="${native_build}/lib" \
+   LIBS="${native_build}/lib/libaudit.la" \
+