Added patch to fix missing parameters, bug #119769

Package-Manager: portage-2.1_pre4-r1

5 files changed, 166 insertions, 2 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 2367792eafa3..dbd29ca88f1a 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/arpwatch
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.19 2006/01/28 19:23:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.20 2006/02/06 00:36:58 jokey Exp $
+
+*arpwatch-2.1.13-r3 (06 Feb 2006)
+
+  06 Feb 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/arpwatch-2.1.13-lostparams.patch, +arpwatch-2.1.13-r3.ebuild:
+  Added patch to fix missing parameters, bug #119769
 
   28 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
   -files/arpwatch-2.1.11-r1.diff.gz, -files/arpwatch-2.1.13.diff.gz,
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index f79d0bf7ce2f..7957150db35d 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,8 +1,33 @@
-MD5 a0c90f9f401328c989727704419c3194 ChangeLog 2734
+MD5 f0ff8ac1bbec48f2916fb6d9bdb7b131 ChangeLog 2938
+RMD160 9c8ab2b5cb857241b4b0fff496a8283a6e29cfd0 ChangeLog 2938
+SHA256 b9bdff871c03bc716a05ca41b1338b391707f46a8d33086bb5cf7de64c000db5 ChangeLog 2938
 MD5 3c6dca01b266ef2c0d75d04b18f33c44 arpwatch-2.1.11-r1.ebuild 1601
+RMD160 243be0ef913d84853332eaee2dd43bc727bd3996 arpwatch-2.1.11-r1.ebuild 1601
+SHA256 019a46e17b9590b96f50972d775d2e1b4c3abcb8ebf99f6efe9588a5de0f705d arpwatch-2.1.11-r1.ebuild 1601
 MD5 b5bf4c83104b51d514adc533a94eb074 arpwatch-2.1.13-r2.ebuild 2162
+RMD160 9bc9a4426fd9221e6a0db20cafe72cde89a09474 arpwatch-2.1.13-r2.ebuild 2162
+SHA256 1e264258308fd3c539c1bb1405b562ca4471ea5ef4932a74c46488f949c45911 arpwatch-2.1.13-r2.ebuild 2162
+MD5 9471ee70ac05832b26db4be32df13f0d arpwatch-2.1.13-r3.ebuild 2200
+RMD160 11fd1f970f5ef7a0a07af39aac728f32b9ed23fa arpwatch-2.1.13-r3.ebuild 2200
+SHA256 80ff064ce371158a3db0a6b5582df93906fcb732e5db95b9b30a480dab6ffe42 arpwatch-2.1.13-r3.ebuild 2200
+MD5 d984166ea2c5c91e25fc14619678167b files/arpwatch-2.1.13-lostparams.patch 1045
+RMD160 5144a0eabc7f233b1292b90a09d54afd15c552f8 files/arpwatch-2.1.13-lostparams.patch 1045
+SHA256 a83374fe3cbf2fc25903f7bbfb5d2f26a5c67d72673ce5b76ca8b695e4e7854c files/arpwatch-2.1.13-lostparams.patch 1045
 MD5 d71450140bb1d62d44244bf767f791ce files/arpwatch.confd 145
+RMD160 a28e71f549b55df40bc0541c1e2912ee618b5bbe files/arpwatch.confd 145
+SHA256 008e9c665bcf62cbecd3f16b8b5c750d660c15c8da63af42e1698151b70fe1be files/arpwatch.confd 145
 MD5 a18b6374f774735a36039566c7bc16fa files/arpwatch.init 788
+RMD160 ae78885d095602c54b1801616cd6e4df80e8d408 files/arpwatch.init 788
+SHA256 d4c9ca73d2f95ff80211e4d5ed813583394da820921c3d96fe65111d47a73c4a files/arpwatch.init 788
 MD5 c4db2dbc69aed4ec9dae6a2192b6de56 files/digest-arpwatch-2.1.11-r1 136
+RMD160 d842ae7fe7ee61bc09ba38649bf0e56ac6b16386 files/digest-arpwatch-2.1.11-r1 136
+SHA256 240f1cca2d7fbd881923528b48eccfcb926aaf7670c4a19fdf9bb711882e8d73 files/digest-arpwatch-2.1.11-r1 136
 MD5 e8798136fa631765b3474db3e64a045d files/digest-arpwatch-2.1.13-r2 133
+RMD160 7f71745595d8f3b84b8a1c4b68f00ba19635b470 files/digest-arpwatch-2.1.13-r2 133
+SHA256 66450c499e068f8b8bf577d1bbee7f48dff2e0ec9da11d75a8a52c43b7704b2c files/digest-arpwatch-2.1.13-r2 133
+MD5 b4a38311808d805acb30c6007faa003d files/digest-arpwatch-2.1.13-r3 491
+RMD160 03d5140dbfad32abff68c333db0a7611ff2e0443 files/digest-arpwatch-2.1.13-r3 491
+SHA256 b5349a77c869ed6ce3dc0f4f19ed6e7ce8cead3a167b139f88ef57965766d1e3 files/digest-arpwatch-2.1.13-r3 491
 MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
