Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: app-admin/syslog-ng/files/3.13/, app-admin/syslog-ng/files/3.14/, ...
Date: Sat, 29 Dec 2018 14:35:05
Message-Id: 1546094083.a1b152ff72f5f7921422a557012a1969a38ace2e.blueness@gentoo
1 commit: a1b152ff72f5f7921422a557012a1969a38ace2e
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 14:34:43 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 14:34:43 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a1b152ff
7
8 app-admin/syslog-ng: in tree version works
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 app-admin/syslog-ng/Manifest | 2 -
13 .../syslog-ng/files/3.13/syslog-ng.conf.gentoo | 36 -----
14 .../files/3.13/syslog-ng.conf.gentoo.fbsd | 24 ---
15 .../files/3.13/syslog-ng.conf.gentoo.hardened | 115 --------------
16 app-admin/syslog-ng/files/3.13/syslog-ng.confd | 42 -----
17 app-admin/syslog-ng/files/3.13/syslog-ng.rc | 58 -------
18 .../syslog-ng/files/3.14/syslog-ng.conf.gentoo | 36 -----
19 .../files/3.14/syslog-ng.conf.gentoo.fbsd | 24 ---
20 .../files/3.14/syslog-ng.conf.gentoo.hardened | 115 --------------
21 app-admin/syslog-ng/files/3.14/syslog-ng.confd | 43 -----
22 app-admin/syslog-ng/files/3.14/syslog-ng.rc | 59 -------
23 app-admin/syslog-ng/files/README.hardened | 13 --
24 .../patches/syslog-ng-3.12.1-json-c-0.13+.patch | 33 ----
25 .../syslog-ng-3.14.1-fix-automake-1.16-build.patch | 23 ---
26 .../patches/syslog-ng-3.14.1-fix-tls-client.patch | 173 ---------------------
27 app-admin/syslog-ng/files/syslog-ng.logrotate | 12 --
28 .../syslog-ng/files/syslog-ng.logrotate.hardened | 75 ---------
29 .../files/syslog-ng.logrotate.hardened.in | 75 ---------
30 app-admin/syslog-ng/files/syslog-ng.logrotate.in | 12 --
31 app-admin/syslog-ng/metadata.xml | 25 ---
32 app-admin/syslog-ng/syslog-ng-3.13.2.ebuild | 173 ---------------------
33 app-admin/syslog-ng/syslog-ng-3.14.1.ebuild | 170 --------------------
34 22 files changed, 1338 deletions(-)
35
36 diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
37 deleted file mode 100644
38 index 3a3bb12..0000000
39 --- a/app-admin/syslog-ng/Manifest
40 +++ /dev/null
41 @@ -1,2 +0,0 @@
42 -DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
43 -DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
44
45 diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
46 deleted file mode 100644
47 index ee8c76a..0000000
48 --- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
49 +++ /dev/null
50 @@ -1,36 +0,0 @@
51 -@version: 3.13
52 -#
53 -# Syslog-ng default configuration file for Gentoo Linux
54 -
55 -# https://bugs.gentoo.org/426814
56 -@include "scl.conf"
57 -
58 -options {
59 - threaded(yes);
60 - chain_hostnames(no);
61 -
62 - # The default action of syslog-ng is to log a STATS line
63 - # to the file every 10 minutes. That's pretty ugly after a while.
64 - # Change it to every 12 hours so you get a nice daily update of
65 - # how many messages syslog-ng missed (0).
66 - stats_freq(43200);
67 - # The default action of syslog-ng is to log a MARK line
68 - # to the file every 20 minutes. That's seems high for most
69 - # people so turn it down to once an hour. Set it to zero
70 - # if you don't want the functionality at all.
71 - mark_freq(3600);
72 -};
73 -
74 -source src { system(); internal(); };
75 -
76 -destination messages { file("/var/log/messages"); };
77 -
78 -# By default messages are logged to tty12...
79 -destination console_all { file("/dev/tty12"); };
80 -# ...if you intend to use /dev/console for programs like xconsole
81 -# you can comment out the destination line above that references /dev/tty12
82 -# and uncomment the line below.
83 -#destination console_all { file("/dev/console"); };
84 -
85 -log { source(src); destination(messages); };
86 -log { source(src); destination(console_all); };
87
88 diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
89 deleted file mode 100644
90 index e9122a8..0000000
91 --- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
92 +++ /dev/null
93 @@ -1,24 +0,0 @@
94 -@version: 3.13
95 -#
96 -# Syslog-ng default configuration file for Gentoo FreeBSD
97 -#
98 -
99 -# https://bugs.gentoo.org/426814
100 -@include "scl.conf"
101 -
102 -options {
103 - threaded(yes);
104 - chain_hostnames(no);
105 -
106 - # The default action of syslog-ng is to log a STATS line
107 - # to the file every 10 minutes. That's pretty ugly after a while.
108 - # Change it to every 12 hours so you get a nice daily update of
109 - # how many messages syslog-ng missed (0).
110 - stats_freq(43200);
111 -};
112 -
113 -source src { system(); internal(); };
114 -
115 -destination messages { file("/var/log/messages"); };
116 -
117 -log { source(src); destination(messages); };
118
119 diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
120 deleted file mode 100644
121 index db6e7f0..0000000
122 --- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
123 +++ /dev/null
124 @@ -1,115 +0,0 @@
125 -@version: 3.13
126 -# Copyright 1999-2017 Gentoo Foundation
127 -# Distributed under the terms of the GNU General Public License v2
128 -
129 -# https://bugs.gentoo.org/426814
130 -@include "scl.conf"
131 -
132 -#
133 -# Syslog-ng configuration file, compatible with default hardened installations.
134 -#
135 -
136 -options {
137 - threaded(yes);
138 - chain_hostnames(no);
139 - stats_freq(43200);
140 -};
141 -
142 -source src {
143 - system();
144 - internal();
145 -};
146 -
147 -source kernsrc {
148 - file("/proc/kmsg");
149 -};
150 -
151 -#source net { udp(); };
152 -#log { source(net); destination(net_logs); };
153 -#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
154 -
155 -destination authlog { file("/var/log/auth.log"); };
156 -destination _syslog { file("/var/log/syslog"); };
157 -destination cron { file("/var/log/cron.log"); };
158 -destination daemon { file("/var/log/daemon.log"); };
159 -destination kern { file("/var/log/kern.log"); };
160 -destination lpr { file("/var/log/lpr.log"); };
161 -destination user { file("/var/log/user.log"); };
162 -destination uucp { file("/var/log/uucp.log"); };
163 -#destination ppp { file("/var/log/ppp.log"); };
164 -destination mail { file("/var/log/mail.log"); };
165 -
166 -destination avc { file("/var/log/avc.log"); };
167 -destination audit { file("/var/log/audit.log"); };
168 -destination pax { file("/var/log/pax.log"); };
169 -destination grsec { file("/var/log/grsec.log"); };
170 -
171 -destination mailinfo { file("/var/log/mail.info"); };
172 -destination mailwarn { file("/var/log/mail.warn"); };
173 -destination mailerr { file("/var/log/mail.err"); };
174 -
175 -destination newscrit { file("/var/log/news/news.crit"); };
176 -destination newserr { file("/var/log/news/news.err"); };
177 -destination newsnotice { file("/var/log/news/news.notice"); };
178 -
179 -destination debug { file("/var/log/debug"); };
180 -destination messages { file("/var/log/messages"); };
181 -destination console { usertty("root"); };
182 -destination console_all { file("/dev/tty12"); };
183 -#destination loghost { udp("loghost" port(999)); };
184 -
185 -destination xconsole { pipe("/dev/xconsole"); };
186 -
187 -filter f_auth { facility(auth); };
188 -filter f_authpriv { facility(auth, authpriv); };
189 -filter f_syslog { not facility(authpriv, mail); };
190 -filter f_cron { facility(cron); };
191 -filter f_daemon { facility(daemon); };
192 -filter f_kern { facility(kern); };
193 -filter f_lpr { facility(lpr); };
194 -filter f_mail { facility(mail); };
195 -filter f_user { facility(user); };
196 -filter f_uucp { facility(uucp); };
197 -#filter f_ppp { facility(ppp); };
198 -filter f_news { facility(news); };
199 -filter f_debug { not facility(auth, authpriv, news, mail); };
200 -filter f_messages { level(info..warn)
201 - and not facility(auth, authpriv, mail, news); };
202 -filter f_emergency { level(emerg); };
203 -
204 -filter f_info { level(info); };
205 -
206 -filter f_notice { level(notice); };
207 -filter f_warn { level(warn); };
208 -filter f_crit { level(crit); };
209 -filter f_err { level(err); };
210 -
211 -filter f_avc { message(".*avc: .*"); };
212 -filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
213 -filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
214 -filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
215 -
216 -log { source(src); filter(f_authpriv); destination(authlog); };
217 -log { source(src); filter(f_syslog); destination(_syslog); };
218 -log { source(src); filter(f_cron); destination(cron); };
219 -log { source(src); filter(f_daemon); destination(daemon); };
220 -log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
221 -log { source(src); filter(f_lpr); destination(lpr); };
222 -log { source(src); filter(f_mail); destination(mail); };
223 -log { source(src); filter(f_user); destination(user); };
224 -log { source(src); filter(f_uucp); destination(uucp); };
225 -log { source(kernsrc); filter(f_pax); destination(pax); };
226 -log { source(kernsrc); filter(f_grsec); destination(grsec); };
227 -log { source(kernsrc); filter(f_audit); destination(audit); };
228 -log { source(kernsrc); filter(f_avc); destination(avc); };
229 -log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
230 -log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
231 -log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
232 -log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
233 -log { source(src); filter(f_news); filter(f_err); destination(newserr); };
234 -log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
235 -log { source(src); filter(f_debug); destination(debug); };
236 -log { source(src); filter(f_messages); destination(messages); };
237 -log { source(src); filter(f_emergency); destination(console); };
238 -#log { source(src); filter(f_ppp); destination(ppp); };
239 -log { source(src); destination(console_all); };
240
241 diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.confd b/app-admin/syslog-ng/files/3.13/syslog-ng.confd
242 deleted file mode 100644
243 index 42fa26a..0000000
244 --- a/app-admin/syslog-ng/files/3.13/syslog-ng.confd
245 +++ /dev/null
246 @@ -1,42 +0,0 @@
247 -# Config file for /etc/init.d/syslog-ng
248 -
249 -# If you are not using network logging, this entire section should be
250 -# commented out. Otherwise, choose one of the settings below based on
251 -# how you are configuring your network.
252 -#
253 -# If you are using the net.* scripts to configure your network, you should
254 -# set rc_need to match the interface through which your logging server
255 -# can be reached.
256 -#rc_need="net.eth0"
257 -#
258 -# If you are using an interface manager like wicd, dhcpcd in standalone
259 -# mode, networkmanager, etc to control your interfaces, set rc_need to
260 -# the name of that service.
261 -# rc_need="dhcpcd"
262 -#rc_need="networkmanager"
263 -#
264 -# If you are using newnet and configuring your interface statically with
265 -# the network script, you should use this setting.
266 -#rc_need="network"
267 -#
268 -# You can use this setting, but I do not recommend relying on it.
269 -#rc_need="net"
270 -#
271 -# You may also want to uncomment the following if you are using network
272 -# logging.
273 -#rc_use="stunnel"
274 -
275 -# For very customized setups these variables can be adjusted as needed
276 -# but for most situations they should remain commented:
277 -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
278 -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
279 -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
280 -# SYSLOG_NG_PIDFILE_DIR=/run
281 -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
282 -# SYSLOG_NG_GROUP=root
283 -# SYSLOG_NG_USER=root
284 -
285 -# Put any additional options for syslog-ng here.
286 -# See syslog-ng(8) for more information.
287 -
288 -SYSLOG_NG_OPTS=""
289
290 diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.rc b/app-admin/syslog-ng/files/3.13/syslog-ng.rc
291 deleted file mode 100644
292 index 4a161e6..0000000
293 --- a/app-admin/syslog-ng/files/3.13/syslog-ng.rc
294 +++ /dev/null
295 @@ -1,58 +0,0 @@
296 -#!/sbin/openrc-run
297 -# Copyright 1999-2018 Gentoo Foundation
298 -# Distributed under the terms of the GNU General Public License v2
299 -
300 -: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
301 -: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/syslog-ng}
302 -: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
303 -: ${SYSLOG_NG_PIDFILE_DIR:=/run}
304 -: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
305 -
306 -: ${SYSLOG_NG_GROUP:=root}
307 -: ${SYSLOG_NG_USER:=root}
308 -
309 -command="/usr/sbin/syslog-ng"
310 -command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
311 -extra_commands="checkconfig"
312 -extra_started_commands="reload"
313 -pidfile="${SYSLOG_NG_PIDFILE}"
314 -start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
315 -description="Syslog-ng is a syslog replacement with advanced filtering features."
316 -description_checkconfig="Check the configuration file that will be used by \"start\""
317 -description_reload="Reload the configuration without exiting"
318 -required_files="${SYSLOG_NG_CONFIGFILE}"
319 -required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
320 -
321 -depend() {
322 - use clock
323 - need hostname localmount
324 - after bootmisc
325 - provide logger
326 -}
327 -
328 -checkconfig() {
329 - ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
330 - syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
331 - eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
332 -}
333 -
334 -start_pre() {
335 - checkconfig || return 1
336 - checkpath \
337 - -d \
338 - --mode 0700 \
339 - --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
340 - "${SYSLOG_NG_STATEFILE_DIR}"
341 -}
342 -
343 -stop_pre() {
344 - [ "$RC_CMD" = "restart" ] && sleep 1
345 - return 0
346 -}
347 -
348 -reload() {
349 - checkconfig || return 1
350 - ebegin "Reloading configuration and re-opening log files"
351 - start-stop-daemon --signal HUP --pidfile "${pidfile}"
352 - eend $?
353 -}
354
355 diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
356 deleted file mode 100644
357 index 7833f3a..0000000
358 --- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
359 +++ /dev/null
360 @@ -1,36 +0,0 @@
361 -@version: 3.14
362 -#
363 -# Syslog-ng default configuration file for Gentoo Linux
364 -
365 -# https://bugs.gentoo.org/426814
366 -@include "scl.conf"
367 -
368 -options {
369 - threaded(yes);
370 - chain_hostnames(no);
371 -
372 - # The default action of syslog-ng is to log a STATS line
373 - # to the file every 10 minutes. That's pretty ugly after a while.
374 - # Change it to every 12 hours so you get a nice daily update of
375 - # how many messages syslog-ng missed (0).
376 - stats_freq(43200);
377 - # The default action of syslog-ng is to log a MARK line
378 - # to the file every 20 minutes. That's seems high for most
379 - # people so turn it down to once an hour. Set it to zero
380 - # if you don't want the functionality at all.
381 - mark_freq(3600);
382 -};
383 -
384 -source src { system(); internal(); };
385 -
386 -destination messages { file("/var/log/messages"); };
387 -
388 -# By default messages are logged to tty12...
389 -destination console_all { file("/dev/tty12"); };
390 -# ...if you intend to use /dev/console for programs like xconsole
391 -# you can comment out the destination line above that references /dev/tty12
392 -# and uncomment the line below.
393 -#destination console_all { file("/dev/console"); };
394 -
395 -log { source(src); destination(messages); };
396 -log { source(src); destination(console_all); };
397
398 diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
399 deleted file mode 100644
400 index bb21cdf..0000000
401 --- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
402 +++ /dev/null
403 @@ -1,24 +0,0 @@
404 -@version: 3.14
405 -#
406 -# Syslog-ng default configuration file for Gentoo FreeBSD
407 -#
408 -
409 -# https://bugs.gentoo.org/426814
410 -@include "scl.conf"
411 -
412 -options {
413 - threaded(yes);
414 - chain_hostnames(no);
415 -
416 - # The default action of syslog-ng is to log a STATS line
417 - # to the file every 10 minutes. That's pretty ugly after a while.
418 - # Change it to every 12 hours so you get a nice daily update of
419 - # how many messages syslog-ng missed (0).
420 - stats_freq(43200);
421 -};
422 -
423 -source src { system(); internal(); };
424 -
425 -destination messages { file("/var/log/messages"); };
426 -
427 -log { source(src); destination(messages); };
428
429 diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
430 deleted file mode 100644
431 index 51b41e8..0000000
432 --- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
433 +++ /dev/null
434 @@ -1,115 +0,0 @@
435 -@version: 3.14
436 -# Copyright 1999-2018 Gentoo Foundation
437 -# Distributed under the terms of the GNU General Public License v2
438 -
439 -# https://bugs.gentoo.org/426814
440 -@include "scl.conf"
441 -
442 -#
443 -# Syslog-ng configuration file, compatible with default hardened installations.
444 -#
445 -
446 -options {
447 - threaded(yes);
448 - chain_hostnames(no);
449 - stats_freq(43200);
450 -};
451 -
452 -source src {
453 - system();
454 - internal();
455 -};
456 -
457 -source kernsrc {
458 - file("/proc/kmsg");
459 -};
460 -
461 -#source net { udp(); };
462 -#log { source(net); destination(net_logs); };
463 -#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
464 -
465 -destination authlog { file("/var/log/auth.log"); };
466 -destination _syslog { file("/var/log/syslog"); };
467 -destination cron { file("/var/log/cron.log"); };
468 -destination daemon { file("/var/log/daemon.log"); };
469 -destination kern { file("/var/log/kern.log"); };
470 -destination lpr { file("/var/log/lpr.log"); };
471 -destination user { file("/var/log/user.log"); };
472 -destination uucp { file("/var/log/uucp.log"); };
473 -#destination ppp { file("/var/log/ppp.log"); };
474 -destination mail { file("/var/log/mail.log"); };
475 -
476 -destination avc { file("/var/log/avc.log"); };
477 -destination audit { file("/var/log/audit.log"); };
478 -destination pax { file("/var/log/pax.log"); };
479 -destination grsec { file("/var/log/grsec.log"); };
480 -
481 -destination mailinfo { file("/var/log/mail.info"); };
482 -destination mailwarn { file("/var/log/mail.warn"); };
483 -destination mailerr { file("/var/log/mail.err"); };
484 -
485 -destination newscrit { file("/var/log/news/news.crit"); };
486 -destination newserr { file("/var/log/news/news.err"); };
487 -destination newsnotice { file("/var/log/news/news.notice"); };
488 -
489 -destination debug { file("/var/log/debug"); };
490 -destination messages { file("/var/log/messages"); };
491 -destination console { usertty("root"); };
492 -destination console_all { file("/dev/tty12"); };
493 -#destination loghost { udp("loghost" port(999)); };
494 -
495 -destination xconsole { pipe("/dev/xconsole"); };
496 -
497 -filter f_auth { facility(auth); };
498 -filter f_authpriv { facility(auth, authpriv); };
499 -filter f_syslog { not facility(authpriv, mail); };
500 -filter f_cron { facility(cron); };
501 -filter f_daemon { facility(daemon); };
502 -filter f_kern { facility(kern); };
503 -filter f_lpr { facility(lpr); };
504 -filter f_mail { facility(mail); };
505 -filter f_user { facility(user); };
506 -filter f_uucp { facility(uucp); };
507 -#filter f_ppp { facility(ppp); };
508 -filter f_news { facility(news); };
509 -filter f_debug { not facility(auth, authpriv, news, mail); };
510 -filter f_messages { level(info..warn)
511 - and not facility(auth, authpriv, mail, news); };
512 -filter f_emergency { level(emerg); };
513 -
514 -filter f_info { level(info); };
515 -
516 -filter f_notice { level(notice); };
517 -filter f_warn { level(warn); };
518 -filter f_crit { level(crit); };
519 -filter f_err { level(err); };
520 -
521 -filter f_avc { message(".*avc: .*"); };
522 -filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
523 -filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
524 -filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
525 -
526 -log { source(src); filter(f_authpriv); destination(authlog); };
527 -log { source(src); filter(f_syslog); destination(_syslog); };
528 -log { source(src); filter(f_cron); destination(cron); };
529 -log { source(src); filter(f_daemon); destination(daemon); };
530 -log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
531 -log { source(src); filter(f_lpr); destination(lpr); };
532 -log { source(src); filter(f_mail); destination(mail); };
533 -log { source(src); filter(f_user); destination(user); };
534 -log { source(src); filter(f_uucp); destination(uucp); };
535 -log { source(kernsrc); filter(f_pax); destination(pax); };
536 -log { source(kernsrc); filter(f_grsec); destination(grsec); };
537 -log { source(kernsrc); filter(f_audit); destination(audit); };
538 -log { source(kernsrc); filter(f_avc); destination(avc); };
539 -log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
540 -log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
541 -log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
542 -log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
543 -log { source(src); filter(f_news); filter(f_err); destination(newserr); };
544 -log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
545 -log { source(src); filter(f_debug); destination(debug); };
546 -log { source(src); filter(f_messages); destination(messages); };
547 -log { source(src); filter(f_emergency); destination(console); };
548 -#log { source(src); filter(f_ppp); destination(ppp); };
549 -log { source(src); destination(console_all); };
550
551 diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.confd b/app-admin/syslog-ng/files/3.14/syslog-ng.confd
552 deleted file mode 100644
553 index 9ddeda7..0000000
554 --- a/app-admin/syslog-ng/files/3.14/syslog-ng.confd
555 +++ /dev/null
556 @@ -1,43 +0,0 @@
557 -# Config file for /etc/init.d/syslog-ng
558 -
559 -# If you are not using network logging, this entire section should be
560 -# commented out. Otherwise, choose one of the settings below based on
561 -# how you are configuring your network.
562 -#
563 -# If you are using the net.* scripts to configure your network, you should
564 -# set rc_need to match the interface through which your logging server
565 -# can be reached.
566 -#rc_need="net.eth0"
567 -#
568 -# If you are using an interface manager like wicd, dhcpcd in standalone
569 -# mode, networkmanager, etc to control your interfaces, set rc_need to
570 -# the name of that service.
571 -# rc_need="dhcpcd"
572 -#rc_need="networkmanager"
573 -#
574 -# If you are using newnet and configuring your interface statically with
575 -# the network script, you should use this setting.
576 -#rc_need="network"
577 -#
578 -# You can use this setting, but I do not recommend relying on it.
579 -#rc_need="net"
580 -#
581 -# You may also want to uncomment the following if you are using network
582 -# logging.
583 -#rc_use="stunnel"
584 -
585 -# For very customized setups these variables can be adjusted as needed
586 -# but for most situations they should remain commented:
587 -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
588 -# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
589 -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
590 -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
591 -# SYSLOG_NG_PIDFILE_DIR=/run
592 -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
593 -# SYSLOG_NG_GROUP=root
594 -# SYSLOG_NG_USER=root
595 -
596 -# Put any additional options for syslog-ng here.
597 -# See syslog-ng(8) for more information.
598 -
599 -SYSLOG_NG_OPTS=""
600
601 diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.rc b/app-admin/syslog-ng/files/3.14/syslog-ng.rc
602 deleted file mode 100644
603 index fddf34c..0000000
604 --- a/app-admin/syslog-ng/files/3.14/syslog-ng.rc
605 +++ /dev/null
606 @@ -1,59 +0,0 @@
607 -#!/sbin/openrc-run
608 -# Copyright 1999-2018 Gentoo Foundation
609 -# Distributed under the terms of the GNU General Public License v2
610 -
611 -: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
612 -: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
613 -: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
614 -: ${SYSLOG_NG_PIDFILE_DIR:=/run}
615 -: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
616 -: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
617 -
618 -: ${SYSLOG_NG_GROUP:=root}
619 -: ${SYSLOG_NG_USER:=root}
620 -
621 -command="/usr/sbin/syslog-ng"
622 -command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
623 -command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
624 -extra_commands="checkconfig"
625 -extra_started_commands="reload"
626 -pidfile="${SYSLOG_NG_PIDFILE}"
627 -description="Syslog-ng is a syslog replacement with advanced filtering features."
628 -description_checkconfig="Check the configuration file that will be used by \"start\""
629 -description_reload="Reload the configuration without exiting"
630 -required_files="${SYSLOG_NG_CONFIGFILE}"
631 -required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
632 -
633 -depend() {
634 - use clock
635 - need hostname localmount
636 - after bootmisc
637 - provide logger
638 -}
639 -
640 -checkconfig() {
641 - ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
642 - syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
643 - eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
644 -}
645 -
646 -start_pre() {
647 - checkconfig || return 1
648 - checkpath \
649 - -d \
650 - --mode 0700 \
651 - --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
652 - "${SYSLOG_NG_STATEFILE_DIR}"
653 -}
654 -
655 -stop_pre() {
656 - [ "$RC_CMD" = "restart" ] && sleep 1
657 - return 0
658 -}
659 -
660 -reload() {
661 - checkconfig || return 1
662 - ebegin "Reloading configuration and re-opening log files"
663 - start-stop-daemon --signal HUP --pidfile "${pidfile}"
664 - eend $?
665 -}
666
667 diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened
668 deleted file mode 100644
669 index e587706..0000000
670 --- a/app-admin/syslog-ng/files/README.hardened
671 +++ /dev/null
672 @@ -1,13 +0,0 @@
673 -# Copyright 1999-2018 Gentoo Foundation
674 -# Distributed under the terms of the GNU General Public License v2
675 -
676 -If you intend to use syslog-ng together with the systemd journal,
677 -please be sure to configure it to listen accordingly, e.g. replace
678 -
679 - unix-dgram("/dev/log");
680 -
681 -with
682 -
683 - unix-dgram("/run/systemd/journal/syslog");
684 -
685 -in /etc/syslog-ng/syslog-ng.conf
686
687 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
688 deleted file mode 100644
689 index 3703bec..0000000
690 --- a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
691 +++ /dev/null
692 @@ -1,33 +0,0 @@
693 -From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
694 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@×××××××××××××.org>
695 -Date: Mon, 11 Dec 2017 15:46:06 +0100
696 -Subject: [PATCH] modules/json: Adaptions for json-c v0.13
697 -
698 ----
699 - modules/json/json-parser.c | 5 +++++
700 - 1 file changed, 5 insertions(+)
701 -
702 -diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
703 -index 0368ed8f7..356df48b9 100644
704 ---- a/modules/json/json-parser.c
705 -+++ b/modules/json/json-parser.c
706 -@@ -20,6 +20,8 @@
707 - * COPYING for details.
708 - */
709 -
710 -+#define JSON_C_VER_013 (13 << 8)
711 -+
712 - #include "json-parser.h"
713 - #include "dot-notation.h"
714 - #include "scratch-buffers.h"
715 -@@ -28,7 +30,10 @@
716 - #include <ctype.h>
717 -
718 - #include <json.h>
719 -+
720 -+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
721 - #include <json_object_private.h>
722 -+#endif
723 -
724 - typedef struct _JSONParser
725 - {
726
727 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
728 deleted file mode 100644
729 index 4339612..0000000
730 --- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
731 +++ /dev/null
732 @@ -1,23 +0,0 @@
733 -From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
734 -From: kokan <peter.kokai@×××××××.com>
735 -Date: Sat, 31 Mar 2018 15:36:08 +0200
736 -Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
737 -
738 -Signed-off-by: kokan <peter.kokai@×××××××.com>
739 ----
740 - lib/Makefile.am | 2 +-
741 - 1 file changed, 1 insertion(+), 1 deletion(-)
742 -
743 -diff --git a/lib/Makefile.am b/lib/Makefile.am
744 -index af2f44ece2..4a0b11c92f 100644
745 ---- a/lib/Makefile.am
746 -+++ b/lib/Makefile.am
747 -@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS = -no-undefined -release ${LSNG_RELEASE} \
748 -
749 - lib_test_subdirs = lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control
750 -
751 --lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la
752 -+lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
753 -
754 - if IVYKIS_INTERNAL
755 - lib_libsyslog_ng_la_DEPENDENCIES += lib/ivykis/src/libivykis.la
756
757 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
758 deleted file mode 100644
759 index b4046bd..0000000
760 --- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
761 +++ /dev/null
762 @@ -1,173 +0,0 @@
763 -From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
764 -From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@×××××××.com>
765 -Date: Wed, 7 Mar 2018 18:35:09 +0100
766 -Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
767 -MIME-Version: 1.0
768 -Content-Type: text/plain; charset=UTF-8
769 -Content-Transfer-Encoding: 8bit
770 -
771 -key_file and cert_file are optional (the client cert is not mandatory).
772 -
773 -Signed-off-by: László Várady <laszlo.varady@×××××××.com>
774 ----
775 - lib/tlscontext.c | 9 +++++++++
776 - modules/afsocket/transport-mapper-inet.c | 6 +++---
777 - 2 files changed, 12 insertions(+), 3 deletions(-)
778 -
779 -diff --git a/lib/tlscontext.c b/lib/tlscontext.c
780 -index 510ac2738d..b202c397f3 100644
781 ---- a/lib/tlscontext.c
782 -+++ b/lib/tlscontext.c
783 -@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
784 - file_exists(self->cert_file);
785 - }
786 -
787 -+static gboolean
788 -+_client_key_and_cert_files_are_not_specified(TLSContext *self)
789 -+{
790 -+ return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
791 -+}
792 -+
793 - static TLSContextLoadResult
794 - tls_context_load_key_and_cert(TLSContext *self)
795 - {
796 -+ if (_client_key_and_cert_files_are_not_specified(self))
797 -+ return TLS_CONTEXT_OK;
798 -+
799 - if (!_are_key_and_cert_files_accessible(self))
800 - return TLS_CONTEXT_FILE_ACCES_ERROR;
801 - if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file, SSL_FILETYPE_PEM))
802 -diff --git a/modules/afsocket/transport-mapper-inet.c b/modules/afsocket/transport-mapper-inet.c
803 -index 80c0d21801..1afb34b33f 100644
804 ---- a/modules/afsocket/transport-mapper-inet.c
805 -+++ b/modules/afsocket/transport-mapper-inet.c
806 -@@ -176,17 +176,17 @@ transport_mapper_inet_async_init(TransportMapper *s, TransportMapperAsyncInitCB
807 -
808 - TLSContextSetupResult tls_ctx_setup_res = tls_context_setup_context(self->tls_context);
809 -
810 -+ const gchar *key = tls_context_get_key_file(self->tls_context);
811 -+
812 - if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_OK)
813 - {
814 -- const gchar *key = tls_context_get_key_file(self->tls_context);
815 -- if (secret_storage_contains_key(key))
816 -+ if (key && secret_storage_contains_key(key))
817 - secret_storage_update_status(key, SECRET_STORAGE_SUCCESS);
818 - return func(func_args);
819 - }
820 -
821 - if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_BAD_PASSWORD)
822 - {
823 -- const gchar *key = tls_context_get_key_file(self->tls_context);
824 - msg_error("Error setting up TLS context",
825 - evt_tag_str("keyfile", key));
826 - call_finalize_init_args *args = g_new0(call_finalize_init_args, 1);
827 -
828 -From 9e3eae23330442c9e58ae5ccc732457f2d0e694e Mon Sep 17 00:00:00 2001
829 -From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@×××××××.com>
830 -Date: Wed, 7 Mar 2018 19:39:24 +0100
831 -Subject: [PATCH 2/3] tlscontext: fix error logging of cert_file
832 -MIME-Version: 1.0
833 -Content-Type: text/plain; charset=UTF-8
834 -Content-Transfer-Encoding: 8bit
835 -
836 -file_exists() has a side effect: it logs when the file can't be opened.
837 -
838 -Since the && operator is evaluated lazily, the error messages of cert_file
839 -were not displayed when the first invocation of file_exists failed
840 -(on key_file).
841 -
842 -Signed-off-by: László Várady <laszlo.varady@×××××××.com>
843 ----
844 - lib/tlscontext.c | 6 ++++--
845 - 1 file changed, 4 insertions(+), 2 deletions(-)
846 -
847 -diff --git a/lib/tlscontext.c b/lib/tlscontext.c
848 -index b202c397f3..5a503387c4 100644
849 ---- a/lib/tlscontext.c
850 -+++ b/lib/tlscontext.c
851 -@@ -595,8 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
852 - static gboolean
853 - _are_key_and_cert_files_accessible(TLSContext *self)
854 - {
855 -- return file_exists(self->key_file) &&
856 -- file_exists(self->cert_file);
857 -+ gboolean key_file_exists = file_exists(self->key_file);
858 -+ gboolean cert_file_exists = file_exists(self->cert_file);
859 -+
860 -+ return key_file_exists && cert_file_exists;
861 - }
862 -
863 - static gboolean
864 -
865 -From 3eef78b6ac8016d3eb33b36bd98419d5b086767f Mon Sep 17 00:00:00 2001
866 -From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@×××××××.com>
867 -Date: Wed, 7 Mar 2018 19:43:41 +0100
868 -Subject: [PATCH 3/3] tlscontext: rename file_exists() to is_file_accessible()
869 -MIME-Version: 1.0
870 -Content-Type: text/plain; charset=UTF-8
871 -Content-Transfer-Encoding: 8bit
872 -
873 -Signed-off-by: László Várady <laszlo.varady@×××××××.com>
874 ----
875 - lib/tlscontext.c | 16 ++++++++--------
876 - 1 file changed, 8 insertions(+), 8 deletions(-)
877 -
878 -diff --git a/lib/tlscontext.c b/lib/tlscontext.c
879 -index 5a503387c4..73015d2462 100644
880 ---- a/lib/tlscontext.c
881 -+++ b/lib/tlscontext.c
882 -@@ -322,7 +322,7 @@ tls_session_free(TLSSession *self)
883 - }
884 -
885 - static gboolean
886 --file_exists(const gchar *fname)
887 -+_is_file_accessible(const gchar *fname)
888 - {
889 - if (!fname)
890 - return FALSE;
891 -@@ -444,7 +444,7 @@ _is_dh_valid(DH *dh)
892 - static DH *
893 - _load_dh_from_file(const gchar *dhparam_file)
894 - {
895 -- if (!file_exists(dhparam_file))
896 -+ if (!_is_file_accessible(dhparam_file))
897 - return NULL;
898 -
899 - BIO *bio = BIO_new_file(dhparam_file, "r");
900 -@@ -528,7 +528,7 @@ tls_context_setup_dh(TLSContext *self)
901 - static PKCS12 *
902 - _load_pkcs12_file(const gchar *pkcs12_file)
903 - {
904 -- if (!file_exists(pkcs12_file))
905 -+ if (!_is_file_accessible(pkcs12_file))
906 - return NULL;
907 -
908 - FILE *p12_file = fopen(pkcs12_file, "rb");
909 -@@ -595,10 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
910 - static gboolean
911 - _are_key_and_cert_files_accessible(TLSContext *self)
912 - {
913 -- gboolean key_file_exists = file_exists(self->key_file);
914 -- gboolean cert_file_exists = file_exists(self->cert_file);
915 -+ gboolean key_file_accessible = _is_file_accessible(self->key_file);
916 -+ gboolean cert_file_accessible = _is_file_accessible(self->cert_file);
917 -
918 -- return key_file_exists && cert_file_exists;
919 -+ return key_file_accessible && cert_file_accessible;
920 - }
921 -
922 - static gboolean
923 -@@ -650,10 +650,10 @@ tls_context_setup_context(TLSContext *self)
924 - goto error;
925 - }
926 -
927 -- if (file_exists(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
928 -+ if (_is_file_accessible(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
929 - goto error;
930 -
931 -- if (file_exists(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
932 -+ if (_is_file_accessible(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
933 - goto error;
934 -
935 - if (self->crl_dir)
936
937 diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
938 deleted file mode 100644
939 index ba4730e..0000000
940 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate
941 +++ /dev/null
942 @@ -1,12 +0,0 @@
943 -#
944 -# Syslog-ng logrotate snippet for Gentoo Linux
945 -# contributed by Michael Sterrett
946 -#
947 -
948 -/var/log/messages {
949 - missingok
950 - sharedscripts
951 - postrotate
952 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
953 - endscript
954 -}
955
956 diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
957 deleted file mode 100644
958 index 678814a..0000000
959 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
960 +++ /dev/null
961 @@ -1,75 +0,0 @@
962 -#
963 -# Syslog-ng logrotate snippet for Hardened Gentoo Linux
964 -# contributed by Maciej Grela
965 -#
966 -# Updated bug #284669
967 -
968 -# Generic
969 -/var/log/debug /var/log/syslog /var/log/kern.log {
970 - sharedscripts
971 - missingok
972 - postrotate
973 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
974 - endscript
975 -}
976 -
977 -# System services
978 -/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
979 - sharedscripts
980 - missingok
981 - postrotate
982 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
983 - endscript
984 -}
985 -
986 -# User log
987 -/var/log/user.log {
988 - sharedscripts
989 - missingok
990 - postrotate
991 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
992 - endscript
993 -}
994 -
995 -# News system
996 -/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
997 - sharedscripts
998 - missingok
999 - postrotate
1000 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
1001 - endscript
1002 -}
1003 -
1004 -# Mail system
1005 -/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
1006 - sharedscripts
1007 - missingok
1008 - postrotate
1009 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
1010 - endscript
1011 -}
1012 -
1013 -# Hardened logs
1014 -/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
1015 - sharedscripts
1016 - missingok
1017 - postrotate
1018 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
1019 - endscript
1020 -}
1021 -
1022 -# Authentication
1023 -/var/log/auth.log {
1024 - sharedscripts
1025 - postrotate
1026 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
1027 - endscript
1028 -}
1029 -
1030 -# the rest
1031 -/var/log/messages {
1032 - sharedscripts
1033 - postrotate
1034 - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
1035 - endscript
1036 -}
1037
1038 diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
1039 deleted file mode 100644
1040 index 21ec5eb..0000000
1041 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
1042 +++ /dev/null
1043 @@ -1,75 +0,0 @@
1044 -#
1045 -# Syslog-ng logrotate snippet for Hardened Gentoo Linux
1046 -# contributed by Maciej Grela
1047 -#
1048 -# Updated bug #284669
1049 -
1050 -# Generic
1051 -/var/log/debug /var/log/syslog /var/log/kern.log {
1052 - sharedscripts
1053 - missingok
1054 - postrotate
1055 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1056 - endscript
1057 -}
1058 -
1059 -# System services
1060 -/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
1061 - sharedscripts
1062 - missingok
1063 - postrotate
1064 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1065 - endscript
1066 -}
1067 -
1068 -# User log
1069 -/var/log/user.log {
1070 - sharedscripts
1071 - missingok
1072 - postrotate
1073 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1074 - endscript
1075 -}
1076 -
1077 -# News system
1078 -/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
1079 - sharedscripts
1080 - missingok
1081 - postrotate
1082 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1083 - endscript
1084 -}
1085 -
1086 -# Mail system
1087 -/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
1088 - sharedscripts
1089 - missingok
1090 - postrotate
1091 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1092 - endscript
1093 -}
1094 -
1095 -# Hardened logs
1096 -/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
1097 - sharedscripts
1098 - missingok
1099 - postrotate
1100 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1101 - endscript
1102 -}
1103 -
1104 -# Authentication
1105 -/var/log/auth.log {
1106 - sharedscripts
1107 - postrotate
1108 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1109 - endscript
1110 -}
1111 -
1112 -# the rest
1113 -/var/log/messages {
1114 - sharedscripts
1115 - postrotate
1116 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1117 - endscript
1118 -}
1119
1120 diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
1121 deleted file mode 100644
1122 index 2e368bd..0000000
1123 --- a/app-admin/syslog-ng/files/syslog-ng.logrotate.in
1124 +++ /dev/null
1125 @@ -1,12 +0,0 @@
1126 -#
1127 -# Syslog-ng logrotate snippet for Gentoo Linux
1128 -# contributed by Michael Sterrett
1129 -#
1130 -
1131 -/var/log/messages {
1132 - missingok
1133 - sharedscripts
1134 - postrotate
1135 - @GENTOO_RESTART@ > /dev/null 2>&1 || true
1136 - endscript
1137 -}
1138
1139 diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
1140 deleted file mode 100644
1141 index 42f3062..0000000
1142 --- a/app-admin/syslog-ng/metadata.xml
1143 +++ /dev/null
1144 @@ -1,25 +0,0 @@
1145 -<?xml version="1.0" encoding="UTF-8"?>
1146 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1147 -<pkgmetadata>
1148 - <maintainer type="person">
1149 - <email>hydrapolic@×××××.com</email>
1150 - <name>Tomáš Mózes</name>
1151 - </maintainer>
1152 - <maintainer type="project">
1153 - <email>proxy-maint@g.o</email>
1154 - <name>Proxy Maintainers</name>
1155 - </maintainer>
1156 - <use>
1157 - <flag name="amqp">Enable support for AMQP destinations</flag>
1158 - <flag name="http">Enable support for HTTP destinations</flag>
1159 - <flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
1160 - <flag name="mongodb">Enable support for mongodb destinations</flag>
1161 - <flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
1162 - <flag name="redis">Enable support for Redis destinations</flag>
1163 - <flag name="smtp">Enable support for SMTP destinations</flag>
1164 - <flag name="spoof-source">Enable support for spoofed source addresses</flag>
1165 - </use>
1166 - <upstream>
1167 - <remote-id type="github">balabit/syslog-ng</remote-id>
1168 - </upstream>
1169 -</pkgmetadata>
1170
1171 diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
1172 deleted file mode 100644
1173 index 4b484f4..0000000
1174 --- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
1175 +++ /dev/null
1176 @@ -1,173 +0,0 @@
1177 -# Copyright 1999-2018 Gentoo Foundation
1178 -# Distributed under the terms of the GNU General Public License v2
1179 -
1180 -EAPI=6
1181 -PYTHON_COMPAT=( python2_7 )
1182 -
1183 -inherit autotools python-single-r1 eutils multilib systemd versionator
1184 -
1185 -MY_PV=${PV/_/}
1186 -MY_PV_MM=$(get_version_component_range 1-2)
1187 -DESCRIPTION="syslog replacement with advanced filtering features"
1188 -HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
1189 -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
1190 -
1191 -LICENSE="GPL-2+ LGPL-2.1+"
1192 -SLOT="0"
1193 -KEYWORDS="~amd64 ~x86"
1194 -IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
1195 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
1196 -RESTRICT="test"
1197 -
1198 -RDEPEND="
1199 - amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
1200 - caps? ( sys-libs/libcap )
1201 - dbi? ( >=dev-db/libdbi-0.9.0 )
1202 - geoip? ( >=dev-libs/geoip-1.5.0 )
1203 - http? ( net-misc/curl )
1204 - json? ( >=dev-libs/json-c-0.9:= )
1205 - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
1206 - python? ( ${PYTHON_DEPS} )
1207 - redis? ( >=dev-libs/hiredis-0.11.0 )
1208 - smtp? ( net-libs/libesmtp )
1209 - spoof-source? ( net-libs/libnet:1.1 )
1210 - systemd? ( sys-apps/systemd )
1211 - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
1212 - >=dev-libs/ivykis-0.36.1
1213 - >=dev-libs/libpcre-6.1
1214 - !libressl? ( dev-libs/openssl:0= )
1215 - libressl? ( dev-libs/libressl:0= )
1216 - !dev-libs/eventlog
1217 - >=dev-libs/glib-2.10.1:2"
1218 -DEPEND="${RDEPEND}
1219 - sys-devel/flex
1220 - virtual/pkgconfig"
1221 -
1222 -PATCHES=(
1223 - "${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
1224 -)
1225 -
1226 -S=${WORKDIR}/${PN}-${MY_PV}
1227 -
1228 -pkg_setup() {
1229 - use python && python-single-r1_pkg_setup
1230 -}
1231 -
1232 -src_prepare() {
1233 - local f
1234 -
1235 - use python && python_fix_shebang .
1236 -
1237 - # remove bundled libs
1238 - rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
1239 -
1240 - # drop scl modules requiring json
1241 - if use !json; then
1242 - sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
1243 - fi
1244 -
1245 - # use gentoo default path
1246 - if use systemd; then
1247 - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
1248 - -i contrib/systemd/syslog-ng@default || die
1249 - fi
1250 -
1251 - for f in "${FILESDIR}"/*logrotate*.in ; do
1252 - local bn=$(basename "${f}")
1253 -
1254 - sed \
1255 - -e "$(usex systemd \
1256 - 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
1257 - 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
1258 - "${f}" > "${T}/${bn/.in/}" || die
1259 - done
1260 -
1261 - default
1262 -
1263 - eautoreconf
1264 -}
1265 -
1266 -src_configure() {
1267 - econf \
1268 - --disable-docs \
1269 - --disable-java \
1270 - --disable-java-modules \
1271 - --disable-riemann \
1272 - --enable-manpages \
1273 - --localstatedir=/var/lib/syslog-ng \
1274 - --sysconfdir=/etc/syslog-ng \
1275 - --with-embedded-crypto \
1276 - --with-ivykis=system \
1277 - --with-module-dir=/usr/$(get_libdir)/syslog-ng \
1278 - --with-pidfile-dir=/var/run \
1279 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1280 - $(use_enable amqp) \
1281 - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
1282 - $(use_enable caps linux-caps) \
1283 - $(use_enable dbi sql) \
1284 - $(use_enable geoip) \
1285 - $(use_enable http) \
1286 - $(use_enable ipv6) \
1287 - $(use_enable json) \
1288 - $(use_enable mongodb) \
1289 - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
1290 - $(use_enable pacct) \
1291 - $(use_enable python) \
1292 - $(use_enable redis) \
1293 - $(use_enable smtp) \
1294 - $(use_enable spoof-source) \
1295 - $(use_enable systemd) \
1296 - $(use_enable tcpd tcp-wrapper)
1297 -}
1298 -
1299 -src_install() {
1300 - emake DESTDIR="${D}" install
1301 -
1302 - # We remove this module because it uses getprotobynumber_r()
1303 - # which is not available in musl
1304 - rm -f ${D}/usr/lib64/syslog-ng/libtfgetent.so
1305 -
1306 - dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
1307 - contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
1308 - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
1309 -
1310 - # Install default configuration
1311 - insinto /etc/default
1312 - doins contrib/systemd/syslog-ng@default
1313 -
1314 - insinto /etc/syslog-ng
1315 - if use userland_BSD ; then
1316 - newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
1317 - else
1318 - newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
1319 - fi
1320 -
1321 - insinto /etc/logrotate.d
1322 - newins "${T}/syslog-ng.logrotate" syslog-ng
1323 -
1324 - newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
1325 - newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
1326 - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
1327 - prune_libtool_files --modules
1328 -
1329 - use python && python_optimize
1330 -}
1331 -
1332 -pkg_postinst() {
1333 - # bug #355257
1334 - if ! has_version app-admin/logrotate ; then
1335 - echo
1336 - elog "It is highly recommended that app-admin/logrotate be emerged to"
1337 - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
1338 - elog "for logrotate to use."
1339 - echo
1340 - fi
1341 -
1342 - if use systemd; then
1343 - echo
1344 - ewarn "The service file for systemd has changed to support multiple instances."
1345 - ewarn "To start the default instance issue:"
1346 - ewarn "# systemctl start syslog-ng@default"
1347 - echo
1348 - fi
1349 -}
1350
1351 diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
1352 deleted file mode 100644
1353 index edc7832..0000000
1354 --- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
1355 +++ /dev/null
1356 @@ -1,170 +0,0 @@
1357 -# Copyright 1999-2018 Gentoo Foundation
1358 -# Distributed under the terms of the GNU General Public License v2
1359 -
1360 -EAPI=6
1361 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
1362 -
1363 -inherit autotools python-single-r1 eutils multilib systemd versionator
1364 -
1365 -MY_PV=${PV/_/}
1366 -MY_PV_MM=$(get_version_component_range 1-2)
1367 -DESCRIPTION="syslog replacement with advanced filtering features"
1368 -HOMEPAGE="https://syslog-ng.com/open-source-log-management"
1369 -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
1370 -
1371 -LICENSE="GPL-2+ LGPL-2.1+"
1372 -SLOT="0"
1373 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
1374 -IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
1375 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
1376 -RESTRICT="test"
1377 -
1378 -RDEPEND="
1379 - amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
1380 - caps? ( sys-libs/libcap )
1381 - dbi? ( >=dev-db/libdbi-0.9.0 )
1382 - geoip? ( >=dev-libs/geoip-1.5.0 )
1383 - http? ( net-misc/curl )
1384 - json? ( >=dev-libs/json-c-0.9:= )
1385 - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
1386 - python? ( ${PYTHON_DEPS} )
1387 - redis? ( >=dev-libs/hiredis-0.11.0 )
1388 - smtp? ( net-libs/libesmtp )
1389 - spoof-source? ( net-libs/libnet:1.1 )
1390 - systemd? ( sys-apps/systemd )
1391 - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
1392 - >=dev-libs/ivykis-0.36.1
1393 - >=dev-libs/libpcre-6.1
1394 - !libressl? ( dev-libs/openssl:0= )
1395 - libressl? ( dev-libs/libressl:0= )
1396 - !dev-libs/eventlog
1397 - >=dev-libs/glib-2.10.1:2"
1398 -DEPEND="${RDEPEND}
1399 - sys-devel/flex
1400 - virtual/pkgconfig"
1401 -
1402 -PATCHES=(
1403 - "${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
1404 - "${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch"
1405 -)
1406 -
1407 -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
1408 - contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
1409 - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
1410 -
1411 -S=${WORKDIR}/${PN}-${MY_PV}
1412 -
1413 -pkg_setup() {
1414 - use python && python-single-r1_pkg_setup
1415 -}
1416 -
1417 -src_prepare() {
1418 - local f
1419 -
1420 - use python && python_fix_shebang .
1421 -
1422 - # remove bundled libs
1423 - rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
1424 -
1425 - # drop scl modules requiring json
1426 - if use !json; then
1427 - sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
1428 - fi
1429 -
1430 - # use gentoo default path
1431 - if use systemd; then
1432 - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
1433 - -i contrib/systemd/syslog-ng@default || die
1434 - fi
1435 -
1436 - for f in "${FILESDIR}"/*logrotate*.in ; do
1437 - local bn=$(basename "${f}")
1438 -
1439 - sed \
1440 - -e "$(usex systemd \
1441 - 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
1442 - 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
1443 - "${f}" > "${T}/${bn/.in/}" || die
1444 - done
1445 -
1446 - default
1447 -
1448 - eautoreconf
1449 -}
1450 -
1451 -src_configure() {
1452 - econf \
1453 - --disable-docs \
1454 - --disable-java \
1455 - --disable-java-modules \
1456 - --disable-riemann \
1457 - --enable-manpages \
1458 - --localstatedir=/var/lib/syslog-ng \
1459 - --sysconfdir=/etc/syslog-ng \
1460 - --with-embedded-crypto \
1461 - --with-ivykis=system \
1462 - --with-module-dir=/usr/$(get_libdir)/syslog-ng \
1463 - --with-pidfile-dir=/var/run \
1464 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
1465 - $(use_enable amqp) \
1466 - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
1467 - $(use_enable caps linux-caps) \
1468 - $(use_enable dbi sql) \
1469 - $(use_enable geoip) \
1470 - $(use_enable http) \
1471 - $(use_enable ipv6) \
1472 - $(use_enable json) \
1473 - $(use_enable mongodb) \
1474 - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
1475 - $(use_enable pacct) \
1476 - $(use_enable python) \
1477 - $(use_enable redis) \
1478 - $(use_enable smtp) \
1479 - $(use_enable spoof-source) \
1480 - $(use_enable systemd) \
1481 - $(use_enable tcpd tcp-wrapper)
1482 -}
1483 -
1484 -src_install() {
1485 - default
1486 -
1487 - # Install default configuration
1488 - insinto /etc/default
1489 - doins contrib/systemd/syslog-ng@default
1490 -
1491 - insinto /etc/syslog-ng
1492 - if use userland_BSD ; then
1493 - newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
1494 - else
1495 - newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
1496 - fi
1497 -
1498 - insinto /etc/logrotate.d
1499 - newins "${T}/syslog-ng.logrotate" syslog-ng
1500 -
1501 - newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
1502 - newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
1503 - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
1504 - prune_libtool_files --modules
1505 -
1506 - use python && python_optimize
1507 -}
1508 -
1509 -pkg_postinst() {
1510 - # bug #355257
1511 - if ! has_version app-admin/logrotate ; then
1512 - echo
1513 - elog "It is highly recommended that app-admin/logrotate be emerged to"
1514 - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
1515 - elog "for logrotate to use."
1516 - echo
1517 - fi
1518 -
1519 - if use systemd; then
1520 - echo
1521 - ewarn "The service file for systemd has changed to support multiple instances."
1522 - ewarn "To start the default instance issue:"
1523 - ewarn "# systemctl start syslog-ng@default"
1524 - echo
1525 - fi
1526 -}