new code base version bump; includes initial conf.d support for bug #101387 with modified patch from Miguel Sousa Filipe

(Portage version: 2.1.1-r1)

5 files changed, 88 insertions, 3 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index b97d9584a3ae..c7f963561242 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.135 2006/11/02 19:26:02 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.136 2006/11/02 20:51:37 mr_bones_ Exp $
+
+*syslog-ng-2.0.0 (02 Nov 2006)
+
+  02 Nov 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/syslog-ng.confd, files/syslog-ng.rc6, +syslog-ng-2.0.0.ebuild:
+  new code base version bump; includes initial conf.d support for bug #101387
+  with modified patch from Miguel Sousa Filipe
 
   02 Nov 2006; Joel Martin <kanaka@gentoo.org> syslog-ng-1.6.11.ebuild:
   Add ROOT to with-libol configure switch.
diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0 b/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0
new file mode 100644
index 000000000000..41db1b198553
--- /dev/null
+++ b/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0
@@ -0,0 +1,3 @@
+MD5 134db2e3d7b16bb70fd86d749cc2e4fd syslog-ng-2.0.0.tar.gz 337553
+RMD160 ed2c3ff8eea834c0c2fdae03ce2f9068a6d24128 syslog-ng-2.0.0.tar.gz 337553
+SHA256 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7 syslog-ng-2.0.0.tar.gz 337553
diff --git a/app-admin/syslog-ng/files/syslog-ng.confd b/app-admin/syslog-ng/files/syslog-ng.confd
new file mode 100644
index 000000000000..170862fbf436
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/syslog-ng
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6
index 5b9609b7366f..f70381ca1861 100644
--- a/app-admin/syslog-ng/files/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/syslog-ng.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.17 2004/12/14 23:16:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.18 2006/11/02 20:51:37 mr_bones_ Exp $
 
 opts="depend checkconfig start stop reload"
 
@@ -29,7 +29,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting syslog-ng"
-	start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng
+	[[ -n ${SYSLOG_NG_OPTS} ]] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
 	eend $? "Failed to start syslog-ng"
 }
 
diff --git a/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild b/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild
new file mode 100644
index 000000000000..bf72bcf381a5
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.0.0.ebuild,v 1.1 2006/11/02 20:51:37 mr_bones_ Exp $
+
+inherit fixheadtails
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/syslog-ng/2.0/src/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="hardened selinux static ipv6"
+
+RDEPEND=">=dev-libs/eventlog-0.2
+	>=dev-libs/glib-2.2"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+PROVIDE="virtual/logger"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ht_fix_file configure
+	cd "${S}/doc/reference"
+	tar xzf syslog-ng.html.tar.gz || die "tar failed"
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/syslog-ng \
+		--disable-dependency-tracking \
+		$(use_enable ipv6) \
+		$(use_enable !static dynamic-linking) \
+		$(use_enable static static-linking) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
+		contrib/syslog-ng.conf* \
+		doc/reference/syslog-ng.txt \
+		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
+	dohtml doc/reference/syslog-ng.html/*
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use hardened || use selinux ; then
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf
+	else
+		newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	# Install snippet for logrotate, which may or may not be installed
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+}