1 |
commit: 969460a23eeef40572773018e5ce0a3e8fd0b11a |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 23 22:37:44 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 30 03:39:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969460a2 |
7 |
|
8 |
app-admin/syslog-ng: bump to 3.22.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/690490 |
11 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/12526 |
13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
14 |
|
15 |
app-admin/syslog-ng/Manifest | 1 + |
16 |
app-admin/syslog-ng/metadata.xml | 1 + |
17 |
app-admin/syslog-ng/syslog-ng-3.22.1.ebuild | 171 ++++++++++++++++++++++++++++ |
18 |
profiles/arch/alpha/package.use.mask | 2 +- |
19 |
profiles/arch/ia64/package.use.mask | 4 + |
20 |
profiles/arch/powerpc/package.use.mask | 2 +- |
21 |
profiles/arch/riscv/package.use.mask | 2 +- |
22 |
7 files changed, 180 insertions(+), 3 deletions(-) |
23 |
|
24 |
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest |
25 |
index 100217bea8a..1204093c860 100644 |
26 |
--- a/app-admin/syslog-ng/Manifest |
27 |
+++ b/app-admin/syslog-ng/Manifest |
28 |
@@ -3,4 +3,5 @@ DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3a |
29 |
DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48 |
30 |
DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57 |
31 |
DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c |
32 |
+DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f |
33 |
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b |
34 |
|
35 |
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml |
36 |
index fbeea5ea70d..4f02d274612 100644 |
37 |
--- a/app-admin/syslog-ng/metadata.xml |
38 |
+++ b/app-admin/syslog-ng/metadata.xml |
39 |
@@ -14,6 +14,7 @@ |
40 |
<flag name="geoip2">Add support for geo lookup based on IPs via <pkg>dev-libs/libmaxminddb</pkg></flag> |
41 |
<flag name="http">Enable support for HTTP destinations</flag> |
42 |
<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag> |
43 |
+ <flag name="kafka">Enable support for Kafka destinations</flag> |
44 |
<flag name="mongodb">Enable support for mongodb destinations</flag> |
45 |
<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag> |
46 |
<flag name="redis">Enable support for Redis destinations</flag> |
47 |
|
48 |
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild |
49 |
new file mode 100644 |
50 |
index 00000000000..7d9070a2279 |
51 |
--- /dev/null |
52 |
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild |
53 |
@@ -0,0 +1,171 @@ |
54 |
+# Copyright 1999-2019 Gentoo Authors |
55 |
+# Distributed under the terms of the GNU General Public License v2 |
56 |
+ |
57 |
+EAPI=7 |
58 |
+ |
59 |
+PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
60 |
+inherit autotools python-single-r1 systemd |
61 |
+ |
62 |
+MY_PV_MM=$(ver_cut 1-2) |
63 |
+DESCRIPTION="syslog replacement with advanced filtering features" |
64 |
+HOMEPAGE="https://syslog-ng.com/open-source-log-management" |
65 |
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" |
66 |
+ |
67 |
+LICENSE="GPL-2+ LGPL-2.1+" |
68 |
+SLOT="0" |
69 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
70 |
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd" |
71 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
72 |
+# unit tests require https://github.com/Snaipe/Criterion with additional deps |
73 |
+RESTRICT="test" |
74 |
+ |
75 |
+RDEPEND=" |
76 |
+ >=dev-libs/glib-2.10.1:2 |
77 |
+ >=dev-libs/ivykis-0.42.4 |
78 |
+ >=dev-libs/libpcre-6.1:= |
79 |
+ !dev-libs/eventlog |
80 |
+ amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) |
81 |
+ caps? ( sys-libs/libcap ) |
82 |
+ dbi? ( >=dev-db/libdbi-0.9.0 ) |
83 |
+ geoip? ( >=dev-libs/geoip-1.5.0 ) |
84 |
+ geoip2? ( dev-libs/libmaxminddb:= ) |
85 |
+ http? ( net-misc/curl ) |
86 |
+ json? ( >=dev-libs/json-c-0.9:= ) |
87 |
+ kafka? ( >=dev-libs/librdkafka-1.0.0:= ) |
88 |
+ mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) |
89 |
+ python? ( ${PYTHON_DEPS} ) |
90 |
+ redis? ( >=dev-libs/hiredis-0.11.0:= ) |
91 |
+ smtp? ( net-libs/libesmtp ) |
92 |
+ snmp? ( net-analyzer/net-snmp ) |
93 |
+ spoof-source? ( net-libs/libnet:1.1= ) |
94 |
+ systemd? ( sys-apps/systemd:= ) |
95 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
96 |
+ !libressl? ( dev-libs/openssl:0= ) |
97 |
+ libressl? ( dev-libs/libressl:0= )" |
98 |
+DEPEND="${RDEPEND}" |
99 |
+BDEPEND=" |
100 |
+ sys-devel/flex |
101 |
+ virtual/pkgconfig" |
102 |
+ |
103 |
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} |
104 |
+ contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" |
105 |
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) |
106 |
+ |
107 |
+pkg_setup() { |
108 |
+ use python && python-single-r1_pkg_setup |
109 |
+} |
110 |
+ |
111 |
+src_prepare() { |
112 |
+ local f |
113 |
+ |
114 |
+ use python && python_fix_shebang . |
115 |
+ |
116 |
+ # remove bundled libs |
117 |
+ rm -r lib/ivykis || die |
118 |
+ |
119 |
+ # drop scl modules requiring json |
120 |
+ if use !json; then |
121 |
+ sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die |
122 |
+ fi |
123 |
+ |
124 |
+ # drop scl modules requiring http |
125 |
+ if use !http; then |
126 |
+ sed -i -r '/slack|telegram/d' scl/Makefile.am || die |
127 |
+ fi |
128 |
+ |
129 |
+ # use gentoo default path |
130 |
+ if use systemd; then |
131 |
+ sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ |
132 |
+ -i contrib/systemd/syslog-ng@default || die |
133 |
+ fi |
134 |
+ |
135 |
+ for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do |
136 |
+ sed \ |
137 |
+ -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ |
138 |
+ "/etc/init.d/syslog-ng reload")#g" \ |
139 |
+ "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die |
140 |
+ done |
141 |
+ |
142 |
+ for f in syslog-ng.conf.gentoo.hardened.in \ |
143 |
+ syslog-ng.conf.gentoo.in; do |
144 |
+ sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die |
145 |
+ done |
146 |
+ |
147 |
+ default |
148 |
+ eautoreconf |
149 |
+} |
150 |
+ |
151 |
+src_configure() { |
152 |
+ local myconf=( |
153 |
+ --disable-docs |
154 |
+ --disable-java |
155 |
+ --disable-java-modules |
156 |
+ --disable-riemann |
157 |
+ --enable-manpages |
158 |
+ --localstatedir=/var/lib/syslog-ng |
159 |
+ --sysconfdir=/etc/syslog-ng |
160 |
+ --with-embedded-crypto |
161 |
+ --with-ivykis=system |
162 |
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng |
163 |
+ --with-pidfile-dir=/var/run |
164 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
165 |
+ $(use_enable amqp) |
166 |
+ $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) |
167 |
+ $(use_enable caps linux-caps) |
168 |
+ $(use_enable dbi sql) |
169 |
+ $(use_enable geoip) |
170 |
+ $(use_enable geoip2) |
171 |
+ $(use_enable http) |
172 |
+ $(use_enable ipv6) |
173 |
+ $(use_enable json) |
174 |
+ $(use_enable kafka) |
175 |
+ $(use_enable mongodb) |
176 |
+ $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") |
177 |
+ $(use_enable pacct) |
178 |
+ $(use_enable python) |
179 |
+ $(use_enable redis) |
180 |
+ $(use_enable smtp) |
181 |
+ $(use_enable snmp snmp-dest) |
182 |
+ $(use_enable spoof-source) |
183 |
+ $(use_enable systemd) |
184 |
+ $(use_enable tcpd tcp-wrapper) |
185 |
+ ) |
186 |
+ |
187 |
+ econf "${myconf[@]}" |
188 |
+} |
189 |
+ |
190 |
+src_install() { |
191 |
+ default |
192 |
+ |
193 |
+ # Install default configuration |
194 |
+ insinto /etc/default |
195 |
+ doins contrib/systemd/syslog-ng@default |
196 |
+ |
197 |
+ insinto /etc/syslog-ng |
198 |
+ newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf |
199 |
+ |
200 |
+ insinto /etc/logrotate.d |
201 |
+ newins "${T}/syslog-ng.logrotate" syslog-ng |
202 |
+ |
203 |
+ newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng |
204 |
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng |
205 |
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng |
206 |
+ find "${D}" -name '*.la' -delete || die |
207 |
+ |
208 |
+ use python && python_optimize |
209 |
+} |
210 |
+ |
211 |
+pkg_postinst() { |
212 |
+ # bug #355257 |
213 |
+ if ! has_version app-admin/logrotate ; then |
214 |
+ elog "It is highly recommended that app-admin/logrotate be emerged to" |
215 |
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" |
216 |
+ elog "for logrotate to use." |
217 |
+ fi |
218 |
+ |
219 |
+ if use systemd; then |
220 |
+ ewarn "The service file for systemd has changed to support multiple instances." |
221 |
+ ewarn "To start the default instance issue:" |
222 |
+ ewarn "# systemctl start syslog-ng@default" |
223 |
+ fi |
224 |
+} |
225 |
|
226 |
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask |
227 |
index 11617b3a8d3..8b897f03168 100644 |
228 |
--- a/profiles/arch/alpha/package.use.mask |
229 |
+++ b/profiles/arch/alpha/package.use.mask |
230 |
@@ -38,7 +38,7 @@ app-arch/rpm test |
231 |
|
232 |
# Tomáš Mózes <hydrapolic@×××××.com> (2018-06-05) |
233 |
# Unkeyworded dependencies. |
234 |
-app-admin/syslog-ng amqp mongodb |
235 |
+app-admin/syslog-ng amqp kafka mongodb |
236 |
|
237 |
# Thomas Deutschmann <whissi@g.o> (2018-06-02) |
238 |
# Needs dev-ruby/asciidoctor which has a lot of unstable deps |
239 |
|
240 |
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask |
241 |
index 06ebc962950..5ffa6e49088 100644 |
242 |
--- a/profiles/arch/ia64/package.use.mask |
243 |
+++ b/profiles/arch/ia64/package.use.mask |
244 |
@@ -1,6 +1,10 @@ |
245 |
# Copyright 1999-2019 Gentoo Authors |
246 |
# Distributed under the terms of the GNU General Public License v2 |
247 |
|
248 |
+# Tomáš Mózes <hydrapolic@×××××.com> (2019-07-24) |
249 |
+# Unkeyworded dependency |
250 |
+app-admin/syslog-ng kafka |
251 |
+ |
252 |
# Sergei Trofimovich <slyfox@g.o> (2019-05-21) |
253 |
# No ia64 arch support for jit. Version 17 USE=debug |
254 |
# required USE=jit. |
255 |
|
256 |
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask |
257 |
index eebe25bd660..114942fd599 100644 |
258 |
--- a/profiles/arch/powerpc/package.use.mask |
259 |
+++ b/profiles/arch/powerpc/package.use.mask |
260 |
@@ -46,7 +46,7 @@ sys-devel/llvm gold |
261 |
|
262 |
# Tomáš Mózes <hydrapolic@×××××.com> (2018-06-05) |
263 |
# Unkeyworded dependencies. |
264 |
-app-admin/syslog-ng mongodb |
265 |
+app-admin/syslog-ng kafka mongodb |
266 |
|
267 |
# Anthony G. Basile <blueness@g.o> (2018-04-14) |
268 |
# net-vpn/tor, tests are broken on ppc/ppc64, bug #653098 |
269 |
|
270 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
271 |
index 5102c58f529..6106b8006f2 100644 |
272 |
--- a/profiles/arch/riscv/package.use.mask |
273 |
+++ b/profiles/arch/riscv/package.use.mask |
274 |
@@ -14,7 +14,7 @@ dev-vcs/git pcre-jit |
275 |
# This includes also packages which do not support python-3 or |
276 |
# do not support python-3.7 yet. |
277 |
|
278 |
-app-admin/syslog-ng amqp dbi geoip geoip2 json mongodb python redis spoof-source smtp |
279 |
+app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp |
280 |
app-admin/sysstat lm_sensors |
281 |
app-arch/unzip natspec |
282 |
app-crypt/gnupg smartcard tofu wks-server |