public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/flow-tools: ChangeLog flow-tools-0.68.5.1-r2.ebuild
@ 2012-12-26  3:30 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2012-12-26  3:30 UTC (permalink / raw
  To: gentoo-commits

jer         12/12/26 03:30:02

  Modified:             ChangeLog
  Added:                flow-tools-0.68.5.1-r2.ebuild
  Log:
  Remove keepdir /var/run/* (bug #332633).
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.61                 net-analyzer/flow-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	21 Nov 2012 04:08:34 -0000	1.60
+++ ChangeLog	26 Dec 2012 03:30:02 -0000	1.61
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/flow-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.60 2012/11/21 04:08:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.61 2012/12/26 03:30:02 jer Exp $
+
+*flow-tools-0.68.5.1-r2 (26 Dec 2012)
+
+  26 Dec 2012; Jeroen Roovers <jer@gentoo.org> +flow-tools-0.68.5.1-r2.ebuild,
+  files/flowcapture.confd:
+  Remove keepdir /var/run/* (bug #332633).
 
   21 Nov 2012; Jeroen Roovers <jer@gentoo.org> flow-tools-0.68.5.1-r1.ebuild,
   files/flowcapture.confd:



1.1                  net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: flow-tools-0.68.5.1-r2.ebuild
===================================================================
# Copyright 1999-2012 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.5.1-r2.ebuild,v 1.1 2012/12/26 03:30:02 jer Exp $

EAPI=4
inherit user

DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data"
HOMEPAGE="http://code.google.com/p/flow-tools/"
SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"

LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug mysql postgres ssl static-libs"

RDEPEND="sys-apps/tcp-wrappers
	sys-libs/zlib
	mysql? ( virtual/mysql )
	postgres? ( dev-db/postgresql-base )
	ssl? ( dev-libs/openssl )"

DEPEND="${RDEPEND}
	sys-devel/flex
	sys-devel/bison"

DOCS=( ChangeLog README SECURITY TODO )

pkg_setup() {
	enewgroup flows
	enewuser flows -1 -1 /var/lib/flows flows
}

src_configure() {
	local myconf="--sysconfdir=/etc/flow-tools"
	use mysql && myconf="${myconf} --with-mysql"
	if use postgres; then
		myconf="${myconf} --with-postgresql=yes"
	else
		myconf="${myconf} --with-postgresql=no"
	fi
	use ssl && myconf="${myconf} --with-openssl"
	econf ${myconf} $(use_enable static-libs static)
}

src_install() {
	default

	keepdir /var/lib/flows
	keepdir /var/lib/flows/bin
	exeinto /var/lib/flows/bin
	doexe "${FILESDIR}"/linkme

	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
	newconfd "${FILESDIR}/flowcapture.confd" flowcapture

	if ! use static-libs; then
		rm -f "${D}"/usr/lib*/libft.la || die
	fi
}

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
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/flow-tools: ChangeLog flow-tools-0.68.5.1-r2.ebuild
@ 2013-02-26 15:41 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2013-02-26 15:41 UTC (permalink / raw
  To: gentoo-commits

jer         13/02/26 15:41:31

  Modified:             ChangeLog flow-tools-0.68.5.1-r2.ebuild
  Log:
  Fix default pidfile path. Replace chown withth fowners and chmod with fperms, replace /var/run with /run (bug #458944 by Reuben Farrelly).
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.66                 net-analyzer/flow-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?r1=1.65&r2=1.66

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	26 Feb 2013 15:23:03 -0000	1.65
+++ ChangeLog	26 Feb 2013 15:41:31 -0000	1.66
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/flow-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.65 2013/02/26 15:23:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.66 2013/02/26 15:41:31 jer Exp $
+
+  26 Feb 2013; Jeroen Roovers <jer@gentoo.org> flow-tools-0.68.5.1-r2.ebuild:
+  Fix default pidfile path. Replace chown withth fowners and chmod with fperms,
+  replace /var/run with /run (bug #458944 by Reuben Farrelly).
 
   26 Feb 2013; Jeroen Roovers <jer@gentoo.org> -flow-tools-0.68.5.1-r1.ebuild,
   files/flowcapture.initd:



1.5                  net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild?r1=1.4&r2=1.5

Index: flow-tools-0.68.5.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-tools-0.68.5.1-r2.ebuild	31 Jan 2013 23:11:03 -0000	1.4
+++ flow-tools-0.68.5.1-r2.ebuild	26 Feb 2013 15:41:31 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.5.1-r2.ebuild,v 1.4 2013/01/31 23:11:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild,v 1.5 2013/02/26 15:41:31 jer Exp $
 
 EAPI=4
 inherit user
@@ -31,6 +31,14 @@
 	enewuser flows -1 -1 /var/lib/flows flows
 }
 
+src_prepare() {
+	sed -i \
+		-e 's|/var/run/|/run/|g' \
+		src/flow-capture.c \
+		src/flow-fanout.c \
+		|| die
+}
+
 src_configure() {
 	local myconf="--sysconfdir=/etc/flow-tools"
 	use mysql && myconf="${myconf} --with-mysql"
@@ -46,9 +54,10 @@
 src_install() {
 	default
 
+	exeinto /var/lib/flows/bin
+	keepdir /run/flows
 	keepdir /var/lib/flows
 	keepdir /var/lib/flows/bin
-	exeinto /var/lib/flows/bin
 	doexe "${FILESDIR}"/linkme
 
 	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
@@ -57,13 +66,11 @@
 	if ! use static-libs; then
 		rm -f "${D}"/usr/lib*/libft.la || die
 	fi
-}
 
-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
+	fowners flows:flows /run/flows
+	fowners flows:flows /var/lib/flows
+	fowners flows:flows /var/lib/flows/bin
+	fperms 0755 /run/flows
+	fperms 0755 /var/lib/flows
+	fperms 0755 /var/lib/flows/bin
 }





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-02-26 15:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-26  3:30 [gentoo-commits] gentoo-x86 commit in net-analyzer/flow-tools: ChangeLog flow-tools-0.68.5.1-r2.ebuild Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2013-02-26 15:41 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox