moved conf files back into files out of bz2 on mirror

5 files changed, 111 insertions, 4 deletions

diff --git a/app-admin/msyslog/ChangeLog b/app-admin/msyslog/ChangeLog
index 7a6c45266824..a21f40816e44 100644
--- a/app-admin/msyslog/ChangeLog
+++ b/app-admin/msyslog/ChangeLog
@@ -1,9 +1,14 @@
 # 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.5 2002/07/30 03:03:26 cselkirk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/ChangeLog,v 1.6 2002/08/08 02:42:20 seemant Exp $
 
 *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.
+
   29 Jul 2002; Calum Selkrik <cselkirk@gentoo.org> msyslog-1.08e.ebuild :
 
   Added PPC to KEYWORDS. Added RDEPEND.
diff --git a/app-admin/msyslog/files/msyslog-confd b/app-admin/msyslog/files/msyslog-confd
new file mode 100644
index 000000000000..22cc5bdb39e3
--- /dev/null
+++ b/app-admin/msyslog/files/msyslog-confd
@@ -0,0 +1,8 @@
+# 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
+
+# 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
new file mode 100644
index 000000000000..8715cc737212
--- /dev/null
+++ b/app-admin/msyslog/files/msyslog-init
@@ -0,0 +1,22 @@
+#!/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 $
+
+depend() {
+	need clock
+	provide logger
+}
+
+start() {
+	ebegin "Starting msyslog"
+	start-stop-daemon --start --quiet --exec /usr/sbin/msyslogd -- ${MSYSLOG_OPTS}
+	eend $? "Failed to start msyslog"
+}
+
+stop() {
+	ebegin "Stopping msyslog"
+	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
new file mode 100644
index 000000000000..263d6d88c345
--- /dev/null
+++ b/app-admin/msyslog/files/msyslog.conf
@@ -0,0 +1,73 @@
+# /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 $
+#
+# Msyslog uses a slightly different syntax than the old syslogd.
+# See below and in /usr/share/doc/msyslog/examples for samples
+# and documentation.  See also the manpages for msyslog.conf(5),
+# msyslogd(8), and the output modules: om_mysql(8), om_regex(8),
+# om_pgsql(8), om_classic(8).
+#
+# 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
+
+# Emergencies are sent to everybody currently logged in.
+*.emerg				%classic *
+
+# The named pipe /dev/xconsole is for the `xconsole' utility.
+# To use it, you must invoke `xconsole' with the `-file' option:
+# $ xconsole -file /dev/xconsole [...]
+*.warn				%classic |/dev/xconsole
+
+# This puts everything into one file.
+#*.*				%classic /var/log/all
+
+# Sending messages to a virtual console.
+#*.*;auth,authpriv.none		%classic /dev/tty8
+
+# Logging by facility.
+#auth,authpriv.*		%classic /var/log/auth.log
+#cron.*				%classic /var/log/cron.log
+#daemon.*			%classic /var/log/daemon.log
+#ftp.*				%classic /var/log/ftp.log
+#kern.*				%classic /var/log/kern.log
+#lpr.*				%classic /var/log/lpr.log
+#mail.*				%classic /var/log/mail.log
+#news.*				%classic /var/log/news.log
+#syslog.*			%classic /var/log/syslog.log
+#user.*				%classic /var/log/user.log
+#uucp.*				%classic /var/log/uucp.log
+
+# Logging for the mail system.
+#mail.info			%classic /var/log/mail.info
+#mail.warn			%classic /var/log/mail.warn
+#mail.err			%classic /var/log/mail.err
+
+# Logging for INN news system.
+#news.crit			%classic /var/log/news/news.crit
+#news.err			%classic /var/log/news/news.err
+#news.notice			%classic /var/log/news/news.notice
+
+# Send messages to central logging host through UDP transport.
+# See im_udp(8) for how to set up the server.
+#*.*				%classic @loghost
+
+# Logging to an SQL database.  SECURITY ALERT.  Since the mysql/postgresql
+# passwords need to appear here, this file should not be world readable!
+# ---
+# Log to server logger.mydomain.edu through MySQL
+#*.*	%mysql -s logger.mydomain.edu -u loguser -p loguserpassword -d syslogDB -t syslogTB
+#
+# Log to server logger.mydomain.edu through MySQL, using DELAYED inserts
+#*.*	%mysql -D -s logger.mydomain.edu -u loguser -p loguserpassword -d syslogDB -t syslogTB
+#
+# Log to server logger.mydomain.edu thru PGSQL
+#*.*	%pgsql -s logger.mydomain.edu -u loguser -p loguserpassword -d syslogDB -t syslogTB
+
+# Protect a log of classic module.
+#auth.info	%peo -l -k /var/lib/msyslog/.var.log.authlog.key %classic /var/log/authlog
diff --git a/app-admin/msyslog/msyslog-1.08e.ebuild b/app-admin/msyslog/msyslog-1.08e.ebuild
index 9aa4d304e7a4..c3c4ce0c1d44 100644
--- a/app-admin/msyslog/msyslog-1.08e.ebuild
+++ b/app-admin/msyslog/msyslog-1.08e.ebuild
@@ -1,10 +1,9 @@
 # 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.08e.ebuild,v 1.1 2002/07/25 12:54:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.08e.ebuild,v 1.2 2002/08/08 02:42:20 seemant Exp $
 
 MY_P=${PN}-v${PV}
 S=${WORKDIR}/${MY_P}
-S2=${WORKDIR}/${PN}-gentoo
 DESCRIPTION="Flexible and easy to integrate syslog with modularized input/output"
 HOMEPAGE="http://www.core-sdi.com/download/download1.html"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz
@@ -20,7 +19,7 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23 )
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# fix paths for pidfile, config file, libdir, logdir, manpages, etc...
-	patch -p1 < ${S2}/${P}-gentoo.diff || die "bad patchfile"
+	( bzcat ${DISTDIR}/${P}-gentoo.diff.tar.bz2 | patch -p1 ) || die
 }
 
 src_compile() {