syslog-ng 3.x version bump; updated files/ to be generic for 3.x

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

7 files changed, 241 insertions, 8 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 3cfaa358839f..29465740b55a 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.228 2010/04/05 23:22:55 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.229 2010/04/06 02:11:35 mr_bones_ Exp $
+
+*syslog-ng-3.1.0 (06 Apr 2010)
+
+  06 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  syslog-ng-3.0.5-r1.ebuild, +syslog-ng-3.1.0.ebuild,
+  +files/syslog-ng.conf.gentoo.3, +files/syslog-ng.conf.gentoo.fbsd.3,
+  +files/syslog-ng.rc6.3:
+  syslog-ng 3.x version bump; updated files/ to be generic for 3.x
 
   06 Apr 2010; Magnus Granberg <zorry@gentoo.org>
   +syslog-ng-3.0.5-r1 syslog-ng.conf.gentoo.hardened
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 02d3a331fc67..cd25d5306c6f 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,7 +1,9 @@
 AUX syslog-ng.conf.debian 5445 RMD160 c3c2f319d437bb2548226f4f78db96cd6210c7cc SHA1 80256f810a5b87adf5b39320eb4b5758ba3003a0 SHA256 74943e12a92b415306e2fca27056a839fa7ce443ccd08fdafcfac9bcba08a1c3
 AUX syslog-ng.conf.gentoo 1100 RMD160 02b1b6230d509369a86ac9e26c374f7972fbed9f SHA1 a27db752c611786062ac8e0d2e902c038d6323b2 SHA256 fbe8e8f7143748212d0726ad3ee6eed7479018eef788cdeee6796ae78cbdc96a
+AUX syslog-ng.conf.gentoo.3 1069 RMD160 00eb2b9614650776ce21cfe5384f774441cedcc5 SHA1 36ef140882f6294725deeda123aaae875c44b17f SHA256 97385f8f8e1f8f810f703089e86b1d1f5e36aaeb7b6cfd71a5e680ab180b6a52
 AUX syslog-ng.conf.gentoo.3.0 1071 RMD160 678ddf3f718b5656351320969b60d8b7e4ba06da SHA1 53256d2169f125d34ef9284da98542aee8b219cf SHA256 734c9b926caa08037f9bd40ac04b6a23f94724e7dd1fe7d74df8ef6286b6455b
 AUX syslog-ng.conf.gentoo.fbsd 702 RMD160 2fb49bab8ccc7ce763156ef14dbff858d7e6b416 SHA1 1a6bd708009fd6d18516d66a34bd9cb9ec7c3eed SHA256 ab54cc3e5595fad1b362039932ee8a7d7e852ebda3f08bb20ecc19c1be830751
+AUX syslog-ng.conf.gentoo.fbsd.3 687 RMD160 cad34febfe22d9b684e706f4befacc07e2d3d91d SHA1 b5474779b8b6c7949b6c8e6e89569c80e3774cde SHA256 e7fae34d2732b059235726a82ea057cf7ba50f1db134a4d14cb0dfbcd42dc090
 AUX syslog-ng.conf.gentoo.fbsd.3.0 689 RMD160 2846d0f4983e77c84dd0d910125fc06db35b7bea SHA1 fe691a832c6349f103be06030ef3c0149003ab0c SHA256 7664196305d7937613c8bd5f653fa4703d37e51efc8c5c5f286f30be9da5ecaa
 AUX syslog-ng.conf.gentoo.hardened 4619 RMD160 0356a63c0a0552f23c119beb0567b5aa7d9fba70 SHA1 c02ad68e91c8198df698990c969fc24a72872530 SHA256 8c229d39e3fcb79d5ac29dcd859ec29cb84e345867985a8a36dcbf72db3ff7bc
 AUX syslog-ng.conf.gentoo.hardened.3.0 4564 RMD160 971d33ff9ac1d87045a2ff2818f567ae2d72e763 SHA1 e37cdd66a8596c667879fc055bcf8ba5118a370a SHA256 4b28c0cb95753e4172a62a6070c147888f7afcf80cea101e27560052f5c8302c
@@ -9,16 +11,19 @@ AUX syslog-ng.confd 150 RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d SHA1 c5d
 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-r1 1878 RMD160 1b7d090964cb8868d37e38ff7121c503d41ef38b SHA1 4c019348769fc49af8fa95ee033eebbc876f175e SHA256 68ed87191267b48bfc092fc383d2872dc46f60c550c963923aacd52f71fb100f
