Version bump.

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

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 69e57afb66099a4669156b7266f449c517c82387..48e535dd7bc2079dc5914841a71644afd7b3efa6 100644 (file)
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.40 2014/07/05 13:19:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.41 2014/12/04 10:01:39 jer Exp $
+
+*nfdump-1.6.13 (04 Dec 2014)
+
+  04 Dec 2014; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.13.ebuild,
+  +files/nfdump-1.6.13-libft.patch:
+  Version bump.
 
   05 Jul 2014; Jeroen Roovers <jer@gentoo.org> -nfdump-1.6.9.ebuild,
   -nfdump-1.6.10_p1.ebuild:

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index bed5ca25521e110584c360d78f15aba602e35855..70a0ebf2598647008af329bdc806cdf04b55701a 100644 (file)
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA256
 
 AUX nfdump-1.6.12-test-dep.patch 172 SHA256 6016750b078f0b489b3b9abfd256861a2b2add63ebd387f339cbd0271acbada2 SHA512 7a430b093adad1b06c181a0ebfef80f80d4a0767a3843b7f4b0fb5e9fec52c5349ef09c29841dcd8f54def750bd21166c6bdab7e687950ec54b3d8ae57209631 WHIRLPOOL 5ee39e487217ceff5784bda3407cc28d2ca16bbb4b070d7f3bd907b88515b95381a6e3b0c6f2aae0d8c3e752d8337bec670ad5c96543282f5d45f1f099172508
+AUX nfdump-1.6.13-libft.patch 602 SHA256 b0aab47ec8cf92b8c5c154042470a588a7424660289fff9b90e4e8fb47b9b806 SHA512 ac422b215ecfbb120690c67eae94f637ec43754f21f7e8732f08e2f3681461b84b8d295ca276293e850151fc00c94b59f9f2ff21ce9e7f36434bf1aaffce9908 WHIRLPOOL ba556f0cf151727abe5d27896518c1e43f26c5b491991832b6d049d099cc4c47becf9acb7c1cbd816a243bd73b3a44fd1d4eca25d255afebf2a62de35c8cfc1b
 DIST minilzo-2.07.tar.gz 60009 SHA256 b706cf02e8af2716a56830ca067cf2d7c0e305c776cb26bd760cd157ce73c928 SHA512 ff1604ab6e273208aa72218367c7acd6f262965ee8fa62091346851099df237af9e9fe61c29638b922ce020d5d6463a18b93a899299c0d96745135aad839c816 WHIRLPOOL 66ec8d7a87a75e218f052a30fc7afcd05f906a91641b85b83bcda79356819c390a71ceb9d71f1015e82791e1bd62f4f69cce68f3e4250dd6323a7a7d47b3c72a
 DIST nfdump-1.6.12.tar.gz 733604 SHA256 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204 SHA512 4ff61c14746f34f47588545e58e4e2fa679cc107192cb81d4ece1b7e18ad9ae1d3ce7663b90a302a64a3cc72cdd55718a446c5323ac100ed5fc3601931d866ad WHIRLPOOL 7acbc624868802e73f1d67f0984bdbfd67e9c3d14679fde360be7fefbeeac18d884930802abb156b2a283796f690588c4a46bc12a3287f791b9c6e87f04b02ed
+DIST nfdump-1.6.13.tar.gz 662006 SHA256 251533c316c9fe595312f477cdb051e9c667517f49fb7ac5b432495730e45693 SHA512 92c21462cddc69b3551d0ed5c20c7b87e5b4e6438efcbc16aac0e8af45b8ec7e5a361c6e514effcf78c1e78fd892959e8f39bb08915d4daedf4b6e932303688d WHIRLPOOL a412164ff29d9e7a2864033a320ecc60789138097fb3c237b413a953cb7136330a0989f5402ac74c2261c6279675eea3bbf1450b4c6c03475e8ad2fe97cafefd
 EBUILD nfdump-1.6.12.ebuild 1647 SHA256 e0d519e0a498d43a0f64d9a93bedbfe6c0c6b78c34a5ab536e46704e8536d749 SHA512 b929cc8e13a6cc7f63494f8220c3027806f3e74b1d2f88b3fc12cfae2e55a384bf4c571d65c01189a7d4d3f6497a2b3a8d86b7ed9adce2713b33f9e29a45b567 WHIRLPOOL f391ab0488d1e93f03075fd48a65e0350c42723908df4ce1a3976d466730e53cdec5cd0d24bde34eba2a1c4fc5000645e3f83b0c52770c8c2381041757b94835
