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

Package-Manager: portage-2.1.1-r1

6 files changed, 108 insertions, 21 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/Manifest b/app-admin/syslog-ng/Manifest
index ce5a12ee9cb3..0ca0122f74e8 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX syslog-ng.conf.debian 5445 RMD160 c3c2f319d437bb2548226f4f78db96cd6210c7cc SHA1 80256f810a5b87adf5b39320eb4b5758ba3003a0 SHA256 74943e12a92b415306e2fca27056a839fa7ce443ccd08fdafcfac9bcba08a1c3
 MD5 b9cf104e2020c2d8c5fa164b6f54de5c files/syslog-ng.conf.debian 5445
 RMD160 c3c2f319d437bb2548226f4f78db96cd6210c7cc files/syslog-ng.conf.debian 5445
@@ -13,16 +10,21 @@ AUX syslog-ng.conf.gentoo.hardened 4346 RMD160 18932d56ce748454941859dc04c417791
 MD5 f33373c704c59b3141123ef16fc3e85d files/syslog-ng.conf.gentoo.hardened 4346
 RMD160 18932d56ce748454941859dc04c417791184a84d files/syslog-ng.conf.gentoo.hardened 4346
 SHA256 110478ff3805ee917488b874fbdbb4b48f9f2b02840f83a0a1d967925ebe3552 files/syslog-ng.conf.gentoo.hardened 4346
+AUX syslog-ng.confd 150 RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d SHA1 c5df6ef1eca2a169fb3073816d4a06b7c85c0b0c SHA256 8319ca8e39a5dab5ddc82eede088e1f58ff25deef330804648000359cb736a3f
+MD5 252ddaf4e3475b15b715b62f6c149fc1 files/syslog-ng.confd 150
+RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d files/syslog-ng.confd 150
+SHA256 8319ca8e39a5dab5ddc82eede088e1f58ff25deef330804648000359cb736a3f files/syslog-ng.confd 150
 AUX syslog-ng.logrotate 342 RMD160 ef72b796f96af38c421f2acc04ac3bed4c42de0e SHA1 77de0e56d3afb784d92b6e79f94a368952172eff SHA256 5a8a52e3832333eba51969d41cb6ae18e0a80d1e1ada39595dbc5f5075f91375
 MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342
 RMD160 ef72b796f96af38c421f2acc04ac3bed4c42de0e files/syslog-ng.logrotate 342
 SHA256 5a8a52e3832333eba51969d41cb6ae18e0a80d1e1ada39595dbc5f5075f91375 files/syslog-ng.logrotate 342
-AUX syslog-ng.rc6 1527 RMD160 db1ff4b91d48b743d10b09931e37fa3f9b5349cd SHA1 33731333bf4521b970385daf98e05500b04cf185 SHA256 11cf9df773edc012bda45e8ec9c5c4a44fd25d46e4ca9f3538cfbe7f5e935d6b
-MD5 eadbf6541edf087e075c8f70461b3963 files/syslog-ng.rc6 1527
-RMD160 db1ff4b91d48b743d10b09931e37fa3f9b5349cd files/syslog-ng.rc6 1527
-SHA256 11cf9df773edc012bda45e8ec9c5c4a44fd25d46e4ca9f3538cfbe7f5e935d6b files/syslog-ng.rc6 1527
+AUX syslog-ng.rc6 1615 RMD160 8cb414bc09c48fdb591320203947035f9c32e968 SHA1 3752874ee7d35cfb9ca92664f19caf5f187d6d5d SHA256 d4e574597148ae1b7009a9bc14df97c0b7b05e54f61619607e532984b5903b73
+MD5 b74c976f08eb333cd29db85f69ba5c36 files/syslog-ng.rc6 1615
+RMD160 8cb414bc09c48fdb591320203947035f9c32e968 files/syslog-ng.rc6 1615
+SHA256 d4e574597148ae1b7009a9bc14df97c0b7b05e54f61619607e532984b5903b73 files/syslog-ng.rc6 1615
 DIST syslog-ng-1.6.11.tar.gz 712166 RMD160 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0 SHA1 acbee602fd4cb6a1ca40238742642413cd6f1787 SHA256 dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 DIST syslog-ng-1.6.9.tar.gz 765341 RMD160 5220ee5b0859974cdf7e86fd884c1505f91228c6 SHA1 d9e92a9a82fdd5aa4642f0f6b1d164005c91f6f3 SHA256 e7f2d6dbeae17c14245cd20e9893d0144b969d98a29c230d4e8a0c9cc0f7dde9
