chase latest + fix #8170

7 files changed, 214 insertions, 21 deletions

diff --git a/app-admin/msyslog/ChangeLog b/app-admin/msyslog/ChangeLog
index a21f40816e44..f89880a304bb 100644
--- a/app-admin/msyslog/ChangeLog
+++ b/app-admin/msyslog/ChangeLog
@@ -1,46 +1,45 @@
 # ChangeLog for app-admin/msyslog
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/ChangeLog,v 1.6 2002/08/08 02:42:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/ChangeLog,v 1.7 2002/09/21 02:57:34 woodchip Exp $
+
+*msyslog-1.09a (20 Sep 2002)
+
+  20 Sep 2002; Donny Davies <woodchip@gentoo.org> :
+  Update to latest release + fix severe b0rkage inflicted by other
+  devels upon this package.  Please assign all issues to me.
 
 *msyslog-1.08e (25 Jul 2002)
 
   07 Aug 2002; Seemant Kulleen <seemant@gentoo.org> msyslog-1.08e.ebuild
-  files/msyslog-{confd,init} files/msyslog.conf :
-
-  Added those files back into files/ and changed bz2 to be just the patch.
+  files/msyslog-{confd,init} files/msyslog.conf :  Added those files back
+  into files/ and changed bz2 to be just the patch.
 
   29 Jul 2002; Calum Selkrik <cselkirk@gentoo.org> msyslog-1.08e.ebuild :
-
   Added PPC to KEYWORDS. Added RDEPEND.
-  25 Jul 2002; Seemant Kulleen <seemant@gentoo.org> msyslog-1.08e.ebuild :
 
+  25 Jul 2002; Seemant Kulleen <seemant@gentoo.org> msyslog-1.08e.ebuild :
   Version bump.
 
 *msyslog-1.08a-r3 (25 Jul 2002)
 
   25 Jul 2002; Seemant Kulleen <seemant@gentoo.org> msyslog-1.08a-r3.ebuild
-  files/msyslog-{confd,init} files/msyslog.conf
-  files/msyslog-1.08a-gentoo.diff :
-
+  files/msyslog-{confd,init} files/msyslog.conf files/msyslog-1.08a-gentoo.diff :
   Moved the stuff out of files, and into a tar.bz2 that is on the mirrors
   instead.
 
 *msyslog-1.08a-r2 (3 May 2002)
 
   3 May 2002; Donny Davies <woodchip@gentoo.org> :
-  
   Add LICENSE, SLOT, $Headers.
 
 *msyslog-1.08a-r1 (1 Feb 2002)
 
   11 March 2002; M.Schlemmer <azarah@gentoo.org> :
