old

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

4 files changed, 6 insertions, 204 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 785f096bfaf7..169f0e515ef9 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.411 2014/12/18 19:51:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.412 2014/12/18 23:05:40 mr_bones_ Exp $
+
+  18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/3.6/syslog-ng-3.6.1-link-smtp.patch,
+  -files/3.6/syslog-ng-3.6.1-warnings.patch, -syslog-ng-3.6.1.ebuild:
+  old
 
   18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org>
   files/3.6/syslog-ng.confd, files/3.6/syslog-ng.rc6:
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-link-smtp.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-link-smtp.patch
deleted file mode 100644
index d38f347a5670..000000000000
--- a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-link-smtp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/afsmtp/Makefile.am.orig	2014-11-09 02:47:00.110145300 -0500
-+++ modules/afsmtp/Makefile.am	2014-11-09 02:47:13.996684666 -0500
-@@ -12,7 +12,7 @@
- 	modules/afsmtp/afsmtp-parser.c		\
- 	modules/afsmtp/afsmtp-parser.h
- modules_afsmtp_libafsmtp_la_LIBADD	=	\
--	$(LIBESMTP_LIBS) $(MODULE_DEPS_LIBS) $(CRYPTO_LIBS)
-+	$(MODULE_DEPS_LIBS) $(LIBESMTP_LIBS) $(CRYPTO_LIBS)
- modules_afsmtp_libafsmtp_la_LDFLAGS	=	\
- 	$(MODULE_LDFLAGS)
- modules_afsmtp_libafsmtp_la_DEPENDENCIES=	\
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch
deleted file mode 100644
index f92e6f289991..000000000000
--- a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.1-warnings.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 15af882cff915eada828114bdbcf2b7d19595b67 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon@madhouse-project.org>
-Date: Thu, 4 Dec 2014 10:29:36 +0100
-Subject: [PATCH] hostname: Demote the FQDN warning to a verbose message
-
-On a lot of desktop machines (and in private networks), the hostname
-will not be fully qualified, so the warning is just noise. Demote it to
-a message only displayed in verbose mode.
-
-This fixes the other half of #329.
-
-Reported-by: Peter Czanik <czanik@balabit.hu>
-Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
----
- lib/hostname.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/hostname.c b/lib/hostname.c
-index b65d8a1..5af34ec 100644
---- a/lib/hostname.c
-+++ b/lib/hostname.c
-@@ -135,8 +135,8 @@ detect_local_fqdn_hostname(void)
-       hostname = get_local_fqdn_hostname_from_dns();
-       if (!hostname)
-         {
--          msg_warning("Unable to detect fully qualified hostname for localhost, use_fqdn() will use the short hostname",
--                     NULL);
-+          msg_verbose("Unable to detect fully qualified hostname for localhost, use_fqdn() will use the short hostname",
-+                      NULL);
-           hostname = get_local_hostname_from_system();
-         }
-     }
-From 1ddfe7878f1089b20e854f30a6bdb9acb5c6f423 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon@madhouse-project.org>
-Date: Thu, 4 Dec 2014 10:27:28 +0100
-Subject: [PATCH] system-source: Demote the json-parser() warning to a debug
- message
-
-Not having the json module installed by default is fairly common, @cim
-messages on the other hand, are not. To make startup less annoying for a
-large number of users, demote the warning about json-parser() missing to
-a debug message.
-
-This addresses one part of #329.
-
-Reported-by: Peter Czanik <czanik@balabit.hu>
-Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
----
- modules/system-source/system-source.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/system-source/system-source.c b/modules/system-source/system-source.c
-index b9580e4..7228dd4 100644
---- a/modules/system-source/system-source.c
-+++ b/modules/system-source/system-source.c
-@@ -323,8 +323,8 @@ system_generate_cim_parser(GlobalConfig *cfg, GString *sysblock)
- 
-   if (!_is_json_parser_available(cfg))
-     {
--      msg_warning_once("system(): json-parser() is missing, skipping the automatic JSON parsing of messages submitted via syslog(3), Please install the json module",
--                       NULL);
-+      msg_debug("system(): json-parser() is missing, skipping the automatic JSON parsing of messages submitted via syslog(3), Please install the json module",
-+                NULL);
-       return;
-     }
- 
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild
deleted file mode 100644
index 30a83f3b21cb..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild
+++ /dev/null
@@ -1,126 +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.6.1.ebuild,v 1.3 2014/12/04 21:12:51 mr_bones_ Exp $
-
-EAPI=5
-inherit autotools eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-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="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
-RESTRICT="test"
-
-RDEPEND="
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	json? ( >=dev-libs/json-c-0.9 )
-	redis? ( dev-libs/hiredis )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/libpcre
-	>=dev-libs/eventlog-0.2.12
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${MY_PV_MM}"/${P}-link-smtp.patch \
-		"${FILESDIR}/${MY_PV_MM}"/${P}-warnings.patch
-	eautoreconf
-	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() {
-	#adddeny $(echo /usr/$(get_libdir)/libsyslog* | sed 's/ /:/g')
-	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 pacct) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
-		$(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.md CONTRIBUTING.md contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/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}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/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.6-guides/en/syslog-ng-ose-v3.6-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
-}