commit: 291dd7efa20bb83c0241a82005e32fc518c2542f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 15:29:26 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 15:29:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291dd7ef
net-analyzer/argus: [QA] Port to GLEP 81
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...gus-3.0.8.2-r1.ebuild => argus-3.0.8.2-r3.ebuild} | 11 ++++-------
...gus-3.0.8.2-r2.ebuild => argus-3.0.8.2-r4.ebuild} | 20 ++++++--------------
...{argus-3.0.8.3.ebuild => argus-3.0.8.3-r1.ebuild} | 20 ++++++--------------
3 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
similarity index 94%
rename from net-analyzer/argus/argus-3.0.8.2-r1.ebuild
rename to net-analyzer/argus/argus-3.0.8.2-r3.ebuild
index 2e662864e3e..a0f30622374 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-inherit autotools eutils user
+
+inherit autotools epatch
DESCRIPTION="network Audit Record Generation and Utilization System"
HOMEPAGE="https://www.qosient.com/argus/";
@@ -14,6 +15,8 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos"
IUSE="debug +libtirpc sasl tcpd"
RDEPEND="
+ acct-group/argus
+ acct-user/argus
net-libs/libnsl:=
net-libs/libpcap
sys-libs/zlib
@@ -22,7 +25,6 @@ RDEPEND="
sasl? ( dev-libs/cyrus-sasl )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
"
-
DEPEND="
${RDEPEND}
>=sys-devel/bison-1.28
@@ -76,11 +78,6 @@ src_install() {
keepdir /var/lib/argus
}
-pkg_preinst() {
- enewgroup argus
- enewuser argus -1 -1 /var/lib/argus argus
-}
-
pkg_postinst() {
elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild
b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
similarity index 90%
rename from net-analyzer/argus/argus-3.0.8.2-r2.ebuild
rename to net-analyzer/argus/argus-3.0.8.2-r4.ebuild
index 807aab798e0..3ca4a4b18ff 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools user
+
+inherit autotools
DESCRIPTION="network Audit Record Generation and Utilization System"
HOMEPAGE="https://openargus.org/";
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos"
IUSE="debug +libtirpc sasl tcpd"
RDEPEND="
+ acct-group/argus
+ acct-user/argus
net-libs/libnsl:=
net-libs/libpcap
sys-libs/zlib
@@ -22,9 +25,8 @@ RDEPEND="
sasl? ( dev-libs/cyrus-sasl )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
"
-
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=sys-devel/bison-1.28
>=sys-devel/flex-2.4.6
"
@@ -37,11 +39,6 @@ PATCHES=(
)
S=${WORKDIR}/${P/_rc/.rc.}
-pkg_setup() {
- enewgroup argus
- enewuser argus -1 -1 /var/lib/argus argus
-}
-
src_prepare() {
find . -type f -execdir chmod +w {} \; #561360
sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -82,11 +79,6 @@ src_install() {
keepdir /var/lib/argus
}
-pkg_preinst() {
- enewgroup argus
- enewuser argus -1 -1 /var/lib/argus argus
-}
-
pkg_postinst() {
elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.3.ebuild
b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
similarity index 90%
rename from net-analyzer/argus/argus-3.0.8.3.ebuild
rename to net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index 8092871dded..bc999ce3908 100644
--- a/net-analyzer/argus/argus-3.0.8.3.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools user
+
+inherit autotools
DESCRIPTION="network Audit Record Generation and Utilization System"
HOMEPAGE="https://openargus.org/";
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos"
IUSE="debug sasl tcpd"
RDEPEND="
+ acct-group/argus
+ acct-user/argus
net-libs/libnsl:=
net-libs/libpcap
net-libs/libtirpc
@@ -21,9 +24,8 @@ RDEPEND="
sasl? ( dev-libs/cyrus-sasl )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
"
-
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=sys-devel/bison-1.28
>=sys-devel/flex-2.4.6
"
@@ -36,11 +38,6 @@ PATCHES=(
)
S=${WORKDIR}/${P/_rc/.rc.}
-pkg_setup() {
- enewgroup argus
- enewuser argus -1 -1 /var/lib/argus argus
-}
-
src_prepare() {
find . -type f -execdir chmod +w {} \; #561360
sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -84,11 +81,6 @@ src_install() {
keepdir /var/lib/argus
}
-pkg_preinst() {
- enewgroup argus
- enewuser argus -1 -1 /var/lib/argus argus
-}
-
pkg_postinst() {
elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
elog "possible that the init script will fail to work."
