masked version bump for ebuild testing

Package-Manager: portage-2.1.10.11/cvs/Linux i686

7 files changed, 307 insertions, 15 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 2e67c99956a3..db2a4fc4f452 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.302 2011/09/22 22:11:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.303 2011/09/29 21:21:13 mr_bones_ Exp $
+
+*syslog-ng-3.3.0_beta2 (29 Sep 2011)
+
+  29 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +syslog-ng-3.3.0_beta2.ebuild, +files/syslog-ng.conf.gentoo.3.3,
+  +files/syslog-ng.conf.gentoo.fbsd.3.3,
+  +files/syslog-ng.conf.gentoo.hardened.3.3:
+  masked version bump for ebuild testing
 
   22 Sep 2011; Christian Ruppert <idl0r@gentoo.org> files/syslog-ng.rc6.3:
   Whitespace. Don't use --stop for reload().
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 361f73ba0eb2..52932781c291 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
+AUX syslog-ng.conf.gentoo.3.3 1314 RMD160 41cf2aaf1259183893b467c1f98559183878aa47 SHA1 ecb482b824bc7321430fc4e02af16a2fd56a1347 SHA256 a38aa184031e7abe14f1e869d4277dfa4643503b3a434b28e3226a6e36f52819
 AUX syslog-ng.conf.gentoo.fbsd.3.2 689 RMD160 001482d7e90b44896d374f4a1049ece9541a8f2e SHA1 4be46d2f9461c45e743e10e69a4252ce599deee5 SHA256 7249cb13fff50e2695a427fe4dc1285dad6838f576304cb6ddde0c53ff9814ad
+AUX syslog-ng.conf.gentoo.fbsd.3.3 689 RMD160 8123c3b1393d8633ddf8fda19cd9317817ef264e SHA1 66de548ed2ef8d1e396a9e5f590a6084d62b2c15 SHA256 b639b3a00de9cc5b5be3d3590ab760ca1c375c62b82f8bd5323b6c3ae8bb571d
 AUX syslog-ng.conf.gentoo.hardened.3.2 4573 RMD160 052ece8eda5e118fb2ce99258c5fc9733675e112 SHA1 97fab61fca9f2387d1c2c890b648f5df363198a7 SHA256 1ed9f8dc0be045bb3064b0ae237adf865689b35c9da58d19ce69367d709191e2
