rev bump to force out default config changes (bug #471836)

restrict tests again (bug #471988)
remove hardened and selinux use flags (bug #375853)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

6 files changed, 40 insertions, 39 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 9362d1934d05..ae6b8bf990fd 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.344 2013/05/28 07:00:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.345 2013/06/02 01:18:35 mr_bones_ Exp $
+
+*syslog-ng-3.4.1-r1 (02 Jun 2013)
+
+  02 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> +files/README.hardened,
+  +syslog-ng-3.4.1-r1.ebuild, -syslog-ng-3.4.1.ebuild,
+  files/3.4/syslog-ng.conf.gentoo, files/3.4/syslog-ng.conf.gentoo.fbsd:
+  rev bump to force out default config changes (bug #471836) restrict tests
+  again (bug #471988) remove hardened and selinux use flags (bug #375853)
 
   28 May 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.1.ebuild:
   create default statedir for people willing to settle for systemd (bug #470994)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 173ea37ccd38..c3d1e721a5f3 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,10 +1,11 @@
 AUX 3.4/syslog-ng-3.4.1-autotools.patch 1669 SHA256 312e655f41e87257f613e477dcc3a614e9698d3a4ac3ceedf5c1754e124dfb6b SHA512 d6043bdc7f0f59f09302e816891f5098dc8f15977f764fb4f0c8c9a106f9e3e82262f27eaba9055c6b51103f20e6d4422ff05e5227ee18a525a1a39b0856b170 WHIRLPOOL c37ddaa44b03136dfe07c6af805d7046ddc6806f6ac3342571940caa5ffddb63b0491da68bdae060973a4021e3a8f95cf06cab0661e7c2b84f491676e7f77e1d
 AUX 3.4/syslog-ng-3.4.1-rollup.patch 11181 SHA256 db146f40389f3d2beda9578317a82791628a9b350ee6cee22cc24ac42cf27f79 SHA512 0003333a0881ed722957ee3b906741e4a1a82be76ec0ca0665920143ad49f897d1dca31b4634e84a17fbff20428f655ef2e465a6f47948b7488b11be408321b9 WHIRLPOOL a71d71709d6ac96493c7a3f01c3fd9b97ec0f177b1ccfe2870b48a4964c7779f0bfd1fdf8879c92060cbde08189be8ee66fdf35f8c087cc7001ad1918759a268
-AUX 3.4/syslog-ng.conf.gentoo 1431 SHA256 7894f4ad578002678586c22a0d67122b2609310c4db4f6a5b105e465a99c7330 SHA512 459426990d79973f9947b18f147f38fc15fe2df44e3c0b36ff2081eae11a6f275120d06e75ba5adb689830d9161ed18c22ae1e576dcef0a778d33d7d10cc1412 WHIRLPOOL fc5d5f51dad321e2539d2b9c0e64145bb23b1a7c894648ef1c292edc609396f2a20dffef58a8326be5fc591ce129511d4eaeaebef7f60291b53a4e8e9820314f
-AUX 3.4/syslog-ng.conf.gentoo.fbsd 776 SHA256 362fcf26001c70d9b7c80e57abbd01de34d8a38832f7288f266139e9944ceda2 SHA512 0f0bc5bb661507d8e9c04a03eb0d817a163ef361296954762832ff5bae096f8651c5082e7383e10bdfd0c0f01c9a2f5cd9c8e5d6a49326096e14e8a90a4eb1d1 WHIRLPOOL bea1d6f39eb8c9cab59b51e040f77b06d546b21de15fde2af3e44e739cac1246003528ab2c82d3a8b1cdb800d977980c8fcff5f949bb0b26b179f8a433161a31
+AUX 3.4/syslog-ng.conf.gentoo 1332 SHA256 949c0f2a9f4351be23249ba1b7763b5d4ff9ab4907c1211cc3e92b6bc9705c8e SHA512 bdbcfa27368ed75daac153d91c50555bea892f492639a2448e47a6f38a9b84808eedd35db09347a385c70725ab8349798f624aa5e2f730fb99b2986d05afb1a4 WHIRLPOOL d639db780aa07438e1a33b85cf3f388782f84fe884b95303605ccd58bf95232e5e013c5d491b44034e7d90121064b9c749d91c2fa6352ccb44db90d12d792d82
+AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931c3386eb94145f8e7495d9eb8ece0fc SHA512 a8f94d3cd4f120c3cb69f4e938877f62e87f7a6a3f422575e130b49ed3fa37effc6dc0c53398031602f9bcf26a1ce3b5267701483f045829960796098e843fb0 WHIRLPOOL 37ceec9bb7a1cc829b1eeb1aa8e9af162b67e90e03d862bc215150e011ad8be433270d658029fd72963d2486c72f5046e9d6e007a62f170c1295d61d68b62ca4
 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098
 AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
 AUX 3.4/syslog-ng.rc6 2042 SHA256 2bc7def00d40801831bea0329f687a17476c84d153a7b956d9f22e9718801052 SHA512 f6ad6a9fd87cdfc59fefcbfdfaf0abb89c0adec19005bc9fedc28e04c9cc508e9c1170cdde900b7d8fe21ebf46c49a5eb232b21569c963fbdbe0d1d2dbce1469 WHIRLPOOL 4ddfd3a40bbd488da3a83bd8dc6bb0a97cbe23e7eded8c80c97d35cb7cd92fec712bcc2b32cbceb792b6887e4fd1712be28188d6212c5ddf55d0aff7eb12a9fb
+AUX README.hardened 358 SHA256 712e5bb70d79e416237ccd69a73e0b8deaf7d9bfbb92a0c85554a12bebbaf6bc SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e WHIRLPOOL 7980551efe131b736c2542f7d066e2442201be3e541dc0036e92de1c5379d945148164b628b47ec5c5379c1e50ead7120f653c63ab78feefe69c5753998c0295
 AUX syslog-ng-3.3.5-afsocket.patch 1384 SHA256 d363ad6ee2d994ff7f3e32b6ea2ad3889033023332ffd76d963313716dc0dc59 SHA512 8704cf813778e72ce70f8e8b88c53ebf570880ff591c5b3d9c4239e72fa97223f9e492473096b82b89b61edeb2cadcd8bb9794fb0a83b4755ad691637b193929 WHIRLPOOL d7c5aeaec98eeeda80713033c891fa916b52f9591e46031b0b032a1a8340c29fb41ebb3d96203f0d5e3670a07502061f0e1c08e14d766870fdc4d30e40dab41e
 AUX syslog-ng-3.3.5-compile.patch 250 SHA256 831476d524a2fb32fe944a960f5adb4f97fde6ded8d84eb1ad9ef00b5f1a9354 SHA512 ad865b18cb8ea8509abeced4f42b9fd303e2a3f41ff9c58fd23ee5331b6248409a54963ee15dc5803c9f69532809048fd996e9197e9d459b03ccbd3ba2b5c9fd WHIRLPOOL 3f36605448b10eeddf6aeaeede64815edc5b48371c65270d6b83758477cdfcc79e7361521ff00f5922da5b1aff5c17c6e1ed4b36ef649f4c3a95020ccec2d422
 AUX syslog-ng-3.3.5-gprocess.patch 1583 SHA256 da5267e191690a38d63304f5943e79a3384bbb797f38e10604af85595e925402 SHA512 6a08ebaa96a54cdbb441d95632f98e74bf410f9c2db74238c60b0eca02094eab6c237d38d000cb63995586914b2414f8e8aa7d0c1e9f031befeaf03b04bf3056 WHIRLPOOL d9bf12718783fb66727381eed0040d2b3f4c61be9498ac1dd87a57a14eff418ad9dea854c6edbc11c8bf82c902016c8742a8cb09973189b2991c6db322a1ce9f
@@ -27,6 +28,6 @@ DIST syslog-ng_3.3.5.tar.gz 2495235 SHA256 dcca69869ab3cf2afda6db0dad549b6be717f
 DIST syslog-ng_3.4.1.tar.gz 3347306 SHA256 ca5613a808ea92cb72669d8e1c141bf86405e0d94f913c4db3ab9e2c37612986 SHA512 5f9830f269cd612f3ee62a044a0dab4a38b33395a6b60669e84433410ad63f74b1711536b49fad13589f82986f55c9581433141f7a77eeae34056ec6344c9399 WHIRLPOOL f5985236c0a4cb9044e60a9ef3beeffe9c3c03cebea98da853d256d60e853e5da235fc5d33faf871dcea018d931965156c8d8a29e941083513bccd8723b94155
 EBUILD syslog-ng-3.2.5.ebuild 2852 SHA256 2f0de5b0f8296b0d4e4d00c206bea5b1b28f31ff1c51879ec72dd3aa8f306375 SHA512 c751b8975e62c884d1c5f034b53e10d27d08f0b9e745f63e5e150e3e2b77dfedb43223443172b9150cac5737ed541f22205173d4bcd9816b3878a3e4a89c42eb WHIRLPOOL c4bda63c10d006f7cc7dbeb78a9f272a10d70ca33bb060953c92f5b7b33c618d4f94f4b0b3022c010cd0c5d389fe261dcd638ec9e8813f3c1ae1ee88e100350d
 EBUILD syslog-ng-3.3.5-r1.ebuild 4168 SHA256 5471ae33faa88989b7fae5981ba9f75f66622bc388d9110ee1230c6c7ff3a1e9 SHA512 b8a966271f5c5a60f1750b7573b301aa113dc642e53cee2bee08b02439ecc0c01be332460d814d96ba8617eb397b6ce70bc357c4a2d4145ba166ee1fcf4f51f0 WHIRLPOOL eb1861e630599aa8c20ea94dd21f0ce5dded50b7aaa6989ee39a1bbcf9684e91c63a6340b27b1ebc385e51cdb0658dc28521fd60df75a8695602589ea57c8d36
-EBUILD syslog-ng-3.4.1.ebuild 3631 SHA256 5bea3c4a2f02cbb9be241030980f2a3a3fa7c6e461a8ec69fe6ee3fc29c11ce1 SHA512 9af13f135818c5df0d32ef5232f30dcb9efe9d883c0577d1cd069be3b712749014a267c2a721318da1036f9a7c558ebdd10601e32cdb944aef990ce8b81bb3b1 WHIRLPOOL 7b9281397143caf861f29f8b67099e9850596980f320760fa8cc5d2d1ad412fdadad39d4ac211b1eeb8c4ec418b1f2bce01c3f29f2392f585bc269bb3e694e9c
-MISC ChangeLog 47710 SHA256 0ed4ea0f2cae5778f1920872e7eb7968d9282340633483673bb1eb4a98f3f60b SHA512 fe58cfcce664a2e35629646360b376aabcd99340b2e1ad90af6a1220b0db9edd1d50cc54fd16899c09de2b02268bce67009e47089b251fc5a5020f5a8696235c WHIRLPOOL d9f73796950a573d99121fdbe30402cf9c0d9592921896bb5679d8e06f657f3fb2431402f1ac578eac88b0e57e84637e563e2dce5cd61cf22914ec3c2b138917
+EBUILD syslog-ng-3.4.1-r1.ebuild 3187 SHA256 884a2dbb052a41ec269a36f414581b53849971c1e2fe8ddaa2bbabb9395a57ea SHA512 5f9f5abdff1066ab36bd1391b1ef76f13682ba7c6d59dfd2b92c45f0d5e72baa2d167e676a5eeb932ce8d5bda38dbea701d79b15a056d5e850ca48f57d31b012 WHIRLPOOL 5d2dcd7a42bae9925e9e1846ea50a9436365518a58be4355b939e08701ead7ad6524aebba54dcbb0aca1b08371d2ed759a46c1ad6947e61eaf1f5023004cb01e
+MISC ChangeLog 48103 SHA256 863ecf9793fd007267ce779167cf8db009130149f0cbc64665287121d7248e33 SHA512 4e08a1350a693a95959359b5904fd1827764e626432bb29a4ff7d353003fb863cfd1b94a29e85a555bea211ae03851fc264f731631a5c29183958c1406e5b371 WHIRLPOOL 945c589de1db86ae8caafbefa3ae71ac417a3759d925e1233c59fbe4d2468c6daa1ac50babb7b0fcca18a6f1bdbadeebf58d5408863a617cea31e057be11630b
 MISC metadata.xml 622 SHA256 080a769b5f0dd360ac36a746667a70a85a8e857553da07dc5272005c097125ba SHA512 afc895b14a063c88fac179d3a588e0d77e507a7bd8a9bd93091989f5df959e002696d281364ef28d293546b191e2ab8a67eba59d2e1006f97640b57a302c4e1c WHIRLPOOL c634c831dc48c370a21f37abf5c4a96a0c11463fa69dd26c632f0b294af5f1372416d4bfb941eaa842cdc247587684aff14498e65e490cc4e16db6ae2aaff1b2
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
index 241856071670..e8d3b4f1d596 100644
--- a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
@@ -1,5 +1,5 @@
 @version: 3.4
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
 #
 # Syslog-ng default configuration file for Gentoo Linux
 
@@ -22,12 +22,7 @@ options {
 	mark_freq(3600); 
 };
 
-source src {
-    # https://bugs.gentoo.org/show_bug.cgi?id=449260
-    unix-dgram("/dev/log");
-    internal();
-    file("/proc/kmsg");
-};
+source src { system(); internal(); };
 
 destination messages { file("/var/log/messages"); };
 
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
index e255b8b91eff..66130bea1de4 100644
--- a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
@@ -1,5 +1,5 @@
 @version: 3.4
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $
 #
 # Syslog-ng default configuration file for Gentoo FreeBSD
 #
@@ -18,11 +18,7 @@ options {
 	stats_freq(43200); 
 };
 
-source src {
-    unix-dgram("/var/run/log");
-    internal();
-    file("/dev/klog");
-};
+source src { system(); internal(); };
 
 destination messages { file("/var/log/messages"); };
 
diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened
new file mode 100644
index 000000000000..dcb0fc3f3ae2
--- /dev/null
+++ b/app-admin/syslog-ng/files/README.hardened
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+If you intend to use syslog-ng together with the systemd journal,
+please be sure to configure it to listen accordingly, e.g. replace
+
+    unix-dgram("/dev/log");
+
+with
+
+    unix-dgram("/run/systemd/journal/syslog");
+
+in /etc/syslog-ng/syslog-ng.conf
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild
index 4779e6013f72..5826d7f962cb 100644
--- a/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.1.ebuild,v 1.9 2013/05/28 07:00:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild,v 1.1 2013/06/02 01:18:35 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils multilib systemd
@@ -13,7 +13,8 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps dbi geoip hardened ipv6 json mongodb +pcre selinux smtp spoof-source ssl tcpd"
+IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl tcpd"
+RESTRICT="test"
 
 RDEPEND="
 	pcre? ( dev-libs/libpcre )
@@ -66,24 +67,21 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc AUTHORS ChangeLog NEWS contrib/syslog-ng.conf* contrib/syslog2ng
+	dodoc AUTHORS ChangeLog NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${FILESDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
 
 	# Install default configuration
 	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf
-	elif use userland_BSD ; then
+	if use userland_BSD ; then
 		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
 	else
 		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
 	fi
 
 	insinto /etc/logrotate.d
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-	fi
+	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
 
 	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
 	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
@@ -103,14 +101,4 @@ pkg_postinst() {
 		elog "for logrotate to use."
 		echo
 	fi
-	if has_version sys-apps/systemd ; then
-		echo
-		elog "If you intend to use syslog-ng together with the systemd journal,"
-		elog "please be sure to configure it to listen accordingly, e.g. replace"
-		elog "unix-dgram(\"/dev/log\");"
-		elog "with"
-		elog "unix-dgram(\"/run/systemd/journal/syslog\");"
-		elog "in /etc/syslog-ng/syslog-ng.conf"
-		echo
-	fi
 }