Change sed scripts into patches. Split out logic from OUI database patch. Clean up OUI database patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 96 insertions, 35 deletions

diff --git a/net-analyzer/netdiscover/ChangeLog b/net-analyzer/netdiscover/ChangeLog
index 7145cd372045..8731b1ccacc8 100644
--- a/net-analyzer/netdiscover/ChangeLog
+++ b/net-analyzer/netdiscover/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netdiscover
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.14 2013/07/04 21:25:20 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.15 2014/07/14 22:12:55 jer Exp $
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> netdiscover-0.3_beta6-r3.ebuild,
+  +files/netdiscover-0.3_beta6-gentoo.patch,
+  +files/netdiscover-0.3_beta6-misc.patch:
+  Change sed scripts into patches. Split out logic from OUI database patch.
+  Clean up OUI database patch.
 
   04 Jul 2013; Christoph Junghans <ottxor@gentoo.org>
   netdiscover-0.3_beta6-r3.ebuild:
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index 4cad40f42341..d8c57e876fc7 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151877 SHA256 bac5accfcf233ef483552a319970fe2ec9f6dcfe02d8158c0bd10f62855c5104 SHA512 785024a3ffac3974df9879233a2b76000a734f59d54300c027deef9754a9bdf78ea899780a23f3a7657b769b748d4fa056f5d0acdf85422f7452ced32f204cea WHIRLPOOL 5866276af024bf56e7f8600d9cbd9e8ba7765413ad34ce6e4d63de072d341bef3cb4ef9f022f4401e4e3de4adba7f2c118fcd70c67c4c176f381a85a8260909a
+AUX netdiscover-0.3_beta6-gentoo.patch 668 SHA256 4fb4bd72d2a263208ad517b91046c8afd2391ff633214fe407a3ecb61d167430 SHA512 f05aea3f8ef120f3f1a33f1dfff401fc5045cb6e71735dcdc135bb33b5bb338eb90fb442d474a0e8a993df5d67f70fcd676f12c582ca1509d5550724d4f53b99 WHIRLPOOL 44aff796a09406d5f91ca7f5caf804d9325bb986bbe70f8d34da4066b88ac9a1918a938a715367a2624766df98470ac850aef5346f7d246371369c3689afbd3c
+AUX netdiscover-0.3_beta6-misc.patch 432 SHA256 2470d403350dd1cbce6f7fa89fbea1207397900d60fda7a46a4f34ab8109f4f3 SHA512 bf67008aa25558d2a8d1a2a5731fdafb555b5336db2be3ffc6f15e89312341eff9bd351115a2cbd21078d823f4b79a81f0583b0380d44eb617a2770838c07de7 WHIRLPOOL 3a655a6568362e97568b4b1fc31411cc62931c92bda991896a6b4f34d7b01836370012c749e47739eed73ee852f2f8a8aa31fcf9166c302917fe7a4624f3ce9f
+DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151434 SHA256 81d06920e0606ec74a497ca4b34b0288572b9be82093bc19e3b812c036fba9f6 SHA512 936f030bac30cf54d1b9b6bb23045c2cad201a21529706436ab0732c356dc4ab27e3f2a8472437f9ac76d9b819ebc6d8faa05405be13d3d6beda5e261ebf93da WHIRLPOOL fe95a550fa41aedb75bad90cbfebe1b14c63b6f1d1edc2caf82a689bc2740d65b07836701e6f1e8e541eabbd3c35c432ba3a8e771d89f5b4e3e6812f835e6fdb
 DIST netdiscover-0.3-beta6.tar.gz 411018 SHA256 19c367f823c49999e2c05c485cac0a5d5685d23c6b33deae1e957406571924db SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2 WHIRLPOOL 9386451a26a3fb147aadd772bfc71c89cc67185c54c24b306fc421b43799f00402ff383c96944945b06baf90ad22ff409dc0c57a4370b98a20a89951595310fb
