Update app-admin/syslog-ng-3.13.2

3 files changed, 79 insertions, 3 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 2cb1c3af..4e02beb3 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -12,12 +12,13 @@ AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f4
 AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
 AUX syslog-ng.logrotate 281 BLAKE2B 9f8a9307bc187723c446da12ac0c49799a91b544595f057e61985f6d85396c62837439e879ebc944f3c9205718d4d3d119faeab2e8dabf34de3b5b61f709ec82 SHA512 13a282e8f181115e4ceafab438f7f90db3ababc89023da69e555c444ad81e793e6bfcf45526f6a3a117db2a2c9c7119ee2a31fd16365822739a5d30c4ce390bc
 AUX syslog-ng.logrotate.hardened 1664 BLAKE2B 0594b7b541ad96da783b1d732f1aeb7b6cb90fc23f3e3b55bb2b8bd62c83504ea7b47b6733985712b127c5e084a7ac5f8d25f56ec3f2f367f9e30f50078ae4b3 SHA512 2cdc75ca6d26bb8b3373fe9a95b4e2d261925a970be48c28423024d66638790a1c6464929e983b86bd901f57eef780aa8cf0a92cc244c7134accd2a030ff5890
+AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.7.1.tar.gz 3509575 BLAKE2B 6bf0051f58a8a35be9b666d6f4eea3393bd82c14b0be436b4020739f49c02606a889febae60baa472ffed37616f83a68c48c273a117ce8ad0d3a22b212f07e08 SHA512 6f9a68aec2594d83c43cf40e12a3d56e65661929a47c2a053ae120e34ad358d4dfd0b5b0303a374a5557f2ac0670114037a339530b111b1078b56e5baf284ed4
 DIST syslog-ng-3.7.2.tar.gz 3558377 BLAKE2B 6a8d1aaa89edaa5ed00d43ab2a1038426c96ec0ae719e12517d7511964bb7d5f48fc42242ede493eba6086464afd31427a6438a13850729d68e30e7651e4bf45 SHA512 dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.13.2.ebuild 4741 BLAKE2B 7c0922419ee9682a36665aba327e7849ee4ec44258c976691e2e5c6ceb0e3a6d37bdb9e823ebbb6643b43eab05d26fb2219a526e77c647c2b15c2f3220c1b63f SHA512 7f04c4bf526680e40f4333b0f995ea908626695b4ee7c2b97416dae2ea431b9a8ae74751662538af27674176087827c15762f91fef2cc0332895bc8793296d0e
+EBUILD syslog-ng-3.13.2.ebuild 4745 BLAKE2B 72866e59eafc7f848d7ea2247601c2351558232e2e36b3cb2531caee13bba86d99dbddb628de9bcd4f0709d125d051bd989db87adcd012e625e6ad8f083ecf29 SHA512 96aa21121ae4837d00e5783187644b21c4450fef96ea78818dd5af25d7511a6d2b4acfc7c374b58d9adccaabd2c98ee9a3109e4af5a26b2cacd92e0294b9a591
 EBUILD syslog-ng-3.7.1.ebuild 3987 BLAKE2B 819fc479684e08538a397d043cce6bdfe9cd133ea61f7ba038fae632f0e00cfb2ebf359789904465cf7af9113be0159a2ae4e000e90be077cc2850e53a71881d SHA512 bcb1fa4e4079e996c8c25420996622059b102a12994e758160e979d2b66966c2b4982fda7c7e103b944856d1139276d43a0e83cbbfd14de903458300661ca696
 EBUILD syslog-ng-3.7.2.ebuild 4045 BLAKE2B 68626fa22459b6ae3b98d899a5cad15b3c0a622bc5583375a82d3a525584b352fe2aa6393cfeab96d441da7560ea6f09eea74962877cbc55f9e045dacf6df04e SHA512 a0b04126615accc75986a59f387b7ea688a3f34e313de74090b93f66aa844cf2ac89d37042f5623293c431ba761930cce8502568475877b669acd5ce40d14615
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
new file mode 100644
index 00000000..21ec5eba
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -0,0 +1,75 @@
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# User log
+/var/log/user.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    sharedscripts
+    missingok
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# Authentication
+/var/log/auth.log {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
+
+# the rest
+/var/log/messages {
+    sharedscripts
+    postrotate
+        @GENTOO_RESTART@ > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index b54f44ed..c6493fa4 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ia64 sparc x86"
+KEYWORDS="amd64 hppa ia64 sparc x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
@@ -59,7 +59,7 @@ src_prepare() {
 	use python && python_fix_shebang .
 
 	# remove bundled libs
-	rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
 
 	# drop scl modules requiring json
 	if use !json; then