-
   Update rc-script to provide "logger".
 
 *msyslog-1.08a (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/app-admin/msyslog/files/digest-msyslog-1.09a b/app-admin/msyslog/files/digest-msyslog-1.09a
new file mode 100644
index 000000000000..5371bc138c80
--- /dev/null
+++ b/app-admin/msyslog/files/digest-msyslog-1.09a
@@ -0,0 +1 @@
+MD5 8ea404f046bcf5c9d016c1ee32993194 msyslog-1.09a-src.tar.gz 153799
diff --git a/app-admin/msyslog/files/msyslog-1.09a-gentoo.diff b/app-admin/msyslog/files/msyslog-1.09a-gentoo.diff
new file mode 100644
index 000000000000..293cbb56a58b
--- /dev/null
+++ b/app-admin/msyslog/files/msyslog-1.09a-gentoo.diff
@@ -0,0 +1,128 @@
+diff -uNr msyslog-v1.09a.orig/configure msyslog-v1.09a/configure
+--- msyslog-v1.09a.orig/configure	Wed Aug 14 19:45:14 2002
++++ msyslog-v1.09a/configure	Fri Sep 20 22:23:28 2002
+@@ -4288,7 +4288,7 @@
+ 	prefix=$ac_default_prefix
+ fi
+ cat >>confdefs.h <<_ACEOF
+-#define INSTALL_LIBDIR "$prefix/lib/alat"
++#define INSTALL_LIBDIR "$prefix/lib"
+ _ACEOF
+ 
+ 
+@@ -4460,7 +4460,7 @@
+ _ACEOF
+ 
+ 	MAIN_CPPFLAGS="-Xlinker -E";
+-	SHARED_PARAMS="-Bshareable"
++        SHARED_PARAMS="-shared"
+ 	DCCFLAGS=""
+ 	cat >>confdefs.h <<\_ACEOF
+ #define _GNU_SOURCE 1
+@@ -4548,7 +4548,7 @@
+ # Name of pidfile
+ if test "$UNAME" = "Linux" ; then
+ 	cat >>confdefs.h <<\_ACEOF
+-#define PID_FILE "syslogd.pid"
++#define PID_FILE "msyslogd.pid"
+ _ACEOF
+ 
+ else
+diff -uNr msyslog-v1.09a.orig/src/examples/syslog.conf.peo msyslog-v1.09a/src/examples/syslog.conf.peo
+--- msyslog-v1.09a.orig/src/examples/syslog.conf.peo	Tue May 29 21:22:50 2001
++++ msyslog-v1.09a/src/examples/syslog.conf.peo	Fri Sep 20 22:12:20 2002
+@@ -1,3 +1,3 @@
+ # Protect a log of classic module
+-auth.info	%peo -l -k /var/ssyslog/.var.log.authlog.key %classic /var/log/authlog
++auth.info      %peo -l -k /var/lib/msyslog/.var.log.authlog.key %classic /var/log/authlog
+ 
+diff -uNr msyslog-v1.09a.orig/src/modules/Makefile.in msyslog-v1.09a/src/modules/Makefile.in
+--- msyslog-v1.09a.orig/src/modules/Makefile.in	Wed Aug 14 14:32:22 2002
++++ msyslog-v1.09a/src/modules/Makefile.in	Fri Sep 20 22:11:50 2002
+@@ -29,13 +29,12 @@
+ #
+ 
+ CC=		@CC@
+-LD=		ld
+ CFLAGS=		@CFLAGS@
+ DCCFLAGS=	@DCCFLAGS@
+ CPPFLAGS=	-I.. @CPPFLAGS@
+ 
+ INSTALL=	@INSTALL@
+-INSTALL_LIBDIR=	@prefix@/lib/alat
++INSTALL_LIBDIR=	@prefix@/lib
+ 
+ MLIBNAME=	@MLIBNAME@
+ MSRCS=		@MSRCS@
+@@ -49,7 +48,7 @@
+ $(MLIBNAME):  $(MSRCS) $(HASH_SRCS) ../config.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -c $(HASH_SRCS)
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DCCFLAGS) -c $(MSRCS)
+-	$(LD) $(SHARED_PARAMS) -o $(MLIBNAME) $(MOBJS) $(HASH_OBJS)
++	$(CC) $(SHARED_PARAMS) -o $(MLIBNAME) $(MOBJS) $(HASH_OBJS)
+ 
+ all: $(MLIBNAME)
+ 
+diff -uNr msyslog-v1.09a.orig/src/modules/om_peo.c msyslog-v1.09a/src/modules/om_peo.c
+--- msyslog-v1.09a.orig/src/modules/om_peo.c	Wed Aug 14 19:45:17 2002
++++ msyslog-v1.09a/src/modules/om_peo.c	Fri Sep 20 22:16:12 2002
+@@ -157,7 +157,7 @@
+  *  INIT -- Initialize om_peo
+  *  args:
+  * 
+- *	-k <keyfile>		(default: /var/ssyslog/.var.log.messages)
++ *      -k <keyfile>            (default: /var/lib/msyslog/.var.log.messages)
+  *	-l			line number corruption detect mode
+  *				(generates a strcat(keyfile, ".mac") file)
+  *	-m <hash_method>	md5, rmd160, or sha1 (default: sha1)
+diff -uNr msyslog-v1.09a.orig/src/peo/hash.c msyslog-v1.09a/src/peo/hash.c
+--- msyslog-v1.09a.orig/src/peo/hash.c	Wed Aug 14 14:32:23 2002
++++ msyslog-v1.09a/src/peo/hash.c	Fri Sep 20 22:17:42 2002
+@@ -73,7 +73,7 @@
+ #endif
+ 
+ 
+-char *default_keyfile = "/var/ssyslog/.var.log.messages.key";
++char *default_keyfile = "/var/lib/msyslog/.var.log.messages.key";
+ char *hmstr[] = { /* enum order */
+ 	"md5",
+ 	"rmd160",
+diff -uNr msyslog-v1.09a.orig/src/peo/peochk.c msyslog-v1.09a/src/peo/peochk.c
+--- msyslog-v1.09a.orig/src/peo/peochk.c	Wed Aug 14 14:32:23 2002
++++ msyslog-v1.09a/src/peo/peochk.c	Fri Sep 20 22:19:49 2002
+@@ -45,7 +45,7 @@
+  *
+  * defaults:
+  *	logfile: 	/var/log/messages
+- *	keyfile:	/var/ssyslog/.var.log.messages.key
++ *      keyfile:        /var/lib/msyslog/.var.log.messages.key
+  *	hash_method:	sha1
+  *
+  * NOTES:
+@@ -491,12 +491,12 @@
+ 	if (keyfile == default_keyfile && logfile != default_logfile) {
+ 		char *tmp;
+ 
+-		if ( (tmp = strallocat("/var/ssyslog/", logfile)) == NULL) {
++                if ( (tmp = strallocat("/var/lib/msyslog/", logfile)) == NULL) {
+ 			release();
+ 			perror("buffer for keyfile");
+ 			exit(-1);
+ 		}
+-		strdot(tmp+13);
++                strdot(tmp+strlen("/var/lib/msyslog/"));
+ 		if ( (keyfile = strallocat(tmp, ".key")) == NULL) {
+ 			free(tmp);
+ 			release();
+diff -uNr msyslog-v1.09a.orig/src/syslogd.h msyslog-v1.09a/src/syslogd.h
+--- msyslog-v1.09a.orig/src/syslogd.h	Fri Aug 23 18:52:30 2002
++++ msyslog-v1.09a/src/syslogd.h	Fri Sep 20 22:21:11 2002
+@@ -64,7 +64,7 @@
+ /* #warning using 	_PATH_KLOG	"/dev/klog" */
+ #endif
+ 
+-#define	_PATH_LOGCONF	"/etc/syslog.conf"
++#define _PATH_LOGCONF   "/etc/msyslog/msyslog.conf"
+ 
+ /*
+  * Debug reporting levels
diff --git a/app-admin/msyslog/files/msyslog-confd b/app-admin/msyslog/files/msyslog-confd
index 22cc5bdb39e3..e75a922ee046 100644
--- a/app-admin/msyslog/files/msyslog-confd
+++ b/app-admin/msyslog/files/msyslog-confd
@@ -1,8 +1,6 @@
 # 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/msyslog/files/msyslog-confd,v 1.4 2002/08/08 02:42:20 seemant Exp $
-
-# Config file for /etc/init.d/msyslog
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/files/msyslog-confd,v 1.5 2002/09/21 02:57:34 woodchip Exp $
 
 # Passed to /usr/sbin/msyslogd...
 MSYSLOG_OPTS="-i unix /dev/log -i linux"
diff --git a/app-admin/msyslog/files/msyslog-init b/app-admin/msyslog/files/msyslog-init
index 8715cc737212..d72f43802f10 100644
--- a/app-admin/msyslog/files/msyslog-init
+++ b/app-admin/msyslog/files/msyslog-init
@@ -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/msyslog/files/msyslog-init,v 1.5 2002/08/08 02:42:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/files/msyslog-init,v 1.6 2002/09/21 02:57:34 woodchip Exp $
 
 depend() {
 	need clock
@@ -10,7 +10,8 @@ depend() {
 
 start() {
 	ebegin "Starting msyslog"
-	start-stop-daemon --start --quiet --exec /usr/sbin/msyslogd -- ${MSYSLOG_OPTS}
+	start-stop-daemon --start --quiet --exec /usr/sbin/msyslogd \
+		-- ${MSYSLOG_OPTS}
 	eend $? "Failed to start msyslog"
 }
 
@@ -19,4 +20,3 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/msyslogd.pid
 	eend $? "Failed to stop msyslog"
 }
-
diff --git a/app-admin/msyslog/files/msyslog.conf b/app-admin/msyslog/files/msyslog.conf
index 263d6d88c345..ece076f0f717 100644
--- a/app-admin/msyslog/files/msyslog.conf
+++ b/app-admin/msyslog/files/msyslog.conf
@@ -1,6 +1,6 @@
 # /etc/msyslog/msyslog.conf: configuration file for msyslogd.
 #
-# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/files/msyslog.conf,v 1.4 2002/08/08 02:42:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/files/msyslog.conf,v 1.5 2002/09/21 02:57:34 woodchip Exp $
 #
 # Msyslog uses a slightly different syntax than the old syslogd.
 # See below and in /usr/share/doc/msyslog/examples for samples
@@ -11,7 +11,6 @@
 # The logfiles you specify with %classic must exist beforehand;
 # they will not be auto-created.
 
-
 # The default enables these two standard logfiles.
 *.*;auth,authpriv.none			%classic /var/log/syslog
 *.warn;mark.*;auth,authpriv.none	%classic /var/log/messages
diff --git a/app-admin/msyslog/msyslog-1.09a.ebuild b/app-admin/msyslog/msyslog-1.09a.ebuild
new file mode 100644
index 000000000000..63ad4e421183
--- /dev/null
+++ b/app-admin/msyslog/msyslog-1.09a.ebuild
@@ -0,0 +1,68 @@
+# 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/msyslog/msyslog-1.09a.ebuild,v 1.1 2002/09/21 02:57:34 woodchip Exp $
+
+#lame upstream conventions...
+#archive:    msyslog-1.09a-src.tar.gz
+#unpacks to: msyslog-v1.09a/
+
+S=${WORKDIR}/${PN}-v${PV}
+DESCRIPTION="Flexible and easy to integrate syslog with modularized input/output"
+HOMEPAGE="http://sourceforge.net/projects/msyslog/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}
+	mysql? ( >=dev-db/mysql-3.23 )
+	postgres? ( >=dev-db/postgresql-7 )"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 sparc sparc64"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	# fix paths for pidfile, config file, libdir, logdir...
+	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
+}
+
+src_compile() {
+	local myconf
+	use mysql || myconf="${myconf} --without-mysql"
+	use postgres || myconf="${myconf} --without-pgsql"
+	econf --with-daemon-name=msyslogd ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	into /usr
+	dosbin src/msyslogd src/peo/peochk
+
+	# be mindful here when upgrading...
+	exeinto /usr/lib
+	doexe src/modules/lib${PN}.so.${PV}
+	( cd ${D}/usr/lib ; ln -s lib${PN}.so.${PV} lib${PN}.so )
+
+	# rename these puppies...
+	mv src/man/syslogd.8 src/man/msyslogd.8
+	mv src/man/syslog.conf.5 src/man/msyslog.conf.5
+	doman src/man/*.[85]
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS \
+		QUICK_INSTALL README src/TODO doc/*
+	docinto examples ; dodoc src/examples/*
+
+	insinto /etc/msyslog ; doins ${FILESDIR}/msyslog.conf
+	insinto /etc/conf.d ; newins ${FILESDIR}/msyslog-confd msyslog
+	exeinto /etc/init.d ; newexe ${FILESDIR}/msyslog-init msyslog
+}
+
+pkg_postinst() {
+	# the default /etc/msyslog/msyslog.conf uses these, so make sure
+	# it 'just works' for those who wont bother changing the config.
+	touch ${ROOT}/var/log/messages
+	touch ${ROOT}/var/log/syslog
+	# empty dir...
+	install -m0755 -o root -g root -d ${ROOT}/var/lib/msyslog
+}