1 |
commit: 40a3d84efa6d05b3bba0e7ec8109afc41de46719 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 8 14:25:20 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 8 14:25:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a3d84e |
7 |
|
8 |
net-analyzer/barnyard2: Revbump to fix dependencies |
9 |
|
10 |
Non-maintainer commit |
11 |
|
12 |
Closes: https://bugs.gentoo.org/665936 |
13 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
14 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
15 |
|
16 |
net-analyzer/barnyard2/Manifest | 3 +- |
17 |
...yard2-1.9-r1.ebuild => barnyard2-1.9-r2.ebuild} | 12 ++-- |
18 |
net-analyzer/barnyard2/barnyard2-1.9.ebuild | 66 ---------------------- |
19 |
3 files changed, 5 insertions(+), 76 deletions(-) |
20 |
|
21 |
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest |
22 |
index d7670b3accd..90318b00cc3 100644 |
23 |
--- a/net-analyzer/barnyard2/Manifest |
24 |
+++ b/net-analyzer/barnyard2/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST barnyard2-1.9-r1.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 |
27 |
-DIST barnyard2-1.9.tar.gz 652879 BLAKE2B 958c926b26ff81c2baaf6993c1eafb10b48d1dc570b885f20f5893d64a56176f39ed5a872fb326d24b699406a0e60bbd1347df56612b5b85148505c72f6544ed SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a |
28 |
+DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 |
29 |
|
30 |
diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild |
31 |
similarity index 89% |
32 |
rename from net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild |
33 |
rename to net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild |
34 |
index 8bd23af3078..e936e8d53c1 100644 |
35 |
--- a/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild |
36 |
+++ b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild |
37 |
@@ -1,4 +1,4 @@ |
38 |
-# Copyright 1999-2018 Gentoo Foundation |
39 |
+# Copyright 1999-2019 Gentoo Authors |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
|
42 |
EAPI=7 |
43 |
@@ -7,7 +7,7 @@ inherit autotools |
44 |
|
45 |
DESCRIPTION="Parser for Snort unified/unified2 files" |
46 |
HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects" |
47 |
-SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${PF}.tar.gz" |
48 |
+SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz" |
49 |
|
50 |
SLOT="0" |
51 |
LICENSE="GPL-2" |
52 |
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" |
53 |
IUSE="debug gre mpls mysql odbc postgres static" |
54 |
|
55 |
DEPEND="net-libs/libpcap |
56 |
- mysql? ( virtual/mysql ) |
57 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
58 |
odbc? ( dev-db/unixODBC ) |
59 |
postgres? ( dev-db/postgresql:*[server] )" |
60 |
RDEPEND="${DEPEND}" |
61 |
@@ -58,11 +58,7 @@ src_install () { |
62 |
newconfd "${FILESDIR}/barnyard2.confd" barnyard2 |
63 |
newinitd "${FILESDIR}/barnyard2.initd" barnyard2 |
64 |
|
65 |
- dodir /etc/barnyard2 \ |
66 |
- /var/log/snort \ |
67 |
- /var/log/snort/archive \ |
68 |
- /var/log/barnyard2 |
69 |
- |
70 |
+ dodir /etc/barnyard2 |
71 |
keepdir /var/log/barnyard2 |
72 |
keepdir /var/log/snort/archive |
73 |
|
74 |
|
75 |
diff --git a/net-analyzer/barnyard2/barnyard2-1.9.ebuild b/net-analyzer/barnyard2/barnyard2-1.9.ebuild |
76 |
deleted file mode 100644 |
77 |
index e09f129def0..00000000000 |
78 |
--- a/net-analyzer/barnyard2/barnyard2-1.9.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,66 +0,0 @@ |
81 |
-# Copyright 1999-2014 Gentoo Foundation |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
- |
84 |
-EAPI="2" |
85 |
- |
86 |
-DESCRIPTION="Parser for Snort unified/unified2 files" |
87 |
-HOMEPAGE="http://www.securixlive.com/barnyard2/" |
88 |
-SRC_URI="http://www.securixlive.com/download/barnyard2/${P}.tar.gz" |
89 |
-SLOT="0" |
90 |
-LICENSE="GPL-2" |
91 |
-KEYWORDS="~amd64 ~x86" |
92 |
-IUSE="static debug gre mpls mysql odbc postgres" |
93 |
- |
94 |
-DEPEND="net-libs/libpcap |
95 |
- mysql? ( virtual/mysql ) |
96 |
- postgres? ( dev-db/postgresql[server] ) |
97 |
- odbc? ( dev-db/unixODBC )" |
98 |
-RDEPEND="${DEPEND}" |
99 |
- |
100 |
-src_prepare() { |
101 |
- sed -i -e "s:^#config interface:config interface:" \ |
102 |
- "${WORKDIR}/${P}/etc/barnyard2.conf" || die |
103 |
- sed -i -e "s:^output alert_fast:#output alert_fast:" \ |
104 |
- "${WORKDIR}/${P}/etc/barnyard2.conf" || die |
105 |
-} |
106 |
- |
107 |
-src_configure() { |
108 |
- econf \ |
109 |
- $(use_enable !static shared) \ |
110 |
- $(use_enable static) \ |
111 |
- $(use_enable debug) \ |
112 |
- $(use_enable gre) \ |
113 |
- $(use_enable mpls) \ |
114 |
- $(use_with mysql) \ |
115 |
- $(use_with odbc) \ |
116 |
- $(use_with postgres postgresql) \ |
117 |
- --disable-ipv6 \ |
118 |
- --disable-prelude \ |
119 |
- --disable-mysql-ssl-support \ |
120 |
- --disable-aruba \ |
121 |
- --without-tcl \ |
122 |
- --without-oracle || die |
123 |
- |
124 |
- emake || die |
125 |
-} |
126 |
- |
127 |
-src_install () { |
128 |
- make DESTDIR="${D}" install || die |
129 |
- newconfd "${FILESDIR}/barnyard2.confd" barnyard2 || die |
130 |
- newinitd "${FILESDIR}/barnyard2.initd" barnyard2 || die |
131 |
- dodir /etc/barnyard2 \ |
132 |
- /var/log/snort \ |
133 |
- /var/log/snort/archive \ |
134 |
- /var/log/barnyard2 || die |
135 |
- dodoc RELEASE.NOTES \ |
136 |
- etc/barnyard2.conf \ |
137 |
- doc/README* \ |
138 |
- schemas/create_* || die |
139 |
- rm "${D}"/etc/barnyard2.conf || die |
140 |
-} |
141 |
- |
142 |
-pkg_postinst() { |
143 |
- elog "Configuration options can be set in /etc/conf.d/barnyard2." |
144 |
- elog |
145 |
- elog "An example configuration file can be found in /usr/share/doc/${PF}." |
146 |
-} |