old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 7 insertions, 167 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 9c526c216015..f40312c3b18b 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.413 2014/12/19 02:57:42 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.414 2015/03/14 02:56:13 mr_bones_ Exp $
+
+  14 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.4/syslog-ng-3.4.2-autotools.patch,
+  -files/3.4/syslog-ng-3.4.2-compile.patch, -syslog-ng-3.4.7.ebuild:
+  old
 
   19 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
   +files/3.6/syslog-ng-3.6.2-redis.patch, -files/3.5/syslog-ng.conf.gentoo,
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch
deleted file mode 100644
index c57f9f510473..000000000000
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- syslog-ng-3.4.1.orig/configure.in
-+++ syslog-ng-3.4.1/configure.in
-@@ -68,7 +68,7 @@
- pidfiledir='${localstatedir}'
- moduledir='${exec_prefix}/lib/syslog-ng'
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl ***************************************************************************
- dnl Arguments
-@@ -227,7 +227,6 @@
- dnl ***************************************************************************
- dnl Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_CC_C99
- if test "x$ac_cv_prog_cc_c99" = "xno"; then
- 	AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
---- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
-+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
-@@ -15,7 +15,7 @@
- 
- AC_CONFIG_MACRO_DIR([m4])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
- vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
-@@ -24,7 +24,6 @@
- dnl ***************************************************************************
- dnl Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- LT_INIT([shared])
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch
deleted file mode 100644
index ad72bdb0c3d0..000000000000
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- syslog-ng-3.4.1/lib/persist-state.c
-+++ syslog-ng-3.4-master/lib/persist-state.c
-@@ -26,6 +26,7 @@
- #include "serialize.h"
- #include "messages.h"
- #include "mainloop.h"
-+#include "misc.h"
- 
- #include <sys/types.h>
- #include <unistd.h>
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild
deleted file mode 100644
index ee3c38b22fe1..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 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.4.7.ebuild,v 1.13 2014/06/10 00:00:00 vapier Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/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+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
-RESTRICT="test"
-
-RDEPEND="
-	pcre? ( dev-libs/libpcre )
-	spoof-source? ( net-libs/libnet:1.1 )
-	ssl? ( dev-libs/openssl:= )
-	smtp? ( net-libs/libesmtp )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/eventlog-0.2.12
-	>=dev-libs/glib-2.10.1:2
-	json? ( >=dev-libs/json-c-0.9 )
-	caps? ( sys-libs/libcap )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
-	cd "${TMPDIR}" || die
-
-	for f in *logrotate*.in ; do
-		if use systemd ; then
-			sed \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
-				$f > ${f/.in/} || die
-		else
-			sed \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
-				$f > ${f/.in/} || die
-		fi
-	done
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		--with-ivykis=internal \
-		--with-libmongo-client=internal \
-		--sysconfdir=/etc/syslog-ng \
-		--localstatedir=/var/lib/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		$(systemd_with_unitdir) \
-		$(use_enable systemd) \
-		$(use_enable caps linux-caps) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(use_enable pcre) \
-		$(use_enable smtp) \
-		$(use_enable spoof-source) \
-		$(use_enable dbi sql) \
-		$(use_enable ssl) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	# -j1 for bug #484470
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
-		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
-		"${TMPDIR}/syslog-ng.logrotate.hardened" \
-		"${FILESDIR}/README.hardened"
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
-	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/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
-}