-MISC ChangeLog 5695 SHA256 80a8f2559a18c9dd001c0bb9bd6130c02222b8062597a191368edfc3dfd0974b SHA512 b69f076dd5e35027fb12bc527cb63e119bdcac148588f4b4ea8da0a64422d41cfa226d7ab9b640145fd1780e1b44485d81058d873161a819f3e2994a9d649324 WHIRLPOOL f16e85b0f6bc079e579f3dfa6de178f3c2d97b55a0c412c279bc9499c059495cddb4ab1459ce1463879681ce8e401a90762cf547959d945ab655c48443235b3f
+EBUILD nfdump-1.6.13.ebuild 1663 SHA256 2ad397b0e665e3cdcac2445a59343068103c300381cbff1eaf060516c4f1fdcd SHA512 7ca8f62a961492e5ce9ede84f0b2acc6ccfaed428f11b5acd0c9a179b0f064b7ac7bc8e16241e16b87086c10528350188cdfc3ad9b3b27122362b30c7e23a550 WHIRLPOOL c3b83caf7480bf05bdddc5891a0c762dce887bcd7c3a6a3be3b21e7420a4d8d96a49a996fa421c9cbe383a5cae51acc55c2b160361902f67b1a3a8bc8ce8a02d
+MISC ChangeLog 5848 SHA256 7c43342be790f71e192efd90d511d915817b56cb45caaa7a94f47119f0e808a0 SHA512 879fcbebed83ca6c267b97d8ac22f8c67b8c9753fa42acf2cb28ddbbeebf654329c393cd6759d5e0a5d8b87bc3454d4d7174ff57f4ae48cf21c80575cdaa6fc9 WHIRLPOOL d913e8cada413a928bd4998c877dd9181cad3acb833cbccbfbab2f74325bed58a5f91efe9c5b5700fb0df1f52ef267006af66cf90855294df568a936c9f857a2
 MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlO3+2oACgkQVWmRsqeSphO/DQCfTmL+d77poGP3o9dmvsIYMFLA
-rBoAn2cpqa1ISsVXFd7WUrmW27LfTDKd
-=icB+
+iEYEAREIAAYFAlSAMQYACgkQVWmRsqeSphN59wCfWC8VkWtB5VhmNmWYE3Eqgb2o
+OCEAn0tUGcvsbSZ7WxDLy9SFAft7KL/V
+=VSnQ
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
new file mode 100644 (file)
index 0000000..f657150
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,9 +109,8 @@
+       if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
+               AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
+       fi
+-      if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
+-              AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
+-      fi
++      AC_CHECK_LIB([ft], [main],,
++              AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first))
+       FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
+       FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else

