From 95cc31462056ba6dfd1634624f8884a736a34a39 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Thu, 15 Feb 2007 21:42:41 +0000 Subject: [PATCH] Add patch from bug #143290 thanks to Joshua Schmidkofer Package-Manager: portage-2.1.2-r8 --- net-analyzer/argus-clients/ChangeLog | 10 ++++- net-analyzer/argus-clients/Manifest | 37 +++++++++++++--- .../argus-clients-2.0.6-r1.ebuild | 42 +++++++++++++++++++ .../files/argus-clients-2.0.6-netmask.patch | 12 ++++++ .../files/digest-argus-clients-2.0.6 | 2 + .../files/digest-argus-clients-2.0.6-r1 | 3 ++ 6 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild create mode 100644 net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch create mode 100644 net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1 diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog index 322eac2f237a..1eaade45a7e2 100644 --- a/net-analyzer/argus-clients/ChangeLog +++ b/net-analyzer/argus-clients/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/argus-clients -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.4 2006/02/15 21:44:59 jokey Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.5 2007/02/15 21:42:40 jokey Exp $ + +*argus-clients-2.0.6-r1 (15 Feb 2007) + + 15 Feb 2007; Markus Ullmann + +files/argus-clients-2.0.6-netmask.patch, +argus-clients-2.0.6-r1.ebuild: + Add patch from bug #143290 thanks to Joshua Schmidkofer 15 Feb 2006; Markus Ullmann argus-clients-2.0.6.ebuild: Removing virtual/libpcap wrt bug #117898 diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index 1b4cb7ca85fd..6da3df6c9024 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -1,12 +1,37 @@ -MD5 c6fd7cb1886a44ef2d1b293dc90751a4 ChangeLog 770 -RMD160 0970d9384afd351f5ad08978bce7d7e0fdacd635 ChangeLog 770 -SHA256 f2d91926ac168c30f2e7d03a2b5668464c31faae8fae859900f34bbe3313741b ChangeLog 770 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX argus-clients-2.0.6-netmask.patch 414 RMD160 dad2ea76ac0d041b8d55ef96c3c566c7af9267fb SHA1 82f292a6140f7cb1226f12da3157c55d9c77fb7c SHA256 7ed1a3e234b517500322470ac93b22b62a6b3046b35413810467f9d01cc87a76 +MD5 76d314643f4865c28a435116fa0cf3a9 files/argus-clients-2.0.6-netmask.patch 414 +RMD160 dad2ea76ac0d041b8d55ef96c3c566c7af9267fb files/argus-clients-2.0.6-netmask.patch 414 +SHA256 7ed1a3e234b517500322470ac93b22b62a6b3046b35413810467f9d01cc87a76 files/argus-clients-2.0.6-netmask.patch 414 +DIST argus-clients-2.0.6.tar.gz 691629 RMD160 35b1bd832d38b6818918e3f484bf03229371cb20 SHA1 21b50708f26649c99d3b9cdb778c4983b75a5fb6 SHA256 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac +EBUILD argus-clients-2.0.6-r1.ebuild 1064 RMD160 009090b91290ac991ffcba58186dc3e821100c46 SHA1 ec7c169a972ef746435e635bdaae2be50aa0ff29 SHA256 a83c36b858e8f4786c161ad59e4eacbf8cd1189a4b773aca988342c7d544d19e +MD5 83b2dd7016b082cea4da16899fc422ba argus-clients-2.0.6-r1.ebuild 1064 +RMD160 009090b91290ac991ffcba58186dc3e821100c46 argus-clients-2.0.6-r1.ebuild 1064 +SHA256 a83c36b858e8f4786c161ad59e4eacbf8cd1189a4b773aca988342c7d544d19e argus-clients-2.0.6-r1.ebuild 1064 +EBUILD argus-clients-2.0.6.ebuild 842 RMD160 48fe29d92455e2bd17c4edd991c95b77ac9a2431 SHA1 2861d5e775bf90848d24d9205c2977303ed31ee3 SHA256 ca32f878bdb0ecd4cb7365d3e91a061f5079fc90ff04549efa153aa4827ab172 MD5 753b954b2a2885a5dc1685e91434f5c3 argus-clients-2.0.6.ebuild 842 RMD160 48fe29d92455e2bd17c4edd991c95b77ac9a2431 argus-clients-2.0.6.ebuild 842 SHA256 ca32f878bdb0ecd4cb7365d3e91a061f5079fc90ff04549efa153aa4827ab172 argus-clients-2.0.6.ebuild 842 -MD5 8d98425617db78b1c29c8d1e2e497dd4 files/digest-argus-clients-2.0.6 71 -RMD160 485b094b5682bd8e669e0c94801842e06846e405 files/digest-argus-clients-2.0.6 71 -SHA256 ea7c6139dba1308551cf794376631afd2facaf95e73ba6ecc66798a51e5725b9 files/digest-argus-clients-2.0.6 71 +MISC ChangeLog 993 RMD160 56f0fb25f16614ab287a37f6f670e18bc91f99bf SHA1 1b2de3f5212687333c2b7eb9c813dc2cfbf372d9 SHA256 a310928c27bc305dfde0c2f0ffe0b8e079d5f84a04552b063806ddc66f14ab84 +MD5 728baf6925abbd271ebfb8fc3c586a14 ChangeLog 993 +RMD160 56f0fb25f16614ab287a37f6f670e18bc91f99bf ChangeLog 993 +SHA256 a310928c27bc305dfde0c2f0ffe0b8e079d5f84a04552b063806ddc66f14ab84 ChangeLog 993 +MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159 +MD5 6b079e72ac33ce9ea836aef25872cf50 files/digest-argus-clients-2.0.6 259 +RMD160 f900e0e7d6e7eaddb0d856ae8e75b069f70dbc88 files/digest-argus-clients-2.0.6 259 +SHA256 e36c5f8f1c5288b286795a6ae8a5094e0e0c8150712295a198f0e38397ea21b0 files/digest-argus-clients-2.0.6 259 +MD5 6b079e72ac33ce9ea836aef25872cf50 files/digest-argus-clients-2.0.6-r1 259 +RMD160 f900e0e7d6e7eaddb0d856ae8e75b069f70dbc88 files/digest-argus-clients-2.0.6-r1 259 +SHA256 e36c5f8f1c5288b286795a6ae8a5094e0e0c8150712295a198f0e38397ea21b0 files/digest-argus-clients-2.0.6-r1 259 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFF1NOIz974XjDVpbkRAjsNAJ44Axj7IA4Nv6Ib9CNpJzy63ywv2QCfQo+t +wNiHY9cgDQvYGpR8NrJaqGw= +=bz/M +-----END PGP SIGNATURE----- diff --git a/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild b/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild new file mode 100644 index 000000000000..5d41e07b27b9 --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild,v 1.1 2007/02/15 21:42:40 jokey Exp $ + +inherit eutils + +DESCRIPTION="Clients for net-analyzer/argus" +HOMEPAGE="http://www.qosient.com/argus/" +SRC_URI="ftp://ftp.qosient.com/pub/argus/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="virtual/libc + net-libs/libpcap + >=net-analyzer/argus-2.0.6" + +DEPEND="${RDEPEND} + >=sys-devel/bison-1.28 + >=sys-devel/flex-2.4.6" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Fix from bug #143290 + epatch "${FILESDIR}"/${P}-netmask.patch || die "patch failed" +} + +src_install() { + # argus_parse.a and argus_common.a are supplied by net-analyzer/argus + dolib lib/argus_client.a || die "Failed to process argus_client.a" + dobin bin/ra* || die "Failed to install ra*" + + dodoc ChangeLog CREDITS README + + #do not install man/man1/tcpdump.1, file collision + rm man/man1/tcpdump.1 + doman man/man{1,5}/* +} diff --git a/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch b/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch new file mode 100644 index 000000000000..d5680404ef8e --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch @@ -0,0 +1,12 @@ +diff -urN argus-clients-2.0.6.orig/common/gencode.c argus-clients-2.0.6/common/gencode.c +--- argus-clients-2.0.6.orig/common/gencode.c 2004-04-26 09:30:23.000000000 -0700 ++++ argus-clients-2.0.6/common/gencode.c 2007-01-10 10:30:03.000000000 -0800 +@@ -232,7 +232,7 @@ + #include + #include + +-static u_int ArgusNetMask; ++u_int ArgusNetMask; /* AMD64 build fix */ + static int snaplen; + + int diff --git a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6 b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6 index 4b9c60789948..b46d01997865 100644 --- a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6 +++ b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6 @@ -1 +1,3 @@ MD5 6a0b11043e70de20c93f23655a28b80d argus-clients-2.0.6.tar.gz 691629 +RMD160 35b1bd832d38b6818918e3f484bf03229371cb20 argus-clients-2.0.6.tar.gz 691629 +SHA256 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac argus-clients-2.0.6.tar.gz 691629 diff --git a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1 b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1 new file mode 100644 index 000000000000..b46d01997865 --- /dev/null +++ b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1 @@ -0,0 +1,3 @@ +MD5 6a0b11043e70de20c93f23655a28b80d argus-clients-2.0.6.tar.gz 691629 +RMD160 35b1bd832d38b6818918e3f484bf03229371cb20 argus-clients-2.0.6.tar.gz 691629 +SHA256 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac argus-clients-2.0.6.tar.gz 691629 -- 2.26.2