old

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

6 files changed, 7 insertions, 268 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 8b2f314f81fe..2b8e759b9915 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
 # 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.326 2012/05/03 18:02:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.327 2012/05/29 20:44:11 mr_bones_ Exp $
+
+  29 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng-3.3.4-compile.patch, -files/syslog-ng-3.3.4-memleak.patch,
+  -syslog-ng-3.2.4.ebuild, -syslog-ng-3.3.4.ebuild:
+  old
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> syslog-ng-3.2.4.ebuild,
   syslog-ng-3.2.5.ebuild, syslog-ng-3.3.4.ebuild, syslog-ng-3.3.5.ebuild:
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index dec67cce4452..c84619d25a3b 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,3 @@
-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
@@ -15,13 +13,9 @@ AUX syslog-ng.logrotate 354 RMD160 120e617e36299bd7bea2ec226c2cda6e1574b793 SHA1
 AUX syslog-ng.logrotate.hardened 1742 RMD160 fd60ca606aec32eae51e3c219fd86124ca1f8cf6 SHA1 675f800200b37496a0335cd27e289b24c8d4f259 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f
 AUX syslog-ng.rc6.3 1871 RMD160 4754eedc2451d417282a7619981eb2ba9a1da5ea SHA1 4c77e51014655bef4610cf1ab9f46e38885e2f37 SHA256 72ff545c9196eee9782ec490f6585d9f0f4367d226234f50ddfb222d2fbc32aa
 AUX syslog-ng.rc6.3.3 2365 RMD160 10b6390ec6853b4b571ae8f0a1ff8b904a91ff66 SHA1 9bc278a9c59d71324db4c5ba23bfcda807f8a491 SHA256 fef807344eb4ce4867e9b155be1ed1ccc66e29174746a8948a74c517257f8b33
-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 3289 RMD160 b74821b1bb07e1c3f4074f325c6bc578f684fb4a SHA1 58db94b02ef2e795ab1d955e85012a265ad8d8c9 SHA256 9e03f45e41ebd275dc2fd1ceb8858909d9e33acbbd2ad5061d9143b5d364a7b0
 EBUILD syslog-ng-3.2.5.ebuild 2852 RMD160 72313046caa181f74c89b4a9d8e34a09e49672ec SHA1 463c87c11031ce7c78b9b16c6f693bdc4b37b03a SHA256 2f0de5b0f8296b0d4e4d00c206bea5b1b28f31ff1c51879ec72dd3aa8f306375
-EBUILD syslog-ng-3.3.4.ebuild 3728 RMD160 a836ae6c93677023f4aedd7175bbd25459f56ca4 SHA1 cd1bb60109475814ce847818b02e521cf3043035 SHA256 922d0ec118eee4d1dc8094128b49f802e895ddb893fbcb5ddbaf990ca57f30e2
 EBUILD syslog-ng-3.3.5.ebuild 3812 RMD160 c1702761b8d7d0d8aa11ac99805506bf74384b3f SHA1 7a42ca5771e2e5429debfe49f0d537480de1ef6a SHA256 0c16dd40f42b658c6b1e0e80b6fc2a9a2c8265c935ca633cfda28aab07a8827b
-MISC ChangeLog 44958 RMD160 04f2dc980f7d3319e78a76ba0a3b42b21a0f9793 SHA1 351f316154a94e5f4102b2c32890c45a7340adf2 SHA256 a7db070f1ed0e8aa778d4cbac3a60e02af43f231416175c2ded400d2a0bf3280
+MISC ChangeLog 45153 RMD160 9860ed38a1814d667fac0ec01ce8f71d6c25c16d SHA1 db4debdd3cd742c9cd7b501ff2de061975dea440 SHA256 02535782366b5c5ac4a40747c2b41271007aa636fd83b72ae11d09dc3bad5f66
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
deleted file mode 100644
index a2ad347722d2..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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.4-memleak.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
deleted file mode 100644
index e0aee5cffd78..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/logwriter.c b/lib/logwriter.c
-index 1c4f1c7..4411826 100644
---- a/lib/logwriter.c
-+++ b/lib/logwriter.c
-@@ -1016,7 +1016,7 @@ struct _LogWriter
-         {
-           /* push back to the queue */
-           log_queue_push_head(self->queue, lm, &path_options);
--
-+          log_msg_unref(lm);
-           msg_set_context(NULL);
-           log_msg_refcache_stop();
-           break;
diff --git a/app-admin/syslog-ng/syslog-ng-3.2.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.2.4.ebuild
deleted file mode 100644
index 32643dbc04fe..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.2.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.2.4.ebuild,v 1.10 2012/05/03 18:02:22 jdhore 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/${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 )
-	!static? ( >=dev-libs/eventlog-0.2.12 )
-	>=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}
-	static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
-	virtual/pkgconfig
-	sys-devel/flex"
-
-src_prepare() {
-	ht_fix_file configure.in
-	eautoreconf
-}
-
-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 \
-		--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 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 || 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
-}
-
-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
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
deleted file mode 100644
index 26dbca9b1dc6..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.4.ebuild,v 1.5 2012/05/03 18:02:22 jdhore 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] )
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-compile.patch \
-		"${FILESDIR}"/${P}-memleak.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
-}