diff --git a/net-analyzer/nfdump/nfdump-1.6.13.ebuild b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
new file mode 100644 (file)
index 0000000..70e0049
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.13.ebuild,v 1.1 2014/12/04 10:01:39 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="
+       mirror://sourceforge/nfdump/${MY_P}.tar.gz
+       http://www.oberhumer.com/opensource/lzo/download/minilzo-2.07.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
+
+COMMON_DEPEND="
+       ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+       nfprofile? ( net-analyzer/rrdtool )
+       nftrack? ( net-analyzer/rrdtool )
+       readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+       ${COMMON_DEPEND}
+       sys-devel/flex
+       virtual/yacc
+"
+RDEPEND="
+       ${COMMON_DEPEND}
+       dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-libft.patch
+       # bug #515278
+       cp "${WORKDIR}"/minilzo-2.07/*.{c,h} "${S}"/bin || die
+
+       if use ftconv; then
+               sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+               sed \
+                       -e 's:lib\(/ftlib.h\):include\1:' \
+                       -e 's:libft.a:libft.so:' \
+                       \-i configure.in || die
+       fi
+       sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
+       eautoreconf
+}
+
+src_configure() {
+       # --without-ftconf is not handled well #322201
+       econf \
+               $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+               $(use nfprofile && echo --enable-nfprofile) \
+               $(use nftrack && echo --enable-nftrack) \
+               $(use_enable compat15) \
+               $(use_enable debug devel) \
+               $(use_enable readpcap) \
+               $(use_enable sflow)
+}

diff --git a/net-analyzer/sflowtool/ChangeLog b/net-analyzer/sflowtool/ChangeLog
index f989f152acd88a1820c6cf7cfa57c7440521f9e9..2a011e45209b1c168035530b4ee3c560dbf86593 100644 (file)
--- a/net-analyzer/sflowtool/ChangeLog
+++ b/net-analyzer/sflowtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sflowtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/ChangeLog,v 1.48 2014/08/14 20:42:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/ChangeLog,v 1.49 2014/12/04 10:01:06 jer Exp $
+
+*sflowtool-3.33 (04 Dec 2014)
+
+  04 Dec 2014; Jeroen Roovers <jer@gentoo.org> +sflowtool-3.33.ebuild,
+  -files/sflowtool-3.20-ctype-header.patch:
+  Version bump.
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> -sflowtool-3.30.ebuild:
   Old.

diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 487f024a56192743b9a119459b65c6740ddb009e..212289a0bd7ab6539a5cd810b7d709236f7dfe79 100644 (file)
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sflowtool-3.20-ctype-header.patch 193 SHA256 a9139364399b5ad0591261d378c9194f869ef770353a421029cdb0fe471c45ab SHA512 9eff7e4c58226c6d1ff6506d1def9c1c20df0b39f58a31135ee1e16a3469dd8de1040d6e277d54c34fbc193d56c3aefeedb575fa1ad63d9a92ff054701e1b3d3 WHIRLPOOL e25daaf84295f3446c024fdee791a061ce4c8d58c2c36303b8fba2e5b2e90520ba233e11e8dffabfc1b8d2af5a1a416baf20c4a045daadd31d8fb6483effd62a
 DIST sflowtool-3.32.tar.gz 171316 SHA256 edb40902e76377b12a08a513bf49776e0a70e43c7f541f77de995cc23ccb7343 SHA512 fa7e9e5f4d86c4b877d8ee5952e5f7d8d651550ed2d774c2abf7e8c21a756bb1e72cbd499d9e511316d8fea906c87d65d27850101f00e02aaf1460e8ba219af2 WHIRLPOOL f30c0c96b197ff940500cfc9c45525258c04f1d22739ea6ea5e34837e8cbbe7fa8746d62871d43ef585b10994bd9362d79a22ed68d6063cb4903aca2c1bfcca4
+DIST sflowtool-3.33.tar.gz 171459 SHA256 303112c3cd72a8f96298636677b9175ba4558e553e6f66e92cf3dbc952a68f1a SHA512 c6911e3fc402675e7c13b7aba2253deb09bca2820f9ce774652460bb352cb3e7ddf877d8bdff78a2261e3e9e399bef842d10bd95c2310e08738aeb850279140d WHIRLPOOL 7b16a13e28a544ff34c41a90904efbd119cbc7e01c0a9c946835183628ac0b8907b967767798957a0b9a59d289cce056159ed86540c3bd4b7884722dddc9ddbe
 EBUILD sflowtool-3.32.ebuild 594 SHA256 4ecd76c93c74d43b40ba1ad332710651f77903465f636196bf5bf0293fb05e0d SHA512 ee3c09dadf25005804d4aceceab30cc50be40159ce1c93c418c4b03dcca36f982feba938e34be4b754fa7c871e52e364747bdcb4e098f5422aa1e1b32f6bb1a6 WHIRLPOOL 69074d1a59b12c47b3e713aa55be705942e1d1e37499bd1a80cc57816a0ddaabd741c0eeb7eb1466f0c862f6605fc2a63174a666c2562947acc0d0425a6dd511
-MISC ChangeLog 5916 SHA256 2254713ad0f37d57b00b346d2f9fc00d0244189183264e67c32ec7393b777f0b SHA512 31eb8898c2b4dc29d0e7434cf570017f00087f035ae9d4f2c9b9531d156f2e5113a23da2acad91fd2bbb0d3ac551ddb27014c12291a50154eb6da0d233fd8063 WHIRLPOOL d5bf2ec7cfa310ddaa50f797ed4328433c2ac2460ba2573c3bba2cfce89c8a9ed930bafbd5609db2dcf4de2a75b5c39329c6617bad22f7558ab473e01edd5d9f
+EBUILD sflowtool-3.33.ebuild 597 SHA256 518e434f5ae58853445d2f9e49057b4ff0979b15b8cc42c8ad49e4ba36a2373e SHA512 dde6694a0e64d47b7e7083778a4a00c978e6c41b45107625ea37af8898371f291a2b3af2ab6c37ef2649f56ce5560549b67edea3a668638c5c5e5472b661f30e WHIRLPOOL 422a71c6c71b0809dd1a95c6704070733624718663c2e94d5106c46ff0462adba44b278d3bd79340fa492d4a24a7c6f435b5eef40c28277346e59c4d204b987e
+MISC ChangeLog 6079 SHA256 9397e9131f3c17ac4f80b7197b09344f30f748fb77b3d54be667985e0ed1b6a4 SHA512 4a317e2112e51d68367476b6f1ed09d60be17bbebd72018fde1f83335aebd53b8c224838b3e3f892796081cff4b0c6ee55b6f3ef6c4f7665a133d740aec13345 WHIRLPOOL 8b6f54c00089d255145546bd3ba56b673a3354fa933b3c71ce77e7c8fe1448a692e2867cccb5b754dd9a4a05fd9458ec0350d854cfc54fcd9c71f64425db6e02
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPtHzMACgkQVWmRsqeSphNhAwCdHERfdFROGn+zVPftWPNAFMxH
-YLUAn3WEmex03icKuMZPdEOi27ylX0qg
-=7/cM
+iEYEAREIAAYFAlSAMOQACgkQVWmRsqeSphMangCfX5uo1dgtgsOK+J7eXuhA4Ob0
+5BEAn0a285cAndTOW3Cp3DsbYUyorR4j
+=F7eU
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/sflowtool/files/sflowtool-3.20-ctype-header.patch b/net-analyzer/sflowtool/files/sflowtool-3.20-ctype-header.patch
deleted file mode 100644 (file)
index 2d2c7b1..0000000
--- a/net-analyzer/sflowtool/files/sflowtool-3.20-ctype-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/sflowtool.c
-+++ b/src/sflowtool.c
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <setjmp.h>
-+#include <ctype.h> /* isspace(), isalnum() */
- 
- #ifdef WIN32 
- #else

diff --git a/net-analyzer/sflowtool/sflowtool-3.33.ebuild b/net-analyzer/sflowtool/sflowtool-3.33.ebuild
new file mode 100644 (file)
index 0000000..e547d77
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-3.33.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.33.ebuild,v 1.1 2014/12/04 10:01:06 jer Exp $
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
+SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_prepare() {
+       append-cppflags -DSPOOFSOURCE
+       use debug && append-cppflags -DDEBUG
+}