+AUX syslog-ng.rc6.3 1855 RMD160 ce1c74938d554e09284ddef36217b205d91f71ed SHA1 bd634b41728d1e5f5fa1712b93b0cca79302fbfb SHA256 d125c4fffc6dd15d891b5092a8e83de594d9c1b04797ec89e4cacd3451539723
 AUX syslog-ng.rc6.3.0 1882 RMD160 6cae49c65efc4fa347f96edf373077dd9fab1a0c SHA1 0640fc1793b3f54b55961bc9e8bf7a7c556e56b9 SHA256 454c85dc4b007f2d888acbd2b997709c7c607267d7ca62280a9ed2252049672e
 AUX syslog-ng.rc6.3.0-r1 1860 RMD160 a2c6f92e9659e53a7c638788306059f5a58fe7e8 SHA1 3e593d0690523243ea2ee20d1cbdaa866b11c67e SHA256 f993d65a36e100ae6b6d4671d25f2708d39d46f28c82986cec984409ce350a2a
 DIST syslog-ng-2.0.10.tar.gz 403808 RMD160 eaa0965e1c06be217265c8710cc8375843ce9f64 SHA1 c627548a4f2a85d6734935496a4ad3f378911761 SHA256 f9155bcab40b572807796348d3ee8fbef3b5ff9aad213f74a09b321ac1d5b4ef
 DIST syslog-ng_2.1.4.tar.gz 423703 RMD160 2a87cb05de9a25f5b09cd488cf9d2104ba29aa33 SHA1 8080ff36f4da3a987cba505ff312650943f4c6c4 SHA256 e2189c7dbf617f2fc883ab0a8a86100dbe7cb4853c6b39732d77e73f335b0502
 DIST syslog-ng_3.0.4.tar.gz 548607 RMD160 97a467e304ff1669cdfc9061838b180b28e58c9e SHA1 a0b37b14b88d92577a384883c6287593e7b203f1 SHA256 00fe3aeb25acf18e37973228475ae0dd3d9791620f500d2c918d582c35a25068
 DIST syslog-ng_3.0.5.tar.gz 567960 RMD160 db8746d35c24af941596bd0c673cc81e14d896bd SHA1 32cc28af2613b00a9d808d5b1bfbe8547e567117 SHA256 2b509acbb8fdd3a07cf41b8ae7734792f297697f1c6dd72879ce87dda279b303
+DIST syslog-ng_3.1.0.tar.gz 697789 RMD160 8dea043494758f61d5c3bcda99234c4a4cf90109 SHA1 b67310231ead939791bb066541f4a15e22c61996 SHA256 3883e1d5ef5dc6d3a7ca017f7991fd978a09ad79ca7c598f43b52346bd32fc63
 EBUILD syslog-ng-2.0.10.ebuild 2518 RMD160 65c60e0d3f8ba83fd543bc75976f9a4fabea17c8 SHA1 078667b4f3aabc71bdcbf7b9d358b744e5ef28dd SHA256 adf582f295675b6f58734908a42e868ccf57e918495f6dbff160d79ab18ac917
 EBUILD syslog-ng-2.1.4.ebuild 2514 RMD160 d4907d2c4f0ed2b7aff50cbdf451253d203dd888 SHA1 23ce928dc151ddd59222c977d2544d2b58576655 SHA256 8afe9b35522c6fafd7721ce0d15466c434585e5f5f269bd7d61705d3b89fb160
 EBUILD syslog-ng-3.0.4.ebuild 2918 RMD160 1779eb6e30591cbf5ec3b52f28375a7c87d7d10b SHA1 7e2966b1ce4131d611d9ae1f5cc9a31fa2cd31e4 SHA256 8f6a5eb92b608ec13e95e5584c499db997cc8183fede5746d040f2eea07a821b
-EBUILD syslog-ng-3.0.5-r1.ebuild 2930 RMD160 e8e5efed46fd96ea8a91fff2c425503924672b27 SHA1 58661a477f7b19ed831286b868ca4ab4d6def842 SHA256 6ace38adf8963fc6a5138f999164e6de579e796ea14e5baa254da6f311078d10
+EBUILD syslog-ng-3.0.5-r1.ebuild 2935 RMD160 a33f9e9451a047a3ba6c31ed54174b5f798358aa SHA1 26cecfd185c93c55cc30cbea17122563c4ae9bd0 SHA256 b16e24340523793291ad0c06baa88153ac3e9129869e1bf94a8bbcf7e39b4a1d
 EBUILD syslog-ng-3.0.5.ebuild 2931 RMD160 a97b4c1b6af45a09ad9eefad372cfe7f899d2c19 SHA1 c15407e03dda9a778eaa776cd8915a6d4ac58297 SHA256 70c6cc8ce2a367785183692da69f262bc296945d4880d9266ba4693babd8edda
