old

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 6 insertions, 261 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/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
-}