| 1 |
jer 13/02/26 15:41:31 |
| 2 |
|
| 3 |
Modified: ChangeLog flow-tools-0.68.5.1-r2.ebuild |
| 4 |
Log: |
| 5 |
Fix default pidfile path. Replace chown withth fowners and chmod with fperms, replace /var/run with /run (bug #458944 by Reuben Farrelly). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.66 net-analyzer/flow-tools/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.66&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?rev=1.66&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/ChangeLog?r1=1.65&r2=1.66 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v |
| 19 |
retrieving revision 1.65 |
| 20 |
retrieving revision 1.66 |
| 21 |
diff -u -r1.65 -r1.66 |
| 22 |
--- ChangeLog 26 Feb 2013 15:23:03 -0000 1.65 |
| 23 |
+++ ChangeLog 26 Feb 2013 15:41:31 -0000 1.66 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-analyzer/flow-tools |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.65 2013/02/26 15:23:03 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.66 2013/02/26 15:41:31 jer Exp $ |
| 29 |
+ |
| 30 |
+ 26 Feb 2013; Jeroen Roovers <jer@g.o> flow-tools-0.68.5.1-r2.ebuild: |
| 31 |
+ Fix default pidfile path. Replace chown withth fowners and chmod with fperms, |
| 32 |
+ replace /var/run with /run (bug #458944 by Reuben Farrelly). |
| 33 |
|
| 34 |
26 Feb 2013; Jeroen Roovers <jer@g.o> -flow-tools-0.68.5.1-r1.ebuild, |
| 35 |
files/flowcapture.initd: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild |
| 40 |
|
| 41 |
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 |
| 42 |
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 |
| 43 |
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 |
| 44 |
|
| 45 |
Index: flow-tools-0.68.5.1-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- flow-tools-0.68.5.1-r2.ebuild 31 Jan 2013 23:11:03 -0000 1.4 |
| 52 |
+++ flow-tools-0.68.5.1-r2.ebuild 26 Feb 2013 15:41:31 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
inherit user |
| 61 |
@@ -31,6 +31,14 @@ |
| 62 |
enewuser flows -1 -1 /var/lib/flows flows |
| 63 |
} |
| 64 |
|
| 65 |
+src_prepare() { |
| 66 |
+ sed -i \ |
| 67 |
+ -e 's|/var/run/|/run/|g' \ |
| 68 |
+ src/flow-capture.c \ |
| 69 |
+ src/flow-fanout.c \ |
| 70 |
+ || die |
| 71 |
+} |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
local myconf="--sysconfdir=/etc/flow-tools" |
| 75 |
use mysql && myconf="${myconf} --with-mysql" |
| 76 |
@@ -46,9 +54,10 @@ |
| 77 |
src_install() { |
| 78 |
default |
| 79 |
|
| 80 |
+ exeinto /var/lib/flows/bin |
| 81 |
+ keepdir /run/flows |
| 82 |
keepdir /var/lib/flows |
| 83 |
keepdir /var/lib/flows/bin |
| 84 |
- exeinto /var/lib/flows/bin |
| 85 |
doexe "${FILESDIR}"/linkme |
| 86 |
|
| 87 |
newinitd "${FILESDIR}/flowcapture.initd" flowcapture |
| 88 |
@@ -57,13 +66,11 @@ |
| 89 |
if ! use static-libs; then |
| 90 |
rm -f "${D}"/usr/lib*/libft.la || die |
| 91 |
fi |
| 92 |
-} |
| 93 |
|
| 94 |
-pkg_postinst() { |
| 95 |
- chown flows:flows /var/run/flows |
| 96 |
- chown flows:flows /var/lib/flows |
| 97 |
- chown flows:flows /var/lib/flows/bin |
| 98 |
- chmod 0755 /var/run/flows |
| 99 |
- chmod 0755 /var/lib/flows |
| 100 |
- chmod 0755 /var/lib/flows/bin |
| 101 |
+ fowners flows:flows /run/flows |
| 102 |
+ fowners flows:flows /var/lib/flows |
| 103 |
+ fowners flows:flows /var/lib/flows/bin |
| 104 |
+ fperms 0755 /run/flows |
| 105 |
+ fperms 0755 /var/lib/flows |
| 106 |
+ fperms 0755 /var/lib/flows/bin |
| 107 |
} |
Archives