4 files changed, 142 insertions, 2 deletions
diff --git a/net-analyzer/fragroute/ChangeLog b/net-analyzer/fragroute/ChangeLog
index 89d2ee3b5392..241063bd4b48 100644
--- a/net-analyzer/fragroute/ChangeLog
+++ b/net-analyzer/fragroute/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/fragroute
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/ChangeLog,v 1.24 2012/10/09 09:09:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/ChangeLog,v 1.25 2012/10/11 13:11:21 pinkbyte Exp $
+
+*fragroute-1.2.5 (11 Oct 2012)
+
+  11 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> +fragroute-1.2.5.ebuild,
+  +files/fragroute-1.2.5-autotools-fix.patch:
+  Version bump
 
 *fragroute-1.2-r4 (09 Oct 2012)
 
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 9d4244d572e6..c0b9ed4d2157 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,6 +1,9 @@
 AUX 1.2-libevent.patch 720 SHA256 39e4f706b06565e5a45324a1079d495c6b3edf7991397b4c3391ab342bdaa008 SHA512 e159d5a2878bebe0f013e6164af9f5df470f5b16046a02444c0d75cc5a2317e4ee5940a72391f7e36568389a657341d9ba1434290ce7f0c3e608885d34bde8c3 WHIRLPOOL f45256d012bccb47fde8f3f016f8eb151310cfe373127d84c22d861bd2804e90a0e36928c96ca9c2d2cb42503b9eb517511a22103f1d5b4dd35b5001e767826e
+AUX fragroute-1.2.5-autotools-fix.patch 3011 SHA256 2210397f610c3f500cb531aa37777046744c26b26aaccfab6704b672cc4e6c4c SHA512 41257edb2d91ad33ac7c801909336bcc618dfcd90b9551c895d650d738a20402b9f2bb5c816cfdddedd3570e180060a908eddca85af926c526de6d554e0fd0d5 WHIRLPOOL c7f180e8be057fdf0884ed5b04a3ae41bffb4e388314348386c0096e82eb9d25518c3352a4f223a672622a00be3a42e7ed84f9fe86b9e354bcaad7a569b9421b
+DIST fragroute-1.2.5-ipv6.tar.gz 161567 SHA256 04b253922b8d2d772c31b596109a16de732ce96c64ff4382b061bd62446f8aab SHA512 56cb4cc8426e388340e318a32352840fff53e5fbe733145d51bd43b3fbf09897a0a58670298b0d6bbe9a9713b563e541013c457740af9b0199d27142a01ac886 WHIRLPOOL c01fa334e15772561e4e76770578f798347630513235911730658a50e268c6c21d3c7697e429e2a59fc6533ec54dcc161ef0e5a49e737f6236c10f20321f5463
 DIST fragroute-1.2.tar.gz 85247 SHA256 6899a61ecacba3bb400a65b51b3c0f76d4e591dbf976fba0389434a29efc2003 SHA512 00f32a4660db8a58e0e86c525065f8a33ed8b9aec2933938dc2543ad533b0035c636c7b5e5833ff79cecaa7361dbfec4b7c88b5589de166e54dc76ae35a53351 WHIRLPOOL d4fe4e5fcef84f858bbd88390732653ef125dfaaf5a28b30bede90e803871ea76767817928a06d3391b599c44744df8d13bf2303b54efd7b0345b855cc122af4
 EBUILD fragroute-1.2-r3.ebuild 962 SHA256 26b839c045a50d06556f39d59eea50d666ff041306f7da0c5e175d26050c4a9e SHA512 a60d1526762a58ce85c5645a18fd85162046afb56cc7cf71209d89890d27c7d9aaf825ce0ea23a044600e4bccb4b37dca0875e0dbb2a1d9902f6111e241ea5ec WHIRLPOOL 2c74959118a8fcd023ff980892993f2f11c61e342c681c557fcaf6c8023f8505c06ff5cfa3cfe3cf518aa9f1477769d1af7d39b64769b89d13affabf2ec0fc2c
 EBUILD fragroute-1.2-r4.ebuild 996 SHA256 02333108245c43a5e2c05f7e415327eb7c6ae8373ab7ab7dfd3a99bcef006f96 SHA512 374115131cbd166cf65459f92a52743313751e6c2c43493323966cc4a5fe176be56215787659287c283935789c4fc00748e9166e39f4733ad5009f75272c8408 WHIRLPOOL 05d8b9673128d3d1ed49bc092c59670b571d67c33184a15c0d334768183e1dfa843241a3558b16deacb84af988d77ee82cfe3258b307e50e23c28225ade064e0
-MISC ChangeLog 3382 SHA256 24b8cae9638f2751f42fac2c37a5d6315f730171bd514b739ef26411b1dc2976 SHA512 e8d7dcd112b3fd995fcc57971f68a7096b7399275baf85e6634448c46aeff711187b86a167f4765694dd7ecde87bc42b00bfb8cc44bff16e81e386fe765fd3af WHIRLPOOL 66e048c076a4743886dd88be6bf174ff3acc6cb5fbe3c5f605755ed79df0bd27ed03062d0240b1495811c59b37f4c96c33eb060e805eb5018905f456718910a1
+EBUILD fragroute-1.2.5.ebuild 1300 SHA256 b4599a072d8080d126910cf751a7bd675d4bfb983b3b4f2112e1f2b1fa502466 SHA512 7291c3673a0da3fe6ef5bba32740a947ddc01361fbc872d543820ed81d19571822346bf8b0858d897e13c6bd6572bbfc8f5f36ff6cd7f88a2db3389dbc52cc95 WHIRLPOOL 260103ac3eba68539051f051563ff943cade4623c82b5ac2805416f9a4094e404d791a1ed5632cc36d9abe75623ab320b10aaf25ab9c1fec38569201ca2b142f
+MISC ChangeLog 3551 SHA256 5251a6cf604bd496f1f5092fb3a48a9193586ffb752dc79eb7b223f5d28ef95b SHA512 3d0f79800546b2306eb64521c0e845953b545b98f137c27f40da3335a40bc736216bd904df3496ffeea631bf0551cf4fb9a841c5cafb732c7882726f346680ba WHIRLPOOL e846dfb4d060638694aad7d4bf8cc004ecc1d6432495fdfbeb6ec1516e9e920b340322cc98fda22615f20bc4076990a0efe3a02eb97024fd2b38f052080011c0
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
diff --git a/net-analyzer/fragroute/files/fragroute-1.2.5-autotools-fix.patch b/net-analyzer/fragroute/files/fragroute-1.2.5-autotools-fix.patch
new file mode 100644
index 000000000000..2e76e41aedcd
--- /dev/null
+++ b/net-analyzer/fragroute/files/fragroute-1.2.5-autotools-fix.patch
@@ -0,0 +1,81 @@
+--- configure.in.orig	2012-10-11 16:36:43.000000000 +0400
++++ configure.in	2012-10-11 16:36:49.356097356 +0400
+@@ -43,7 +43,6 @@
+ else
+ dnl XXX - BEGIN !CYGWIN
+ 
+-AC_LBL_LIBRARY_NET
+ 
+ dnl Checks for libevent
+ AC_MSG_CHECKING(for libevent)
+@@ -55,30 +54,30 @@
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
++     if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         EVENTINC="-I$withval/include"
+         EVENTLIB="-L$withval/lib -levent"
+-     elif test -f $withval/include/event.h -a -f $withval/lib64/libevent.a; then
++     elif test -f $withval/include/event.h -a -f $withval/lib64/libevent.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         EVENTINC="-I$withval/include"
+         EVENTLIB="-L$withval/lib64 -levent"
+-     elif test -f $withval/event.h -a -f $withval/libevent.a; then
++     elif test -f $withval/event.h -a -f $withval/libevent.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         EVENTINC="-I$withval"
+         EVENTLIB="-L$withval -levent"
+      else
+-        AC_ERROR(event.h or libevent.a not found in $withval)
++        AC_ERROR(event.h or libevent.so not found in $withval)
+      fi
+      ;;
+   esac ],
+-[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a; then
++[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.so; then
+      EVENTINC="-I${prefix}/include"
+      EVENTLIB="-L${prefix}/lib -levent"
+-  elif test -f ${prefix}/include/event.h -a -f ${prefix}/lib64/libevent.a; then
++  elif test -f ${prefix}/include/event.h -a -f ${prefix}/lib64/libevent.so; then
+      EVENTINC="-I${prefix}/include"
+      EVENTLIB="-L${prefix}/lib64 -levent"
+   else
+@@ -103,13 +102,13 @@
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
++     if test -f $withval/pcap.h -a -f $withval/libpcap.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval -I$withval/bpf"
+ 	PCAPLIB="-L$withval -lpcap"
+      elif test -f $withval/include/pcap.h -a \
+-	       -f $withval/include/net/bpf.h; then
++	       -f $withval/include/pcap-bpf.h; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval/include"
+@@ -119,7 +118,7 @@
+ 	   PCAPLIB="-L$withval/lib -lpcap"
+         fi
+      else
+-        AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
++        AC_ERROR(pcap.h, pcap-bpf.h, or libpcap.so not found in $withval)
+      fi
+      ;;
+   esac ],
+@@ -154,7 +153,7 @@
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/src/libdnet.a; then
++     if test -f $withval/src/libdnet.so; then
+ 	DNETINC="-I$withval/include"
+ 	DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`"
+      elif test -x $withval/bin/dnet-config; then
diff --git a/net-analyzer/fragroute/fragroute-1.2.5.ebuild b/net-analyzer/fragroute/fragroute-1.2.5.ebuild
new file mode 100644
index 000000000000..4afc57ec0ea5
--- /dev/null
+++ b/net-analyzer/fragroute/fragroute-1.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/fragroute-1.2.5.ebuild,v 1.1 2012/10/11 13:11:21 pinkbyte Exp $
+
+EAPI="4"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+MY_P="${P}-ipv6"
+
+inherit autotools-utils
+
+DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
+HOMEPAGE="http://code.google.com/p/fragroute-ipv6/"
+SRC_URI="http://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libevent
+	net-libs/libpcap
+	>=dev-libs/libdnet-1.12[ipv6]
+"
+DEPEND="${RDEPEND}
+	virtual/awk"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( INSTALL README TODO )
+PATCHES=( "${FILESDIR}"/"${P}"-autotools-fix.patch )
+
+src_prepare() {
+	# Remove broken and old files, autotools will regen needed files
+	rm *.m4 acconfig.h missing Makefile.in || die 'removing of old stuff failed'
+	# Add missing includes
+	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-libevent="${EPREFIX}"/usr \
+		--with-libdnet="${EPREFIX}"/usr \
+		--with-libpcap="${EPREFIX}"/usr
+	)
+	autotools-utils_src_configure
+}