+DIST syslog-ng-2.0.0.tar.gz 337553 RMD160 ed2c3ff8eea834c0c2fdae03ce2f9068a6d24128 SHA1 11a00e49f51056873d9889b8f2a62733b71bd040 SHA256 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7
 EBUILD syslog-ng-1.6.11.ebuild 1966 RMD160 6e6ad921a83c524a64e7cff1a3be0d4145d42f8b SHA1 2628a8bb9a65f7747530dae189d2c76598e87dd8 SHA256 632ff8da1177d10bc5ea45bfafd700433297e10aa9e3b9ffa42b2f0a1bb606ea
 MD5 c3b1a7ac91c5f6e34d3784d268a16824 syslog-ng-1.6.11.ebuild 1966
 RMD160 6e6ad921a83c524a64e7cff1a3be0d4145d42f8b syslog-ng-1.6.11.ebuild 1966
@@ -31,10 +33,14 @@ EBUILD syslog-ng-1.6.9.ebuild 2003 RMD160 7278c7ad8027abdf3a05ca8c9c403ee7c090c3
 MD5 21c0112820b1d1f241e12d8a9360e718 syslog-ng-1.6.9.ebuild 2003
 RMD160 7278c7ad8027abdf3a05ca8c9c403ee7c090c30c syslog-ng-1.6.9.ebuild 2003
 SHA256 388a6757637060de37feac3aa4346dcb58c66a8f0ec2ddc71d71136114e8e42c syslog-ng-1.6.9.ebuild 2003
-MISC ChangeLog 17731 RMD160 c3ac6256bcb0759b9fe19704fcdb621e4f79f036 SHA1 210972b65435bcc52cb75d2fc510637a5f2524d1 SHA256 66620210527b01f793a32720544e3b936088c7ffef9bf0b7700ebad274633d99
-MD5 9bf145ff543f81cf1f37825bcf4f9237 ChangeLog 17731
-RMD160 c3ac6256bcb0759b9fe19704fcdb621e4f79f036 ChangeLog 17731
-SHA256 66620210527b01f793a32720544e3b936088c7ffef9bf0b7700ebad274633d99 ChangeLog 17731
+EBUILD syslog-ng-2.0.0.ebuild 1951 RMD160 9da33c4876d082eb81e73ceb513e583ed615c605 SHA1 2a24016eba71b395077ce423938a79b5e5af5a13 SHA256 1de077432328854747bba5412fecb5f0d8d5127d8184d8842af0cafa0e925029
+MD5 12475eba73a27ea1b4180a01b6a2eed1 syslog-ng-2.0.0.ebuild 1951
+RMD160 9da33c4876d082eb81e73ceb513e583ed615c605 syslog-ng-2.0.0.ebuild 1951
+SHA256 1de077432328854747bba5412fecb5f0d8d5127d8184d8842af0cafa0e925029 syslog-ng-2.0.0.ebuild 1951
+MISC ChangeLog 18019 RMD160 f239c18512826d336547688785f0850779fa9d98 SHA1 ee67357c136c5d37ee7cdcbfca44287da38f1522 SHA256 9a3df124c1d29dfddc2b61e957c7fce600616ac3cc231404568843774cd7ab95
+MD5 9ce3493f521f70681b4c2ff04040cf66 ChangeLog 18019
+RMD160 f239c18512826d336547688785f0850779fa9d98 ChangeLog 18019
+SHA256 9a3df124c1d29dfddc2b61e957c7fce600616ac3cc231404568843774cd7ab95 ChangeLog 18019
 MISC metadata.xml 257 RMD160 42855264f35e8e834ee96a1140b24c82df0a0cb2 SHA1 94bf3510726056882c707f8f3f5c51fd84929453 SHA256 2b9dd09d2c92c1f9ae799f53cc0440871441b5f1aa9b949d0b8e227d607bf22d
 MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
 RMD160 42855264f35e8e834ee96a1140b24c82df0a0cb2 metadata.xml 257
@@ -45,10 +51,6 @@ SHA256 80d13b2ee1f29d4b225e45aa097120679652e3ffd50863761bfa95bbc4484117 files/di
 MD5 b481e7ac2702faefd67cf6266d9c6a5b files/digest-syslog-ng-1.6.9 247
 RMD160 b5be057a8fd361d942d01fe19d7af4cbf95deadc files/digest-syslog-ng-1.6.9 247
 SHA256 138e95860913ab20fa8c785e48308d51bb6448136f24e60f0ffd35ff489fb853 files/digest-syslog-ng-1.6.9 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFFSkZVbaW+3NC9cLgRAj2DAJ9NyofLVMOSYDcdgxvow5/cyO+kKQCeLJqs
-TzZLHhNPsrKNs7aaa5Z/xCs=
-=kqap
------END PGP SIGNATURE-----
+MD5 031572c215cb3174335d2eed145a45bf files/digest-syslog-ng-2.0.0 247
+RMD160 3fc94ef8c78e17bb87fc6ca374e9fd3d3c5f2cbc files/digest-syslog-ng-2.0.0 247
+SHA256 5a325a10ed0ff7d58ab6df7ce47de121b79717c2b78d3393b94c36ea0df28acb files/digest-syslog-ng-2.0.0 247
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
+}