+RMD160 377d326060dda0ab45a0c94e76273cfd44b36518 metadata.xml 252
+SHA256 3520f0603cc195849e23832f0869a51c3f734abbdaa9d84d1287c33d4c1f3691 metadata.xml 252
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.13-r3.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.13-r3.ebuild
new file mode 100644
index 000000000000..b5e1db072c45
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.13-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.13-r3.ebuild,v 1.1 2006/02/06 00:36:58 jokey Exp $
+
+inherit eutils versionator
+
+#MY_P=${PN}-${PV%.*}a${PV##*.}
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
+HOMEPAGE="http://www-nrg.ee.lbl.gov/"
+SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+	mirror://gentoo/${P}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="virtual/libpcap
+	sys-libs/ncurses"
+
+RDEPEND="selinux? ( sec-policy/selinux-arpwatch )"
+
+pkg_setup() {
+	enewgroup arpwatch
+	enewuser arpwatch -1 -1 /var/lib/arpwatch arpwatch
+}
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	einfo "Patching arpwatch with debian and redhat patches"
+	gzip -dc "${DISTDIR}"/${P}.diff.gz | patch -s
+
+	epatch ${FILESDIR}/${P}-lostparams.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man"
+
+	econf \
+	${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+
+	dodir /var/lib/arpwatch /usr/sbin
+	diropts -g arpwatch -o arpwatch
+	keepdir /var/lib/arpwatch
+
+	make DESTDIR="${D}" install || die "install failed"
+	doman *.8
+	dodoc README CHANGES
+
+	exeinto /usr/share/doc/${PF}/
+	exeopts -m0755 -o arpwatch -g arpwatch
+	doexe arp2ethers arpfetch bihourly massagevendor massagevendor-old
+
+	insinto /usr/share/doc/${PF}/
+	insopts -m0644 -o arpwatch -g arpwatch
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	insinto /usr/share/arpwatch
+	insopts -m0644 -o arpwatch -g arpwatch
+	doins ethercodes.dat
+
+	newinitd "${FILESDIR}/arpwatch.init" arpwatch
+
+	newconfd "${FILESDIR}/arpwatch.confd" arpwatch
+}
+
+pkg_postinst() {
+	einfo "If you want arpwatch to start at boot then type:"
+	einfo "      rc-update add arpwatch default"
+	einfo "To enable arpwatch to run as a user please uncomment"
+	einfo "the appropriate line in /etc/conf.d/arpwatch"
+	einfo "Some scripts that come with the package are in:"
+	einfo "/usr/share/doc/${PF}/"
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch-2.1.13-lostparams.patch b/net-analyzer/arpwatch/files/arpwatch-2.1.13-lostparams.patch
new file mode 100644
index 000000000000..b7cb6bcb4d5a
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch-2.1.13-lostparams.patch
@@ -0,0 +1,43 @@
+--- ./arpwatch.c.orig	2006-02-01 19:30:30.000000000 +0100
++++ ./arpwatch.c	2006-02-01 19:27:25.000000000 +0100
+@@ -191,7 +191,7 @@
+ 	interface = NULL;
+ 	rfilename = NULL;
+ 	pd = NULL;
+-	while ((op = getopt(argc, argv, "df:i:n:Nr:u:")) != EOF)
++	while ((op = getopt(argc, argv, "adf:i:m:n:Nr:s:u:")) != EOF)
+ 		switch (op) {
+ 
+ 		case 'a':
+@@ -235,6 +235,10 @@
+ 			rfilename = optarg;
+ 			break;
+ 
++		case 's':
++			path_sendmail = optarg;
++			break;
++
+ 		case 'u':
+ 			if ( optarg ) {
+ 				serveruser = strdup(optarg);
+@@ -245,10 +249,6 @@
+ 			}
+ 			break;
+ 
+-		case 's':
+-			path_sendmail = optarg;
+-			break;
+-
+ 		default:
+ 			usage();
+ 		}
+@@ -800,7 +800,7 @@
+ 	extern char version[];
+ 
+ 	(void)fprintf(stderr, "Version %s\n", version);
+-	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
+-	    " [-n net[/width]] [-r file] [-u username]\n", prog);
++	(void)fprintf(stderr, "usage: %s [-adN] [-f datafile] [-i interface]"
++	    " [-m addr] [-n net[/width]] [-r file] [-s path_sendmail] [-u username]\n", prog);
+ 	exit(1);
+ }
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r3 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r3
new file mode 100644
index 000000000000..33587e1a838c
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r3
@@ -0,0 +1,6 @@
+MD5 8808ec9f2b2b2c22000e3f4542e7ce0e arpwatch-2.1.13.diff.gz 7863
+RMD160 568f02d76463d1d4a32b43d79a678f9a5453c4b0 arpwatch-2.1.13.diff.gz 7863
+SHA256 044403360b6b187536e791b17faefdb04e3d6a7bd284d1068d95b0f2dc645e15 arpwatch-2.1.13.diff.gz 7863
+MD5 b9ff9739cdd2c0e9807b2d05860e4811 arpwatch-2.1a13.tar.gz 152779
+RMD160 80b89d36d9c20e9d0ac272ba7b66494d2888a557 arpwatch-2.1a13.tar.gz 152779
+SHA256 57025d5d1c883961ad7bbe53e5f0d73fa4b55659c28ee7722dddfc9c1512ee76 arpwatch-2.1a13.tar.gz 152779