From: Peter Volkov Date: Mon, 9 Apr 2007 16:17:07 +0000 (+0000) Subject: Fixed bug #155456, thank Andrey Kolbasenko for report... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=197cb2864fdfc847670b5ddc9ffdafda60a0881b;p=gentoo.git Fixed bug #155456, thank Andrey Kolbasenko for report and analysis. Package-Manager: portage-2.1.2.2 --- diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog index ad6a4c2dd7db..be63e7afd687 100644 --- a/net-analyzer/flow-tools/ChangeLog +++ b/net-analyzer/flow-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/flow-tools -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.28 2006/11/23 19:47:32 vivo Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.29 2007/04/09 16:17:07 pva Exp $ + +*flow-tools-0.68-r4 (09 Apr 2007) + + 09 Apr 2007; files/flowcapture.initd, + +flow-tools-0.68-r4.ebuild: + Fixed bug #155456, thank Andrey Kolbasenko for + report and analysis. 23 Nov 2006; Francesco Riosa flow-tools-0.68-r3.ebuild: dev-db/mysql => virtual/mysql diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index c31ff38afa25..bd82667f7249 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -22,10 +22,10 @@ AUX flowcapture.confd 1590 RMD160 8c1fc976191bde42950e0b9e7eed98838abd51ad SHA1 MD5 a3079e6e4ce9d077caa0939f51e806f2 files/flowcapture.confd 1590 RMD160 8c1fc976191bde42950e0b9e7eed98838abd51ad files/flowcapture.confd 1590 SHA256 5d5640ff055d555d527c261ada54e044519c8197413719435e6a965a42147fa4 files/flowcapture.confd 1590 -AUX flowcapture.initd 430 RMD160 686eb46853451d44e0cfb67101e495183d7c6bbd SHA1 a09c27eacfb4f6c2819f78064ac7da63062ead4b SHA256 6de5e4eb2c2570e14648f436813d611a7377a1a4e97298ba9f53194a91ee74ee -MD5 e093ab64e5496e26be23026c3436ddde files/flowcapture.initd 430 -RMD160 686eb46853451d44e0cfb67101e495183d7c6bbd files/flowcapture.initd 430 -SHA256 6de5e4eb2c2570e14648f436813d611a7377a1a4e97298ba9f53194a91ee74ee files/flowcapture.initd 430 +AUX flowcapture.initd 488 RMD160 a0e5688cd49ce9623a3f11bae0fa2d58cc47c609 SHA1 da2024ab2af2cdb0c76f3104d8519cba800983d8 SHA256 125cc865b380427a0e48eb40c3af3d4441ed2a46ac2fd78bdd7768f251feee25 +MD5 0beff2a8f516dd290adf8fa1fccea965 files/flowcapture.initd 488 +RMD160 a0e5688cd49ce9623a3f11bae0fa2d58cc47c609 files/flowcapture.initd 488 +SHA256 125cc865b380427a0e48eb40c3af3d4441ed2a46ac2fd78bdd7768f251feee25 files/flowcapture.initd 488 AUX linkme 283 RMD160 663284e66edca80e03d88db3078cd93d6faca452 SHA1 ebf19e1a1b0b7d74ada82e13d87f95cd61651958 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da MD5 94581c1ca18b1891395fe1f3daeb04ca files/linkme 283 RMD160 663284e66edca80e03d88db3078cd93d6faca452 files/linkme 283 @@ -35,10 +35,14 @@ EBUILD flow-tools-0.68-r3.ebuild 2633 RMD160 a8ddd46493d2b5cc82b68d2d6c36abb994e MD5 d81d1471856d896d81a4e857f93152ec flow-tools-0.68-r3.ebuild 2633 RMD160 a8ddd46493d2b5cc82b68d2d6c36abb994e8c782 flow-tools-0.68-r3.ebuild 2633 SHA256 42c1e8b4ba8c5bdb21f87a29e1bbf45a1176a0a993e942a74b4c34b41f36a031 flow-tools-0.68-r3.ebuild 2633 -MISC ChangeLog 5660 RMD160 f54ac82204fbb4f2724f452ba2e1c9aacc749827 SHA1 80d9938e4459888e7f4637cf5935ad4995cecc0c SHA256 28b5fa40fc65d3e3307a00b8aace2d58566727ce344ec7d5c0221fb4c84b8dc5 -MD5 c7d2395f5493b195713314eaa05089b3 ChangeLog 5660 -RMD160 f54ac82204fbb4f2724f452ba2e1c9aacc749827 ChangeLog 5660 -SHA256 28b5fa40fc65d3e3307a00b8aace2d58566727ce344ec7d5c0221fb4c84b8dc5 ChangeLog 5660 +EBUILD flow-tools-0.68-r4.ebuild 2635 RMD160 745bf0231bf79bbe0a749567eefa0a437c40c8ec SHA1 8f64d276f656f0c700f9e07f412a90f62573446a SHA256 6e6d104e14a3157dac989ffc5d8e70618429e5121603e1f5bc6482681a732e3d +MD5 6723ca766756cc17621ca678eb2b4131 flow-tools-0.68-r4.ebuild 2635 +RMD160 745bf0231bf79bbe0a749567eefa0a437c40c8ec flow-tools-0.68-r4.ebuild 2635 +SHA256 6e6d104e14a3157dac989ffc5d8e70618429e5121603e1f5bc6482681a732e3d flow-tools-0.68-r4.ebuild 2635 +MISC ChangeLog 5882 RMD160 c4f70ea4ef8f3622eae0b06f9c37c59d377e135c SHA1 87d5ce748dfba690acd2fc5a340b0f9e36d1a746 SHA256 96b56f687b300c61f7b60fc09bfb638656af4f34b8f748923d8cc2ed88aa4eab +MD5 7f585fa357cbdd212c3e088dcb44634a ChangeLog 5882 +RMD160 c4f70ea4ef8f3622eae0b06f9c37c59d377e135c ChangeLog 5882 +SHA256 96b56f687b300c61f7b60fc09bfb638656af4f34b8f748923d8cc2ed88aa4eab ChangeLog 5882 MISC metadata.xml 706 RMD160 48d179b230fd01a49853e73fc46f534373bb8488 SHA1 44ba0dd063806d48e8d6aa341c0bc28ea2d932b3 SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf MD5 eaeb632d289698ba9b0c30e0a014a5dd metadata.xml 706 RMD160 48d179b230fd01a49853e73fc46f534373bb8488 metadata.xml 706 @@ -46,3 +50,6 @@ SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf metadata MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68-r3 247 RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68-r3 247 SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68-r3 247 +MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68-r4 247 +RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68-r4 247 +SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68-r4 247 diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4 new file mode 100644 index 000000000000..3db6eb93276d --- /dev/null +++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r4 @@ -0,0 +1,3 @@ +MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151 +RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 flow-tools-0.68.tar.gz 987151 +SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df flow-tools-0.68.tar.gz 987151 diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd index 6d0c113b76d4..924331fe5b6a 100755 --- a/net-analyzer/flow-tools/files/flowcapture.initd +++ b/net-analyzer/flow-tools/files/flowcapture.initd @@ -8,13 +8,15 @@ depend() { start() { ebegin "Starting flow-capture" - start-stop-daemon --start --quiet -c ${USER} --exec /usr/bin/flow-capture \ + start-stop-daemon --start -c ${USER} --exec /usr/bin/flow-capture \ + --pidfile ${PIDFILE}.${PORT} \ -- ${FLOW_OPTS} >/dev/null 2>&1 eend $? } stop() { ebegin "Stopping flow-capture" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE}.${PORT} + start-stop-daemon --stop --quiet --exec /usr/bin/flow-capture \ + --pidfile ${PIDFILE}.${PORT} eend $? } diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild new file mode 100644 index 000000000000..5e5d0f589d44 --- /dev/null +++ b/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r4.ebuild,v 1.1 2007/04/09 16:17:07 pva Exp $ + +WANT_AUTOMAKE="1.6" +WANT_AUTOCONF="latest" +inherit eutils flag-o-matic autotools + +DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data" +HOMEPAGE="http://www.splintered.net/sw/flow-tools/" +SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +IUSE="mysql postgres debug ssl" + +RDEPEND="sys-apps/tcp-wrappers + sys-libs/zlib + sys-devel/flex + !postgres? ( mysql? ( virtual/mysql ) ) + !mysql? ( postgres? ( dev-db/postgresql ) ) + ssl? ( dev-libs/openssl )" + +DEPEND="${RDEPEND} + sys-devel/bison" + +pkg_setup() { + if use mysql && use postgres ; then + echo + eerror "The mysql and postgres USE flags are mutually exclusive." + eerror "Please choose either USE=mysql or USE=postgres, but not both." + die + fi + + enewgroup flows + enewuser flows -1 -1 /var/lib/flows flows +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-fix-configure.diff + epatch "${FILESDIR}"/${P}-fix-a-zillion-warnings-updated.diff + use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch + epatch "${FILESDIR}"/${PN}-0.67-memleak.patch + + sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \ + configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed" + + # bug 122842, we have /usr/bin/python and not /usr/local/bin/python + sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" \ + "${S}"/bin/flow-{rptfmt,rpt2rrd,log2rrd} +} + +src_compile() { + AM_OPTS="-f -i" + eautoreconf || die "autoreconf failed" + + use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql" + use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres" + + econf \ + --localstatedir=/etc/flow-tools \ + --enable-lfs \ + $(use_with ssl openssl) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + || die "econf failed" + + emake CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog README SECURITY TODO + + keepdir /var/lib/flows + keepdir /var/lib/flows/bin + exeinto /var/lib/flows/bin + doexe "${FILESDIR}"/linkme + keepdir /var/run/flows + + newinitd "${FILESDIR}/flowcapture.initd" flowcapture + newconfd "${FILESDIR}/flowcapture.confd" flowcapture + +} + +pkg_postinst() { + chown flows:flows /var/run/flows + chown flows:flows /var/lib/flows + chown flows:flows /var/lib/flows/bin + chmod 0755 /var/run/flows + chmod 0755 /var/lib/flows + chmod 0755 /var/lib/flows/bin +}