version bump

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

6 files changed, 234 insertions, 2 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 0ffaf4aa3535..e3a5946f6b53 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.323 2012/03/22 15:13:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.324 2012/04/23 19:50:28 mr_bones_ Exp $
+
+*syslog-ng-3.3.5 (23 Apr 2012)
+
+  23 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.3.5.ebuild,
+  +files/syslog-ng-3.3.5-afsocket.patch, +files/syslog-ng-3.3.5-compile.patch,
+  +files/syslog-ng-3.3.5-gprocess.patch:
+  version bump
 
   22 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.4.ebuild,
   +files/syslog-ng-3.3.4-memleak.patch:
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 8094963aad0f..4b6bcad577ea 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,8 @@
 AUX syslog-ng-3.3.4-compile.patch 250 RMD160 15a3e35ff6dc57df6315a4a96d4b399244c2cbdb SHA1 3e1036742ee63d3066cd4381dfc354a6d1b040b3 SHA256 831476d524a2fb32fe944a960f5adb4f97fde6ded8d84eb1ad9ef00b5f1a9354
 AUX syslog-ng-3.3.4-memleak.patch 396 RMD160 3c791d9471467ed95861d5789f824205a9fd7652 SHA1 2d6978b065dd5980a586801b0c168ec9ae81230c SHA256 3f686fcea0187bda3a76ca437e65e9c96b19174de7187de5ef1f82cfa4471ae5
+AUX syslog-ng-3.3.5-afsocket.patch 1384 RMD160 b3033d1c0a8b6f0ef69dbab4a16a26d0de354587 SHA1 1934361c9e4b48613cfd61adef24bb361e736c72 SHA256 d363ad6ee2d994ff7f3e32b6ea2ad3889033023332ffd76d963313716dc0dc59
+AUX syslog-ng-3.3.5-compile.patch 250 RMD160 15a3e35ff6dc57df6315a4a96d4b399244c2cbdb SHA1 3e1036742ee63d3066cd4381dfc354a6d1b040b3 SHA256 831476d524a2fb32fe944a960f5adb4f97fde6ded8d84eb1ad9ef00b5f1a9354
+AUX syslog-ng-3.3.5-gprocess.patch 1583 RMD160 0893375c6ac5dc3d01895f5fecad8c65babd7610 SHA1 42479089c1b5ad014d61c5adc010beb59c4c51bd SHA256 da5267e191690a38d63304f5943e79a3384bbb797f38e10604af85595e925402
 AUX syslog-ng.conf.gentoo.3.2 1314 RMD160 d8d12cbc02877baf4449590586798133d9914911 SHA1 af084e744864dcc292741df2cc701d1f8a982e00 SHA256 91221fe7aeb6dff126dd878f541366d00918a278f46348f6f763ad2cbc01ea19
 AUX syslog-ng.conf.gentoo.3.3 1330 RMD160 0b55e8910274e898e7244fc6594bee74ef559943 SHA1 b36b047d73d9a0084019fcddac7fb7a354b01bdc SHA256 e0ff88d28e0fa9b5b2b96b13df2f14f1957996959a95f7ec6135b51b242a98cd
 AUX syslog-ng.conf.gentoo.fbsd.3.2 689 RMD160 001482d7e90b44896d374f4a1049ece9541a8f2e SHA1 4be46d2f9461c45e743e10e69a4252ce599deee5 SHA256 7249cb13fff50e2695a427fe4dc1285dad6838f576304cb6ddde0c53ff9814ad
@@ -14,8 +17,10 @@ AUX syslog-ng.rc6.3.3 2365 RMD160 10b6390ec6853b4b571ae8f0a1ff8b904a91ff66 SHA1
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
 DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a834 SHA1 5541cd6711b7a9d983601d8047b9a27d98ecbe9b SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89
 DIST syslog-ng_3.3.4.tar.gz 2475254 RMD160 234a94e89a47f0520236c8a9a3d586d609a50476 SHA1 3437a50af027f281747087ab47a45aa5fbabbf14 SHA256 a7045694cd079a8efcfd73ca45cb7576f005ba26e6c83ccdfaf3cf81fa4e58aa
+DIST syslog-ng_3.3.5.tar.gz 2495235 RMD160 6b9debaf2c765b9ba8fc9ae580a74811699b6a90 SHA1 0c8b85079b60c68c4279bcd4124b1e3c6358407b SHA256 dcca69869ab3cf2afda6db0dad549b6be717f6cf6aa6d7f27ca10f9c4c6aaa75
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
 EBUILD syslog-ng-3.2.5.ebuild 2853 RMD160 d9966e53d279238a6a9375b4776d927d465578d4 SHA1 1b7abe82fbb27ef65118d025f07c2c4564378a0c SHA256 befb301abeadd1fc9aec194bb58a02fb9dab3e47f1e29054cb735c400451c501
 EBUILD syslog-ng-3.3.4.ebuild 3732 RMD160 075c02cd6cb99c8e1b5406249f7f36ef8c957760 SHA1 7a126da56f4ffc533cd01ee0484cd7dd5e3510eb SHA256 1c875ebb7262951c3aea4f1019e9e65647645e587481db8ae2799d680dd3983f
-MISC ChangeLog 44373 RMD160 63226362a58dd15930866931ab77f751df5f1c4c SHA1 3a95005ed716e63865441ad6bf433b8957a4a11a SHA256 9de1877690853fa2a72e9bdeaa4c749dc69ff68cae7a4fff49bd9d0922691067
+EBUILD syslog-ng-3.3.5.ebuild 3779 RMD160 c7e5061a55b4dc8a139a6147a3985bd0fe1320ac SHA1 56884069fa2ef842aa6d9762d8607ee2bf142702 SHA256 51a1d4274750850769849ad9d9a0cbf272bb0540b758ad97412488e0198604ed
+MISC ChangeLog 44621 RMD160 eaffcf27f0720e85488aa3fb6ff606771aa58ce5 SHA1 3adc3752c139aa6c8c71abde645be164c3865a64 SHA256 6054750bf449711fe7c6fd3b06d1e4d78748c6b7c4990ef56bff930f1ee74691
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch
new file mode 100644
index 000000000000..b26497f480f6
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch
@@ -0,0 +1,38 @@
+From algernon@balabit.hu Fri Apr 20 12:06:44 2012
+Date: Fri, 20 Apr 2012 18:06:31 +0200
+From: Gergely Nagy <algernon@balabit.hu>
+Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
+To: syslog-ng@lists.balabit.hu
+Subject: [syslog-ng] [PATCH] afsocket: Fix unix-dgram initialisation
+
+When initializing an unix-dgram socket, set self->fd to the acquired
+socket FD, so that fds inherited from systemd actually get used and
+polled on.
+
+Signed-off-by: Gergely Nagy <algernon@balabit.hu>
+---
+ modules/afsocket/afsocket.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/afsocket/afsocket.c b/modules/afsocket/afsocket.c
+index 5b192f4..c1bee5c 100644
+--- a/modules/afsocket/afsocket.c
++++ b/modules/afsocket/afsocket.c
+@@ -679,7 +679,7 @@ afsocket_sd_init(LogPipe *s)
+           if (sock == -1 && !afsocket_open_socket(self->bind_addr, !!(self->flags & AFSOCKET_STREAM), &sock))
+             return self->super.super.optional;
+         }
+-      self->fd = -1;
++      self->fd = sock;
+ 
+       if (!self->setup_socket(self, sock))
+         {
+-- 
+1.7.9.1
+
+
+______________________________________________________________________________
+Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
+Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
+FAQ: http://www.balabit.com/wiki/syslog-ng-faq
+
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch
new file mode 100644
index 000000000000..a2ad347722d2
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch
@@ -0,0 +1,10 @@
+--- ./lib/scratch-buffers.c.orig	2012-01-20 17:44:43.871103296 -0500
++++ ./lib/scratch-buffers.c	2012-01-20 17:44:56.313552034 -0500
+@@ -24,6 +24,7 @@
+ 
+ #include "tls-support.h"
+ #include "scratch-buffers.h"
++#include "misc.h"
+ 
+ TLS_BLOCK_START
+ {
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch
new file mode 100644
index 000000000000..6dc373bf6b61
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch
@@ -0,0 +1,44 @@
+From algernon@balabit.hu Fri Apr 20 10:34:44 2012
+Date: Fri, 20 Apr 2012 16:34:05 +0200
+From: Gergely Nagy <algernon@balabit.hu>
+Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
+To: syslog-ng@lists.balabit.hu
+Subject: [syslog-ng] [PATCH] lib/gprocess.c: Ignore SIGHUP inside the supervisor.
+
+Reloading syslog-ng's config is often done via a killall -HUP
+syslog-ng command, which also sends a signal to the
+supervisor. However, the supervisor did not handle said signal, thus
+it exited as is the default for it.
+
+To work around this issue, lets ignore SIGHUP inside the supervisor.
+
+Reported-by: Patrick Hemmer
+Signed-off-by: Gergely Nagy <algernon@balabit.hu>
+---
+ lib/gprocess.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/lib/gprocess.c b/lib/gprocess.c
+index aaefbab..9246d88 100644
+--- a/lib/gprocess.c
++++ b/lib/gprocess.c
+@@ -1110,7 +1110,9 @@ g_process_perform_supervise(void)
+                 g_process_message("Initialization failed but the daemon did not exit, even when forced to, trying to recover; pid='%d'", pid);
+               continue;
+             }
+-          
++
++          sigignore(SIGHUP);
++
+           if (process_opts.check_fn && (process_opts.check_period >= 0))
+             {
+               gint i = 1;
+-- 
+1.7.9.1
+
+
+______________________________________________________________________________
+Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
+Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
+FAQ: http://www.balabit.com/wiki/syslog-ng-faq
+
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.5.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.5.ebuild
new file mode 100644
index 000000000000..eb0746c927ad
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.3.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 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.5.ebuild,v 1.1 2012/04/23 19:50:28 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools 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-libs/glib-2.10.1:2[static-libs] )
+	dev-util/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-compile.patch \
+		"${FILESDIR}"/${P}-afsocket.patch \
+		"${FILESDIR}"/${P}-gprocess.patch
+	sed -i \
+		-e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' \
+		lib/Makefile.am || die
+	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 \
+		--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 \
+		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() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
+
+	# 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
+}