3.5 branch version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 130 insertions, 2 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 594926a24ffb..e49163f0a8ea 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.392 2014/07/08 17:06:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.393 2014/07/21 15:51:50 mr_bones_ Exp $
+
+*syslog-ng-3.5.5 (21 Jul 2014)
+
+  21 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> +syslog-ng-3.5.5.ebuild:
+  3.5 branch version bump
 
   08 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.8.ebuild:
   add amqp use flag (bug #516704)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 3919a0dad4b3..dc730fffbf53 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -19,8 +19,10 @@ AUX syslog-ng.logrotate.in 345 SHA256 7e854cbac5b376b3d1d6906fed4cff794e17998c04
 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.5.4.1.tar.gz 3034040 SHA256 92c6969e4172b4fd32390f80043b4de7b116f29989d8c2e5a8a687ee6dcd6f66 SHA512 4068b1e1fc6ef52075002c9306885cb3b70d5e681077dd2bff7c5dfd83885f4967c9246692c0e886343269cdd5f02b2416999e5e381a076354da96bc7dc13766 WHIRLPOOL c8f6d3ff7dbd92c17c3f3a76d0acbe23fcfff0d5bb6dc9f2cd5c0bcec402276d5e1d50bb21939dcc89114b6f94aea143b3cf3fc0a7ab2cd3683740c6a3665e07
+DIST syslog-ng_3.5.5.tar.gz 3001703 SHA256 3c5e90e49783eb716ec08d9d60722993cb0b8b0ce8a385615ed244f7c9a1ef42 SHA512 ad298ff50403a248a2c927bb5b805a9d35c8593692c381d113f93eeb81c876e775fb4eaeb81d4a46e357ee3fcf99929da2e62226afb6f1b5bf5bdbc4f512d059 WHIRLPOOL d2a3c1938ec97c7de9b8471e9ff9f743ed6f3bbc89ae3c77789e6ac38d69909882bc9d9f7463a3d051022c71003224939632fa7efecdc2156462c4169bef055d
 EBUILD syslog-ng-3.4.7.ebuild 3448 SHA256 66362e51bac724761c1d558313bd4b66fba6431a5334fe8e1c7989ccf12c977f SHA512 797279853096b6b51c45e63a57493ddb8f12586bc70f9736a4e1ae2c3659a761a432246c7a185d8663e7261a6158071239cc6cf6320c062245463f9dc50a8a92 WHIRLPOOL 636ab2e781b8af18768e494698c16367c892de018799b1dedb9a1c474e4017839a87b06d1aed3ac09bca1b00bebd7c3dc42eed5bf0d7047db6888c9e6bd9e681
 EBUILD syslog-ng-3.4.8.ebuild 3601 SHA256 a2380d9ab0cd69aaf6b48537b2af315fe64aaded82551e45f216217fd21df3cd SHA512 41b6eb652f2d3a07722063c0927bc88837d85eb12ac9d4001f4ccef7eacabbf92f7298c46cf1461ff2d01918626ce2b573f5526fd609855d65b71a5a859e5fce WHIRLPOOL d8388213696ba9fc35e502b2c889ed76f8210ba7c63829827cd2d8d1a84bd320868868b06b93b684c72d2e9fb8e8209e94a2cefb5acf09351ebedcb23532a086
 EBUILD syslog-ng-3.5.4.1.ebuild 3727 SHA256 d03365ddc3d631b0c57714b4df3de493da26447f205f900dfbd186476bdb6e6e SHA512 08da9c71d2c413f5e66b3ca581c528b4534412f9b63994c918c6609c8568ee3fcaf56d4fa057d60c1ba3a7e5583170784a094f9be02085d6e6f550c887dca43d WHIRLPOOL 570ac82cd055992caf74196063fe2096cc163b3af5943bec1a5d3de984fbb299439f24a19bba65cc881ac0c5251b507f151bfdf17433b13e0b0cefb2f7476886
-MISC ChangeLog 55150 SHA256 a63c1efccee8879b20935131e93f82c807e9fd411fd3578fa003e9cbf428b8f4 SHA512 66e0f8392c4a2e6a3085302bcbd4f666548a9f489c9ec8091782c793b192a2a09283e8abec290ae068165e111b932519a73d0a6e529180b89d5b8cfe8c8a9f6d WHIRLPOOL 42e55d62eceb57528954e5387e9f41f215757f1fb8e6190113d2295a2eb667c31b7f8c893dcbf7bed714828a5b034f70fc43bb93e9cd097158893550c35de77c
+EBUILD syslog-ng-3.5.5.ebuild 3672 SHA256 2931a023f989568a9ed9c8895332a99d5748ecefb2c159419cf13b7d365e5420 SHA512 0a189043b4062bf5514342ddd2ab019479ac2b65ede7124288aafc31ee399b81881633d903eb428c782089dee48b10dfaaa51c61d067304cb4a1beff98d9038e WHIRLPOOL 76fb74c45ad720f1344c8be75534c436acf6e4d92920463ca090a93e9abea8c1c88b4a393dcaa2e71df387e871cbf1d3a72ed8bd14fbffcd0731512ef942eafd
+MISC ChangeLog 55289 SHA256 a40300ff681170e30c33295d5272a956465db6a58d34fefbc5716107ba9cfec7 SHA512 2899379cf774f2fcdc76b8058f27806ed3bb34f45941943efd5ecb7393d46dd769ae26935a675dd24d66ade9ae4ac6826925534ad2cef35312eb38bb4f872431 WHIRLPOOL ac58b3eea38ac3978d2a7349a931cb11e2728644e8f706ec6c643afd7ff60138dc8e9db029408671bfdef4fb8e335e6fa843891bb5c83d824ea67e507f47834a
 MISC metadata.xml 730 SHA256 2eb68f4d2372cf9d3d488fbb5cd94a938110ebaa2c6a17e1cda5028ee45e30f5 SHA512 ff7527055ed0bc13dbd78f697bb4f887484ce4430ec0fe100082d368e3a598a21b33fe6e0c2cdc9d6488afb96793510cb15e31c6eebdee25e097a09c723fdea7 WHIRLPOOL 2c7b0b1b523de14dd4a09b941affa9d15be8035e6d5d7e7ec2c8132640b9ee7867f413ff65750d390889de6374decda7a4851e1ef9f642fba40c35a8299dbcb2
diff --git a/app-admin/syslog-ng/syslog-ng-3.5.5.ebuild b/app-admin/syslog-ng/syslog-ng-3.5.5.ebuild
new file mode 100644
index 000000000000..e526a5666c2b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.5.5.ebuild
@@ -0,0 +1,121 @@
+# 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.5.5.ebuild,v 1.1 2014/07/21 15:51:50 mr_bones_ Exp $
+
+EAPI=5
+inherit 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 +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 pacct) \
+		$(use_enable pcre) \
+		$(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 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.5-guides/en/syslog-ng-ose-v3.5-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
+}