-MISC ChangeLog 30509 RMD160 6c6f1cb4e7ff6e7563d0c6d1f21e6473a0b464a9 SHA1 fdfd55d0cd0edb76875ebb31ffd92a0dd7a5b811 SHA256 994b373334d9d53c3d1e9d9e4f9bc4b6c0c3998ac66b5d8b793ebb0aded44788
+EBUILD syslog-ng-3.1.0.ebuild 2932 RMD160 5a37d1fbfc1ff0c2908a5171de4acb359034dec9 SHA1 137863046cff29c8319de03bed8f8c433c994910 SHA256 98228c1900bcfe0b6be2674be690e5682c87e8ecff51b69a989a9c7969e38808
+MISC ChangeLog 30819 RMD160 bc7940d98d0d8b0742323ab8347df4ac7705cc09 SHA1 8f699ef52f2b7ec3927050a2bc2b84ff32b7aca8 SHA256 63391357116b7e853875b6242df84384c573b9699303e4e39a96b35913eb799c
 MISC metadata.xml 407 RMD160 cf71f8c335372c633573600fa8a135d51406ab6e SHA1 336703907e8fbc77f751b508f7b65f7775539e65 SHA256 b31b90dd95563d796552d348fbf1158e9d0d93f4ca37ad596d57f22f133c9ac9
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3
new file mode 100644
index 000000000000..8cc5ff49963f
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3
@@ -0,0 +1,32 @@
+@version: 3.0
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3,v 1.1 2010/04/06 02:11:35 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); 
+};
+
+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 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3
new file mode 100644
index 000000000000..0f708c149cee
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3
@@ -0,0 +1,24 @@
+@version: 3.0
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3,v 1.1 2010/04/06 02:11:35 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.rc6.3 b/app-admin/syslog-ng/files/syslog-ng.rc6.3
new file mode 100644
index 000000000000..7bd8120e469d
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.rc6.3
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2004 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.rc6.3,v 1.1 2010/04/06 02:11:35 mr_bones_ Exp $
+
+opts="checkconfig reload"
+
+depend() {
+	# Make networking dependency conditional on configuration
+	case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
+		*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
+			need net
+			use stunnel ;;
+	esac
+
+	config /etc/syslog-ng/syslog-ng.conf
+	use clock
+	need hostname localmount
+	provide logger
+}
+
+checkconfig() {
+	if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
+		eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
+		eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
+		return 1
+	fi
+	syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
+	
+	# the start and reload functions have their own eends so 
+	# avoid calling this twice when there are no problems
+	[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting syslog-ng"
+	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
+	start-stop-daemon --start --pidfile /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
+	eend $? "Failed to start syslog-ng"
+}
+
+stop() {
+	ebegin "Stopping syslog-ng"
+	start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
+	eend $? "Failed to stop syslog-ng"
+	sleep 1 # needed for syslog-ng to stop in case we're restarting
+}
+
+reload() {
+	if [ ! -f /var/run/syslog-ng.pid ]; then
+		eerror "syslog-ng isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --stop --oknodo --signal HUP \
+	    --pidfile /var/run/syslog-ng.pid
+	eend $?
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild
index 64939c490ef3..6a24ed30bdba 100644
--- a/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.0.5-r1.ebuild,v 1.1 2010/04/05 22:19:33 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.0.5-r1.ebuild,v 1.2 2010/04/06 02:11:35 mr_bones_ Exp $
 
 EAPI=2
 inherit fixheadtails eutils
@@ -76,11 +76,11 @@ src_install() {
 	# Install default configuration
 	insinto /etc/syslog-ng
 	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%%.*}" syslog-ng.conf
 	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%%.*}" syslog-ng.conf
 	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%%.*}" syslog-ng.conf
 	fi
 
 	insinto /etc/logrotate.d
@@ -91,7 +91,7 @@ src_install() {
 		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
 	fi
 
-	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}-r1" syslog-ng
+	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng
 	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
 }
 
diff --git a/app-admin/syslog-ng/syslog-ng-3.1.0.ebuild b/app-admin/syslog-ng/syslog-ng-3.1.0.ebuild
new file mode 100644
index 000000000000..c5a46f162a9f
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.1.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 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.1.0.ebuild,v 1.1 2010/04/06 02:11:35 mr_bones_ Exp $
+
+EAPI=2
+inherit fixheadtails eutils
+
+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/${PV}/source/syslog-ng_${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 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 )
+	>=dev-libs/eventlog-0.2
+	>=dev-libs/glib-2.10.1:2
+	caps? ( sys-libs/libcap )
+	sql? ( >=dev-db/libdbi-0.8.3 )"
+RDEPEND="
+	!static? (
+		pcre? ( dev-libs/libpcre )
+		${LIBS_DEPEND}
+	)"
+DEPEND="${RDEPEND}
+	${LIBS_DEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex"
+PROVIDE="virtual/logger"
+
+src_prepare() {
+	ht_fix_file configure
+}
+
+src_configure() {
+	local myconf
+
+	if use static ; then
+		myconf="${myconf} --enable-static-linking"
+		if use pcre ; then
+			ewarn "USE=pcre is incompatible with static linking"
+			myconf="${myconf} --disable-pcre"
+		fi
+	else
+			myconf="${myconf} --enable-dynamic-linking"
+	fi
+	econf \
+		--disable-dependency-tracking \
+		--sysconfdir=/etc/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		$(use_enable caps linux-caps) \
+		$(use_enable ipv6) \
+		$(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 \
+		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
+		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
+	elif use userland_BSD ; then
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%%.*}" syslog-ng.conf
+	else
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%%.*}" syslog-ng.conf
+	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
+	else
+		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+	fi
+
+	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+}
+
+pkg_postinst() {
+	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
+}