close bug #14310

4 files changed, 63 insertions, 2 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 6bd5060574c1..be75f4a531ab 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.17 2002/12/26 23:12:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.18 2003/01/21 20:38:52 agriffis Exp $
+
+  21 Jan 2003 Aron Griffis <agriffis@gentoo.org> syslog-ng-1.5.24-r1.ebuild files/syslog-ng.rc6 :
+  Add a pause after stopping syslog-ng to allow it to stop, particularly in
+  case it's restarting.  This is particularly important when using logrotate.
+  Bumped the revision to get the new initscript installed.  Closes #14310
 
 *syslog-ng-1.5.24 (26 Dec 2002)
 
diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.5.24-r1 b/app-admin/syslog-ng/files/digest-syslog-ng-1.5.24-r1
new file mode 100644
index 000000000000..11ba945f14a6
--- /dev/null
+++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.5.24-r1
@@ -0,0 +1 @@
+MD5 e771402d1b2cc91632245b7189482579 syslog-ng-1.5.24.tar.gz 282671
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6
index ca1ebf22b2e3..b0bde8ea41c0 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-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.7 2002/11/04 14:28:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.8 2003/01/21 20:38:52 agriffis Exp $
 
 depend() {
 	need clock hostname
@@ -27,4 +27,5 @@ stop() {
     ebegin "Stopping syslog-ng"
     start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
     eend $? "Failed to stop syslog-ng"
+    sleep 1 # needed for syslog-ng to stop in case we're restarting
 }
diff --git a/app-admin/syslog-ng/syslog-ng-1.5.24-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.5.24-r1.ebuild
new file mode 100644
index 000000000000..d854aabb784b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-1.5.24-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.5.24-r1.ebuild,v 1.1 2003/01/21 20:38:52 agriffis Exp $
+
+DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
+SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.5/${P}.tar.gz"
+HOMEPAGE="http://www.balabit.hu/en/downloads/syslog-ng/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc "
+IUSE="tcpd"
+
+DEPEND=">=dev-libs/libol-0.3.6
+	sys-devel/flex
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+src_compile() {
+	local myconf
+	use tcpd && myconf="--enable-tcp-wrapper"
+	econf ${myconf}
+
+	# configure script braindamage?
+#    cd ${S}/src
+#	mv Makefile Makefile.orig
+
+#	use tcpd && ( sed -e "s|-lnsl|-lwrap|" Makefile.orig > Makefile  || die "sed failure" )
+#	use tcpd || ( sed -e "s|-lnsl||" Makefile.orig > Makefile  || die "sed failure" )
+
+	emake prefix=${D}/usr all || die "compile problem"
+}
+
+src_install() {
+	einstall
+	rm -rf ${D}/usr/share/man
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
+	dodoc doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh}
+	doman doc/{syslog-ng.8,syslog-ng.conf.5}
+	dodoc doc/sgml/{syslog-ng.dvi,syslog-ng.html.tar.gz,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt}
+
+	dodir /etc/syslog-ng
+	insinto /etc/syslog-ng
+	doins ${FILESDIR}/syslog-ng.conf.sample
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/syslog-ng.rc6 syslog-ng
+}
+
+pkg_postinst() {
+	einfo "A sample configuration file can be found in /etc/syslog-ng."
+	einfo "To convert your existing syslog.conf for use with syslog-ng,"
+	einfo "use the syslog2ng script in /usr/share/doc/${PF}."
+}