[gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng: syslog-ng-3.5.3.ebuild syslog-ng-3.4.7.ebuild syslog-ng-3.4.2.ebuild ChangeLog

[Michael Sterrett (mr_bones_)]

mr_bones_    14/01/22 04:25:36

  Modified:             syslog-ng-3.4.7.ebuild syslog-ng-3.4.2.ebuild
                        ChangeLog
  Added:                syslog-ng-3.5.3.ebuild
  Log:
  add first version from the 3.5 branch, currently masked; also fix bugs #497448 and #498038
  
  (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  app-admin/syslog-ng/syslog-ng-3.4.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild?r1=1.1&r2=1.2

Index: syslog-ng-3.4.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syslog-ng-3.4.7.ebuild	31 Dec 2013 08:24:58 -0000	1.1
+++ syslog-ng-3.4.7.ebuild	22 Jan 2014 04:25:36 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1 2013/12/31 08:24:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.7.ebuild,v 1.2 2014/01/22 04:25:36 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils multilib systemd
@@ -35,8 +35,26 @@
 
 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 \
@@ -64,7 +82,7 @@
 
 	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
 		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
-		"${FILESDIR}/syslog-ng.logrotate.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" \
 		"${FILESDIR}/README.hardened"
 
 	# Install default configuration
@@ -76,7 +94,7 @@
 	fi
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
 
 	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
 	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng



1.13                 app-admin/syslog-ng/syslog-ng-3.4.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild?r1=1.12&r2=1.13

Index: syslog-ng-3.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- syslog-ng-3.4.2.ebuild	13 Nov 2013 17:29:42 -0000	1.12
+++ syslog-ng-3.4.2.ebuild	22 Jan 2014 04:25:36 -0000	1.13
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.2.ebuild,v 1.12 2013/11/13 17:29:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.2.ebuild,v 1.13 2014/01/22 04:25:36 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils multilib systemd
@@ -44,6 +44,7 @@
 
 src_configure() {
 	econf \
+		--disable-docs \
 		--with-ivykis=internal \
 		--with-libmongo-client=internal \
 		--sysconfdir=/etc/syslog-ng \



1.373                app-admin/syslog-ng/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/ChangeLog?rev=1.373&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/ChangeLog?rev=1.373&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/ChangeLog?r1=1.372&r2=1.373

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- ChangeLog	31 Dec 2013 08:30:20 -0000	1.372
+++ ChangeLog	22 Jan 2014 04:25:36 -0000	1.373
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/syslog-ng
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.372 2013/12/31 08:30:20 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.373 2014/01/22 04:25:36 mr_bones_ Exp $
+
+*syslog-ng-3.5.3 (22 Jan 2014)
+
+  22 Jan 2014; Michael Sterrett <mr_bones_@g.o>
+  +files/3.5/syslog-ng.conf.gentoo, +files/3.5/syslog-ng.conf.gentoo.fbsd,
+  +files/3.5/syslog-ng.conf.gentoo.hardened, +files/3.5/syslog-ng.confd,
+  +files/3.5/syslog-ng.rc6, +files/syslog-ng.logrotate.hardened.in,
+  +files/syslog-ng.logrotate.in, +syslog-ng-3.5.3.ebuild,
+  syslog-ng-3.4.2.ebuild, syslog-ng-3.4.7.ebuild:
+  add first version from the 3.5 branch, currently masked; also fix bugs #497448
+  and #498038
 
   31 Dec 2013; Michael Sterrett <mr_bones_@g.o> -syslog-ng-3.4.5.ebuild,
   -syslog-ng-3.4.6.ebuild:



1.1                  app-admin/syslog-ng/syslog-ng-3.5.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.3.ebuild?rev=1.1&content-type=text/plain

Index: syslog-ng-3.5.3.ebuild
===================================================================
# 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.3.ebuild,v 1.1 2014/01/22 04:25:36 mr_bones_ 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 ~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.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
}