old

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

5 files changed, 8 insertions, 172 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/Manifest b/app-admin/syslog-ng/Manifest
index af61d1270010..8007dc5fa3d6 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,3 @@
-AUX 3.4/syslog-ng-3.4.2-autotools.patch 1313 SHA256 20b6fc12f119d548536435ad7c5e166488443eeebe8ee08e30adefa6038aafa3 SHA512 c5b84bc32c9b019452b8b3f369dc4689e40b59dc392e448412e14730679d452d4323d70ae73cc6fd126a44df6331c18d2168f05675a399e2ba868115944880ed WHIRLPOOL f7bc249b6ea28db74661b6682ff3c377b80ffeaa28412bfa378686f435a617d972a81d8dfc9382f2f8c44062ee35fc9e3217ef40a04d55f1bcf6578fb88e2c63
-AUX 3.4/syslog-ng-3.4.2-compile.patch 239 SHA256 1400220d00e35261afdb93e9f199e5527ad8f6cd14f0b1fc7f89e6668b09979a SHA512 f8ec051d4fecb88f26279bb510ff892e93b9a211b5bd9312f734846a3108a6645d1de355c5d3aadb6fddd8e01bba40fd6489a6bf8f6a2f73466016b24bcbe930 WHIRLPOOL e7550d9def8c94e81eb9b7501d79b79acaa6fe6aeada4cf0840b72e65520a529010c8aa36df6221639226f2a53ee78f28993219364b2d500a49daa0261b78f55
 AUX 3.4/syslog-ng.conf.gentoo 1332 SHA256 949c0f2a9f4351be23249ba1b7763b5d4ff9ab4907c1211cc3e92b6bc9705c8e SHA512 bdbcfa27368ed75daac153d91c50555bea892f492639a2448e47a6f38a9b84808eedd35db09347a385c70725ab8349798f624aa5e2f730fb99b2986d05afb1a4 WHIRLPOOL d639db780aa07438e1a33b85cf3f388782f84fe884b95303605ccd58bf95232e5e013c5d491b44034e7d90121064b9c749d91c2fa6352ccb44db90d12d792d82
 AUX 3.4/syslog-ng.conf.gentoo.fbsd 727 SHA256 d45f4befbf3f098a4a3e7bff80a6536931c3386eb94145f8e7495d9eb8ece0fc SHA512 a8f94d3cd4f120c3cb69f4e938877f62e87f7a6a3f422575e130b49ed3fa37effc6dc0c53398031602f9bcf26a1ce3b5267701483f045829960796098e843fb0 WHIRLPOOL 37ceec9bb7a1cc829b1eeb1aa8e9af162b67e90e03d862bc215150e011ad8be433270d658029fd72963d2486c72f5046e9d6e007a62f170c1295d61d68b62ca4
 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098
@@ -16,11 +14,9 @@ AUX syslog-ng.logrotate 354 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd
 AUX syslog-ng.logrotate.hardened 1742 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f SHA512 2f751bc34e2de833b764f4fc1ccb2fc0337c1d3f84bd30194897972270ef6fc502ff3822912921a15479bea273bc0aa4eeec8c68d672ce1edcdcb5cfed70926a WHIRLPOOL b80fe444f140f842677dc59cef7d19e777429e2983a808c264bed1436f505052bc239f8238ad5d739d50eb21e1f36b5f52d45010d6b3b3ae8fd296a7c4939608
 AUX syslog-ng.logrotate.hardened.in 1653 SHA256 78e3db0f0a75dfc74d9a34cd865cd02c97e37c0eb505968700faf9b6c154ac46 SHA512 a2e2e9175fc32a4c717629526940dcc6f323147e40833118ceffbd44413bfb320f94e07fdef0b99a64f72c5e7f7aa00447f81d85f8c716982636dd3241f7f955 WHIRLPOOL 03f691e64a1184526acfeaeb6187443becc7816f558774faeb1d5ee785cc09fd35f444bf79451bd91754c558b4e17caa10c69430ae3e10aed4458b108cc80c93
 AUX syslog-ng.logrotate.in 345 SHA256 7e854cbac5b376b3d1d6906fed4cff794e17998c04c647239da4245f112cf97f SHA512 d729111944527fc269e884c12fc628b95a9b83757c756a18c2e45355a7df6ed7802d1bfc0d1af37e3d5b07deaad6f42a38c70dc899835d659dd12917204b15ae WHIRLPOOL 4ae7fbe448e346265117c0fa407b6632d698cab4514937f699195306228a7b81b70cecc23937f336f808fe35fbeeaec4ec97cba8684897dcf06ffa6eecd4ea4b
