Bug #487602: bump.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 80 insertions, 1 deletions

diff --git a/net-analyzer/ipv6-toolkit/ChangeLog b/net-analyzer/ipv6-toolkit/ChangeLog
index a0d0c3f8f31d..3426f708cda5 100644
--- a/net-analyzer/ipv6-toolkit/ChangeLog
+++ b/net-analyzer/ipv6-toolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ipv6-toolkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipv6-toolkit/ChangeLog,v 1.1 2013/02/19 19:22:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipv6-toolkit/ChangeLog,v 1.2 2013/12/28 18:51:36 robbat2 Exp $
+
+*ipv6-toolkit-1.4.1 (28 Dec 2013)
+
+  28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ipv6-toolkit-1.4-oui-path.patch,
+  +files/ipv6-toolkit-1.4.1-oui-path.patch, +ipv6-toolkit-1.4.1.ebuild:
+  Bug #487602: bump.
 
 *ipv6-toolkit-1.3.1 (19 Feb 2013)
 
diff --git a/net-analyzer/ipv6-toolkit/files/ipv6-toolkit-1.4.1-oui-path.patch b/net-analyzer/ipv6-toolkit/files/ipv6-toolkit-1.4.1-oui-path.patch
new file mode 100644
index 000000000000..5a1b4a355e66
--- /dev/null
+++ b/net-analyzer/ipv6-toolkit/files/ipv6-toolkit-1.4.1-oui-path.patch
@@ -0,0 +1,22 @@
+diff -Nuar ipv6toolkit-v1.4.orig/tools/scan6.c ipv6toolkit-v1.4/tools/scan6.c
+--- ipv6toolkit-v1.4.orig/tools/scan6.c	2013-08-24 10:38:02.557531033 -0700
++++ ipv6toolkit-v1.4/tools/scan6.c	2013-08-24 11:32:21.244173537 -0700
+@@ -62,6 +62,9 @@
+ #include "scan6.h"
+ #include "ipv6toolkit.h"
+ #include <netinet/tcp.h>
++#ifndef OUI_DATABASE // keep this the same as the Makefiles
++#define OUI_DATABASE "/usr/share/ipv6toolkit/oui.txt"
++#endif
+ 
+ /* Function prototypes */
+ int					init_iface_data(struct iface_data *);
+@@ -6027,7 +6030,7 @@
+ 	fclose(fp);
+ 
+ 	if(!fname_f)
+-		strncpy(fname, "/usr/share/ipv6toolkit/oui.txt", MAX_FILENAME_SIZE-1);
++		strncpy(fname, OUI_DATABASE, MAX_FILENAME_SIZE-1);
+ 
+ 	return(1);
+ }
diff --git a/net-analyzer/ipv6-toolkit/ipv6-toolkit-1.4.1.ebuild b/net-analyzer/ipv6-toolkit/ipv6-toolkit-1.4.1.ebuild
new file mode 100644
index 000000000000..ebc81808b869
--- /dev/null
+++ b/net-analyzer/ipv6-toolkit/ipv6-toolkit-1.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipv6-toolkit/ipv6-toolkit-1.4.1.ebuild,v 1.1 2013/12/28 18:51:36 robbat2 Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Set of IPv6 security/trouble-shooting tools, that can send arbitrary IPv6-based packets."
+HOMEPAGE="http://www.si6networks.com/tools/ipv6toolkit/"
+MY_PN="ipv6toolkit"
+MY_P="${MY_PN}-v${PV}"
+# in 1.4.1, they missed compression
+SRC_URI="http://www.si6networks.com/tools/ipv6toolkit/${MY_P}.tar.gz -> ${MY_P}.tar"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap[ipv6]"
+RDEPEND="${DEPEND}
+		 sys-apps/hwids"
+
+S="${WORKDIR}/${MY_P}"
+
+HWIDS_OUI_PATH=/usr/share/misc/oui.txt
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.1-oui-path.patch
+	cd "${S}"
+	sed -i "s,/usr/share/[^[:space:]\"']*/?oui.txt,${HWIDS_OUI_PATH},g" \
+		manuals/ipv6toolkit.conf.5 \
+		|| die "failed to sed out oui path"
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS}" OUI_DATABASE="${HWIDS_OUI_PATH}" PREFIX=/usr
+}
+
+src_install() {
+	dodir /etc
+	emake install DESTDIR="${D}" OUI_DATABASE="${HWIDS_OUI_PATH}" PREFIX=/usr
+	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
+	rmdir "${D}"/usr/share/ipv6toolkit
+	dodoc CHANGES.TXT CONTRIB.TXT README*
+}
+pkg_postinst() {
+	einfo "Upstream change: ${PN}-1.4: PDF/ODF documentation is now manpages only (same content)."
+}