+AUX syslog-ng.conf.gentoo.hardened.3.3 4573 RMD160 4f4de2c81325919182add637d2a750d50a406bad SHA1 79846d21d1d4f1eb580211a438d74da2f84f54a3 SHA256 725e6e71215e3a7b3a5e2083372a0ac182a02325b63573bad8343a42b2710db7
 AUX syslog-ng.confd 150 RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d SHA1 c5df6ef1eca2a169fb3073816d4a06b7c85c0b0c SHA256 8319ca8e39a5dab5ddc82eede088e1f58ff25deef330804648000359cb736a3f
 AUX syslog-ng.logrotate 354 RMD160 120e617e36299bd7bea2ec226c2cda6e1574b793 SHA1 64abb48d2222e9702cbb33bc223507c44dbe2e85 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd1423bf2ae7bffee8ca3
 AUX syslog-ng.logrotate.hardened 1742 RMD160 fd60ca606aec32eae51e3c219fd86124ca1f8cf6 SHA1 675f800200b37496a0335cd27e289b24c8d4f259 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f
 AUX syslog-ng.rc6.3 1843 RMD160 6643aad29c60c55c417c9ab93a3588a022d7f7e5 SHA1 5f5ef1380493b6fa527c3518043afad0ececd980 SHA256 9a6fcbf400828564d9a8c1db02672ac2bab0ee8ab7af9a74d22062a5055597d6
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
+DIST syslog-ng_3.3.0beta2.tar.gz 2372967 RMD160 ca3d13a1d0cf80baa9d7597baabba0e615f3006d SHA1 0fa34d1a2332bf037db6980cad2614d969305939 SHA256 ba27261e5557c1de4b9ad5ac59ecc38a23c22ed111a00d3ba397a5e215c4c235
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
-MISC ChangeLog 41008 RMD160 4ce2d3f082d67c92671e66fbcb73cf313722a0f2 SHA1 1e117d612ef55ef6b9b3a1b4ebae36318aec3926 SHA256 656e76a5bd51076e260ea1a9b357cbb6a1b7a81a261aba191840c0919c2db932
-MISC metadata.xml 386 RMD160 76f583972aa02178f68ebdc32a834942a4ee0be6 SHA1 afbc0e7a5e426cf36c716c9ecdb1033f8f01deeb SHA256 4e2ddeeb98619ad03d1e367b5556e17d8cb5d260a25f68709a5cad7bc24506cd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk589RIACgkQfXuS5UK5QB1GEQP/aviqZhxUs+NsnBSGZ4wr1UEl
-XfCjwS/K+9GIlvkfZBeVR+0Z7Lfb/ZVb2E0GgQs8HVClWT19GdRmgcz36GTGkbCB
-EiEXRYhMsTGIk+iqpJ6/N+e/CW++xNiOH/ZlL0tgu57bTcOV/t1mquP8stXz4GUI
-8d4i/zwspXmxXPQyMKg=
-=QJeg
------END PGP SIGNATURE-----
+EBUILD syslog-ng-3.3.0_beta2.ebuild 3387 RMD160 f059d9e9197609ca953f368de154feee353cf252 SHA1 6812c883e44c0f31c848d453b949999c3c23c350 SHA256 7ee29772a99abad3d2c1003645dd23841cea38e5319dfd22f2f64a7b0ccde3a0
+MISC ChangeLog 41300 RMD160 5df40d385c972fef9c745b03aac67eb9d79318fd SHA1 4f491029d128ca5963991dba7da1804cd931bff9 SHA256 b3e4ed0fb18bf5b37a219298c9942a4b310a064150329c4f3d3a5a518802ff09
+MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3
new file mode 100644
index 000000000000..afba217dcd55
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3
@@ -0,0 +1,37 @@
+@version: 3.3
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3,v 1.1 2011/09/29 21:21:12 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+options { 
+	chain_hostnames(no); 
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+	# The default action of syslog-ng is to log a MARK line
+	# to the file every 20 minutes.  That's seems high for most
+	# people so turn it down to once an hour.  Set it to zero
+	# if you don't want the functionality at all.
+	mark_freq(3600); 
+};
+
+source src {
+    unix-stream("/dev/log" max-connections(256));
+    internal();
+    file("/proc/kmsg");
+};
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3
new file mode 100644
index 000000000000..e14459cb62b8
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3
@@ -0,0 +1,24 @@
+@version: 3.3
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3,v 1.1 2011/09/29 21:21:12 mr_bones_ Exp $
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+options {
+	chain_hostnames(no);
+
+	# The default action of syslog-ng is to log a STATS line
+	# to the file every 10 minutes.  That's pretty ugly after a while.
+	# Change it to every 12 hours so you get a nice daily update of
+	# how many messages syslog-ng missed (0).
+	stats_freq(43200); 
+};
+
+source src {
+    unix-dgram("/var/run/log");
+    internal();
+    file("/dev/klog");
+};
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3
new file mode 100644
index 000000000000..8c5487f83de0
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3
@@ -0,0 +1,111 @@
+@version: 3.3
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3,v 1.1 2011/09/29 21:21:12 mr_bones_ Exp $
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+	chain_hostnames(no);
+	stats_freq(43200);
+};
+
+source src {
+    unix-stream("/dev/log");
+    internal();
+};
+source kernsrc {
+    file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index 3dbb205b17ab..5c33283f372b 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -8,5 +8,7 @@
 <use>
 	<flag name='spoof-source'>Enable support for spoofed source addresses</flag>
 	<flag name='sql'>Enable support for SQL destinations</flag>
+	<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-glib</pkg></flag>
+	<flag name='mongodb'>Enable support for mongodb destinations</flag>
 </use>
 </pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.0_beta2.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.0_beta2.ebuild
new file mode 100644
index 000000000000..6361f80a34a8
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.3.0_beta2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2011 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.3.0_beta2.ebuild,v 1.1 2011/09/29 21:21:12 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools fixheadtails eutils multilib
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
+RESTRICT="test"
+
+LIBS_DEPEND="
+	spoof-source? ( net-libs/libnet )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!static? ( >=dev-libs/eventlog-0.2.12 )
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-glib-0.12 )
+	caps? ( sys-libs/libcap )
+	sql? ( >=dev-db/libdbi-0.8.3 )"
+RDEPEND="
+	!static? (
+		pcre? ( dev-libs/libpcre )
+		${LIBS_DEPEND}
+	)"
+DEPEND="${RDEPEND}
+	${LIBS_DEPEND}
+	static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
+	dev-util/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	ht_fix_file configure.in
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use static ; then
+		myconf="${myconf} --enable-static-linking"
+	else
+		myconf="${myconf} --enable-dynamic-linking"
+	fi
+	econf \
+		--disable-dependency-tracking \
+		--disable-systemd \
+		--disable-mongodb \
+		--with-ivykis=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/misc \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(use_enable caps linux-caps) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_with json json-glib) \
+		$(use_enable mongodb) \
+		$(use_enable pcre) \
+		$(use_enable spoof-source) \
+		$(use_enable sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		contrib/syslog-ng.conf* \
+		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use hardened || use selinux ; then
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
+	elif use userland_BSD ; then
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
+	else
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
+	fi
+
+	insinto /etc/logrotate.d
+	# Install snippet for logrotate, which may or may not be installed
+	if use hardened || use selinux ; then
+		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
+	else
+		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
+	fi
+
+	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
+	keepdir /etc/syslog-ng/patterndb.d
+	find "${D}" -type f -name '*.la' -exec rm {} + || die
+	rmdir "${D}"/usr/libexec
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}