-DIST syslog-ng_3.4.7.tar.gz 3203894 SHA256 7b1114ff0bd9d2c52a8ce407f0f59102ea4123ff7efb3f84253961e0de6ac1b0 SHA512 66c1dafaa9441fd909b450e79ec3d1011bd423301602b0eea372e141ff267ddb60aa0280ef49b1f62d24b3f17fc1909a6ce8cc5bea0e3c6708df64815a534279 WHIRLPOOL b3b9aef566cc4577b4ec6ad96f696e29abd84d663205cadca766a50c933d29e3b195b6679cbb8e0edca96cc6995ab10fe409531eb15c90bfeb82a598ad7cf3fe
 DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
 DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
-EBUILD syslog-ng-3.4.7.ebuild 3448 SHA256 66362e51bac724761c1d558313bd4b66fba6431a5334fe8e1c7989ccf12c977f SHA512 797279853096b6b51c45e63a57493ddb8f12586bc70f9736a4e1ae2c3659a761a432246c7a185d8663e7261a6158071239cc6cf6320c062245463f9dc50a8a92 WHIRLPOOL 636ab2e781b8af18768e494698c16367c892de018799b1dedb9a1c474e4017839a87b06d1aed3ac09bca1b00bebd7c3dc42eed5bf0d7047db6888c9e6bd9e681
 EBUILD syslog-ng-3.4.8.ebuild 3588 SHA256 2bf7cb39b5486e7a6b95834ad87ec19a0d00e93126fc57dd826b6bebc3e9e844 SHA512 32eadb10f65970756a30d852dcb14bf0296425e5c256182956d3cc42b8571c46df3a293da40a9ff730046252a3e078413e11543176c39586d5dbcea970e41939 WHIRLPOOL ebbb2b786c6061017d0a69878fb6811d7b97495f948e5c46d8dff695281b864e6f8a8d177f71c7a75652905f4f511c479e26868ccebb7838c211a8dda8ecfc9d
 EBUILD syslog-ng-3.6.2.ebuild 3822 SHA256 5bbd53a0fc84d8e0f5a108cce466beac0dbff3e0d5a787bb040aae9b74b3185d SHA512 14a3368135c8e06f80a4a65da4754a381ca3f179c543ea5069c005ddefe541957e298f48a24aa1c609223b192849cddb18939bab1ab60c0c91fc61f30af1d42a WHIRLPOOL 3bf40fb42587ad510849851aaf29c77e654b0857257742152c2d11c4ac2e4d1cad24d7168f699ba16bf79267d36313394ff2ffc69f94840bb186d89ec5a96a9b
-MISC ChangeLog 58231 SHA256 feb6a8ac3e4365eafce881318e287d626a7ce8e2751cd1ad317b6791d31d792a SHA512 a4ae5b67c8586399a1e072e597f76d2e36e1e02c6e32456dbe61fc1ac2da15284e623a4f44a1b0f003bbfccabc10a31f722bf0df71b870261688715b8843b858 WHIRLPOOL 259301ed37848e34916ade078616f05058d0a1e3cb7ba702014ca2d3d30407ba8c600488812124010f17d767f297b4d4ed96751df107b47e30c49b848a458642
+MISC ChangeLog 58408 SHA256 3a4c2668604ac76ca669e1d90d1a876c885230ff68dea1a58a411466883f02d4 SHA512 a9d60782f1dc32159af2e4e79bdf37d86d47da19bfef2cfc3f202f7de2d0310cb96c467c57830c72631afd072000d6dde33d8163ab69c6b4b2deb39837d15a49 WHIRLPOOL dbc55ceaba617e96f4c26e301bb8a095c9e3166b22f03999d2d10d63704d956f9fdeac1dbe534cb81daad621349f0433eacf6eb469e68efdb7967be5b109a104
 MISC metadata.xml 792 SHA256 9116bcafb5bc0f8cb3e27e43b474bb387de0467f47fe81f2a2da462cd1438834 SHA512 d81f3f86da8fa594eca1b2224ffe4e07c467f63aee77273b91df7b91256d54653c70b1a3c6543f1a6ce51594f75fdb4245d4ad6766d687275efe7b1811b317a4 WHIRLPOOL efc50cd99fe30a65e83b180794e3d9f58e09f6680c14ea038e09746f414b83c5ba3380d0c6796cca254a4ab81ce676f9dbdefb577abc5a39a26281a8ef9010d2
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
-}