| 1 |
jokey 07/12/05 22:28:27 |
| 2 |
|
| 3 |
Modified: barnyard-0.2.0-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix some autotools mess, quotes, bugs 199118 and bug 199119, thanks to jakub for providing the patch |
| 6 |
(Portage version: 2.1.4_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: barnyard-0.2.0-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- barnyard-0.2.0-r2.ebuild 1 May 2007 17:40:17 -0000 1.5 |
| 22 |
+++ barnyard-0.2.0-r2.ebuild 5 Dec 2007 22:28:27 -0000 1.6 |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild,v 1.5 2007/05/01 17:40:17 genone Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r2.ebuild,v 1.6 2007/12/05 22:28:27 jokey Exp $ |
| 28 |
|
| 29 |
-inherit eutils |
| 30 |
+WANT_AUTOMAKE="1.4" |
| 31 |
+inherit eutils autotools |
| 32 |
|
| 33 |
DESCRIPTION="Fast output system for Snort" |
| 34 |
HOMEPAGE="http://www.snort.org/dl/barnyard/" |
| 35 |
@@ -14,10 +15,10 @@ |
| 36 |
KEYWORDS="~x86 -sparc" |
| 37 |
IUSE="mysql postgres sguil" |
| 38 |
|
| 39 |
-DEPEND="virtual/libc |
| 40 |
- net-libs/libpcap |
| 41 |
+DEPEND="net-libs/libpcap |
| 42 |
postgres? ( >=dev-db/postgresql-7.2 ) |
| 43 |
- mysql? ( virtual/mysql )" |
| 44 |
+ mysql? ( virtual/mysql ) |
| 45 |
+ sguil? ( dev-lang/tcl )" |
| 46 |
|
| 47 |
RDEPEND="${DEPEND} |
| 48 |
net-analyzer/snort" |
| 49 |
@@ -25,7 +26,8 @@ |
| 50 |
S="${WORKDIR}/${P/_/-}" |
| 51 |
|
| 52 |
src_unpack() { |
| 53 |
- unpack ${A} && cd "${S}" |
| 54 |
+ unpack ${A} |
| 55 |
+ cd "${S}" |
| 56 |
|
| 57 |
if use sguil ; then |
| 58 |
epatch "${WORKDIR}/${PV}-sguil_files.patch" |
| 59 |
@@ -33,9 +35,7 @@ |
| 60 |
cd "${S}/src/output-plugins" |
| 61 |
epatch "${WORKDIR}/${PV}-op_plugbase.c.patch" |
| 62 |
cd "${S}" |
| 63 |
- ebegin "Recreating configure" |
| 64 |
- aclocal && autoheader && automake --add-missing --copy \ |
| 65 |
- && autoconf || die "recreate configure failed" |
| 66 |
+ eautoreconf |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
@@ -49,13 +49,13 @@ |
| 71 |
${myconf} \ |
| 72 |
--sysconfdir=/etc/snort \ |
| 73 |
$(use_enable postgres) \ |
| 74 |
- $(use_enable mysql)|| die "bad ./configure" |
| 75 |
+ $(use_enable mysql) |
| 76 |
emake || die "compile problem" |
| 77 |
} |
| 78 |
|
| 79 |
src_install () { |
| 80 |
|
| 81 |
- make DESTDIR=${D} install || die |
| 82 |
+ make DESTDIR="${D}" install || die |
| 83 |
|
| 84 |
dodoc docs/* |
| 85 |
dodoc AUTHORS README |
| 86 |
@@ -73,14 +73,14 @@ |
| 87 |
"${D}/etc/snort/barnyard.conf" || die "sed failed" |
| 88 |
fi |
| 89 |
|
| 90 |
- newconfd ${FILESDIR}/barnyard.confd barnyard |
| 91 |
+ newconfd "${FILESDIR}"/barnyard.confd barnyard |
| 92 |
if use sguil ; then |
| 93 |
sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \ |
| 94 |
-e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \ |
| 95 |
"${D}/etc/conf.d/barnyard" || die "sed failed" |
| 96 |
fi |
| 97 |
|
| 98 |
- newinitd ${FILESDIR}/barnyard.rc6 barnyard |
| 99 |
+ newinitd "${FILESDIR}"/barnyard.rc6 barnyard |
| 100 |
if use sguil ; then |
| 101 |
sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \ |
| 102 |
"${D}/etc/init.d/barnyard" || die "sed failed" |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
1.18 net-analyzer/barnyard/ChangeLog |
| 107 |
|
| 108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/ChangeLog?rev=1.18&view=markup |
| 109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/ChangeLog?rev=1.18&content-type=text/plain |
| 110 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/barnyard/ChangeLog?r1=1.17&r2=1.18 |
| 111 |
|
| 112 |
Index: ChangeLog |
| 113 |
=================================================================== |
| 114 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v |
| 115 |
retrieving revision 1.17 |
| 116 |
retrieving revision 1.18 |
| 117 |
diff -u -r1.17 -r1.18 |
| 118 |
--- ChangeLog 1 May 2007 17:40:17 -0000 1.17 |
| 119 |
+++ ChangeLog 5 Dec 2007 22:28:27 -0000 1.18 |
| 120 |
@@ -1,6 +1,10 @@ |
| 121 |
# ChangeLog for net-analyzer/barnyard |
| 122 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 123 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.17 2007/05/01 17:40:17 genone Exp $ |
| 124 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.18 2007/12/05 22:28:27 jokey Exp $ |
| 125 |
+ |
| 126 |
+ 05 Dec 2007; Markus Ullmann <jokey@g.o> barnyard-0.2.0-r2.ebuild: |
| 127 |
+ Fix some autotools mess, quotes, bugs 199118 and bug 199119, thanks to jakub |
| 128 |
+ for providing the patch |
| 129 |
|
| 130 |
01 May 2007; Marius Mauch <genone@g.o> barnyard-0.2.0-r1.ebuild, |
| 131 |
barnyard-0.2.0-r2.ebuild: |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
-- |
| 136 |
gentoo-commits@g.o mailing list |
Archives