-EBUILD netdiscover-0.3_beta6-r3.ebuild 1224 SHA256 a32e2091f55e1b8e0d926becfd4c589f1403ab824d5413bf990fcab800f19d6f SHA512 842d358e443adacd61d3f5c99c4696aa65d3b9622a5d916ffd80acf3483b803d942a3aad3fb11f24bc65d7eb24643fdf02618e55cc7a5f83ec8caccbc0318bc3 WHIRLPOOL e8c97bdf83404fc6c9e9dd376ec645fc1d201ec3ee7ddad74f854bc79ac7acaf2d11555cc3880a2e57ecf471a1e2f379757fc7b35ab1cd9ea512c7568435cd4b
-MISC ChangeLog 2096 SHA256 24576276cc16c5021a2198b29fa12acad10a33863cb46258287fde56dd6b52b4 SHA512 d45c783e805dc11fd70c788266a1459c4ee324ac5aaa8e2dd10b95a0cab04b342a8f999a7d0ba440c04156442d0847fc2aacf8d2391c849a58ee876344d0c11f WHIRLPOOL 30fb3ef83fa71f69a947a427a1a2c6a1c3aaab9ebc6648a249a6d3aa9801e76ff8acd1802d923189bbdc00aa6ee06bb27fcde337d6d1a33bc83041cfad28e5ba
+EBUILD netdiscover-0.3_beta6-r3.ebuild 935 SHA256 9d19e6aab4c5fc6311e452c04956fa8c43a9959f28f2586d534c32e441a90027 SHA512 2440a8669b752cfa1dad804e6dd8709bd1452169b018c19d2729b6639f3d9e95ef98bbfe029509b3e1513d08cac3afb7aeb3bc38ddfd54624e4ede7e69701bcb WHIRLPOOL fd9f5e8f892ce7cf3fc6359cff5f5e8b695627780e3213762ab46113fa9a9272ad6d587ca8224dc706b9cd68b3490b3c3df992cbedcb7e47bf11869d707d90b8
+MISC ChangeLog 2369 SHA256 78aae94e55652cc13ace2d6a4f8d021c4aebd5bfa5b63909f4a22222f79262d5 SHA512 8811146aff8f9d864f8f863bcdb6efc854d26efc41f77c3ce228a50980c924e64a8b0dd1b51dfbcb8a33e92c49b5aebeeb175eb29073a6d15535e72c7e446a03 WHIRLPOOL 9c7bc208bd8f75b9529c687ba55a953e1d0bc6048982d8050073e2ec6972f8f0069ab30cd9ef4a2e39f9545abd57f92ae4d400b6580848104aead60997d65f3b
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR1ehCAAoJEOeBhlrCAAWGJFwH/2DWiodJwWKRyvsUopWDP41u
-zmjKaRp4TPiHEfYICxT1UzOk8p30cDFmXNMR7wW1ixoV7PzMiQut4CW5ObRXUqY2
-asGN+y6Ix0ZCOW9X0xQdHiL7CMY/IKWKwydQga0oZwFFEcnudeNSYzuWUFKu/u3F
-9Qf/BYF2FzOhwk0+z7gkGlwq289dVyeyO7kmxkwQdytktB+sA66jzUT0cSUyiGnj
-xIZWGuBTm/UsXdc3Qc+2XoSMn9SH7eHJLZN8lyJ9s5FGc+uQxeIe4PTkiv6VRe4w
-7T9KGr3vqJ2ZQ3oyPuxSvxyEk8uc6a/9XvZ3RHYEO0qEJx+1opsEHCpCHTmVZlQ=
-=pvtK
+iEYEAREIAAYFAlPEVegACgkQVWmRsqeSphMJ9QCeNLJjEHEsykE3SsWfbP8QJ4C5
+OLgAmwXj3aiQMUB2mdTfhTn1pSQbV6X0
+=BC9/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
new file mode 100644
index 000000000000..d70fc36de5a5
--- /dev/null
+++ b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch
@@ -0,0 +1,41 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,7 +5,7 @@
+ 
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(netdiscover, 0.3-beta6)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ dnl get system information
+@@ -35,7 +35,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PROG_LIBTOOL
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,8 +5,8 @@
+ 
+ SUBDIRS = src doc
+ 
+-netdiscoverdocdir = ${prefix}/doc/netdiscover
+-netdiscoverdoc_DATA = \
++noinstdir = ${prefix}/doc/netdiscover
++noinst_DATA = \
+ 	README\
+ 	COPYING\
+ 	AUTHORS\
+@@ -15,7 +15,7 @@
+ 	NEWS\
+ 	TODO
+ 
+-EXTRA_DIST = $(netdiscoverdoc_DATA)
++EXTRA_DIST = $(noinst_DATA)
+ 
+ 
+ 
diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
new file mode 100644
index 000000000000..2b92bfde8629
--- /dev/null
+++ b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch
@@ -0,0 +1,20 @@
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -33,7 +33,7 @@
+ 
+ char *search_vendor(unsigned char mac[6])
+ {
+-	char tmac[6];
++	char tmac[7];
+ 	int i = 0;
+ 	
+ 	sprintf(tmac, "%02x%02x%02x", mac[0], mac[1], mac[2]);
+@@ -42,7 +42,7 @@
+     for (i=0; i<6; i++)
+         tmac[i] = toupper(tmac[i]);
+ 	
+-	for (i=0; i<8436; i++)
++	for (i=0; i<NUM_OUI_RECORDS; i++)
+ 	{
+ 		if (strcmp(oui_table[i].prefix, tmac) == 0)
+ 			return oui_table[i].vendor;
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
index 63556b931628..05346c08220c 100644
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
@@ -1,40 +1,36 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild,v 1.3 2013/07/04 21:25:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild,v 1.4 2014/07/14 22:12:55 jer Exp $
 
 EAPI=5
 inherit eutils autotools
 
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="An active/passive address reconnaissance tool."
 HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
-SRC_URI="http://nixgeneration.com/~jaime/netdiscover/releases/${MY_P}.tar.gz
-		mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2"
-IUSE=""
-
 LICENSE="GPL-2"
+SRC_URI="
+	http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz
+	https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2
+"
+
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
-DEPEND=">=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libpcap-0.8.3-r1"
+DEPEND="
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.3-r1
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P/_/-}
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
-	epatch "${WORKDIR}"/netdiscover-0.3-beta6-oui-db-update-20091010.patch
-	sed '/char tmac/{s:6:7:}' -i src/misc.c || die #, drop in beta7
-	# Avoid installation of ChangeLog, LICENSE, etc. We do this ourselves.
-	sed -i \
-		-e 's:netdiscoverdoc:noinst:' \
-		Makefile.am || die
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e '/AM_PROG_CC_STDC/d' \
-		configure.in || die
+	epatch \
+		"${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-misc.patch
+
 	eautoreconf
 }