[svn] r6496 - in trunk/rpms: rsyslog vlc

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Oct 3 00:43:05 CEST 2008


Author: dag
Date: 2008-10-02 23:43:04 +0100 (Thu, 02 Oct 2008)
New Revision: 6496

Added:
   trunk/rpms/rsyslog/rsyslog-2.0.0-forwardMsg.patch
   trunk/rpms/rsyslog/rsyslog-2.0.0-manPage.patch
   trunk/rpms/rsyslog/rsyslog-2.0.0-sockhang.patch
   trunk/rpms/rsyslog/syslog.log
Modified:
   trunk/rpms/rsyslog/rsyslog.init
   trunk/rpms/rsyslog/rsyslog.spec
   trunk/rpms/rsyslog/rsyslog.sysconfig
   trunk/rpms/vlc/vlc.spec
Log:
Updates

Added: trunk/rpms/rsyslog/rsyslog-2.0.0-forwardMsg.patch
===================================================================
--- trunk/rpms/rsyslog/rsyslog-2.0.0-forwardMsg.patch	                        (rev 0)
+++ trunk/rpms/rsyslog/rsyslog-2.0.0-forwardMsg.patch	2008-10-02 22:43:04 UTC (rev 6496)
@@ -0,0 +1,13 @@
+diff -up rsyslog-2.0.0/rsyslog.conf.5.forwardMsg rsyslog-2.0.0/rsyslog.conf.5
+--- rsyslog-2.0.0/rsyslog.conf.5.forwardMsg	2008-01-16 18:44:00.000000000 +0100
++++ rsyslog-2.0.0/rsyslog.conf.5	2008-01-16 18:51:51.000000000 +0100
+@@ -584,6 +584,9 @@ replace control characters by spaces
+ drop-cc
+ drop control characters - the resulting string will neither contain control characters, escape sequences nor any other replacement character like space.
+ 
++.SH NOTES
++The old sysklogd logger does not send the timestamp and hostname in forwarded message. If you want to forward messages to syslogd server, define new sysklogd template. See Templates section.
++
+ .SH FILES
+ .PD 0
+ .TP

Added: trunk/rpms/rsyslog/rsyslog-2.0.0-manPage.patch
===================================================================
--- trunk/rpms/rsyslog/rsyslog-2.0.0-manPage.patch	                        (rev 0)
+++ trunk/rpms/rsyslog/rsyslog-2.0.0-manPage.patch	2008-10-02 22:43:04 UTC (rev 6496)
@@ -0,0 +1,108 @@
+diff -upb rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html.manPage rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
+--- rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html.manPage	2008-02-07 11:50:17.000000000 +0100
++++ rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html	2008-02-07 11:52:13.000000000 +0100
+@@ -0,0 +1,29 @@
++<html>
++<head>
++<title>rsyslog.conf file</title>
++</head>
++<body>
++<h2>$ActionExecOnlyWhenPreviousIsSuspended</h2>
++<p><b>Type:</b> global configuration directive</p>
++<p><b>Default:</b> off</p>
++<p><b>Description:</b></p>
++<p>This directive allows to specify if actions should always be executed ("off," the default) or only if the previous action is suspended ("on"). This directive works hand-in-hand with the multiple actions per selector feature. It can be used, for example, to create rules that automatically switch destination servers or databases to a (set of) backup(s), if the primary server fails. Note that this feature depends on proper implementation of the suspend feature in the output module. All built-in output modules properly support it (most importantly the database write and the syslog message forwarder).</p>
++<p>This selector processes all messages it receives (*.*).  It tries to forward every message to primary-syslog.example.com (via tcp). If it can not reach that server, it tries secondary-1-syslog.example.com, if that fails too, it tries secondary-2-syslog.example.com. If neither of these servers can be connected, the data is stored in /var/log/localbuffer. Please note that the secondaries and the local log buffer are only used if the one before them does not work. So ideally, /var/log/localbuffer will never receive a message. If one of the servers resumes operation, it automatically takes over processing again.</p>
++<p>We strongly advise not to use repeated line reduction together with ActionExecOnlyWhenPreviousIsSuspended. It may lead to "interesting" and undesired results (but you can try it if you like).</p>
++<p><b>Sample:</b></p>
++<p><code><b>*.* @@primary-syslog.example.com
++<br>$ActionExecOnlyWhenPreviousIsSuspended on
++<br>&   @@secondary-1-syslog.example.com    # & is used to have more than one action for
++<br>&   @@secondary-2-syslog.example.com    # the same selector - the mult-action feature
++<br>&   /var/log/localbuffer
++<br>$ActionExecOnlyWhenPreviousIsSuspended off # to re-set it for the next selector </b></code></p>
++
++<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual 
++index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
++<p><font size="2">This documentation is part of the
++<a href="http://www.rsyslog.com/">rsyslog</a> project.<br>
++Copyright &copy; 2007 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
++<a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL 
++version 2 or higher.</font></p>
++</body>
++</html>
+diff -upb rsyslog-2.0.0/doc/rsyslog_conf.html.manPage rsyslog-2.0.0/doc/rsyslog_conf.html
+--- rsyslog-2.0.0/doc/rsyslog_conf.html.manPage	2008-02-07 11:45:32.000000000 +0100
++++ rsyslog-2.0.0/doc/rsyslog_conf.html	2008-02-07 13:38:22.000000000 +0100
+@@ -25,7 +25,7 @@ to rsyslogd.</p>
+ start with a dollar-sign. Here is a list in alphabetical order. Follow links for 
+ a description.</p>
+ <ul>
+-	<li><a href="rsconf1_actionexeconlyifpreviousissuspended.html">$ActionExecOnlyIfPreviousIsSuspended</a></li>
++	<li><a href="rsconf1_actionexeconlywhenpreviousissuspended.html">$ActionExecOnlyWhenPreviousIsSuspended</a></li>
+ 	<li><a href="rsconf1_actionresumeinterval.html">$ActionResumeInterval</a></li>
+ 	<li><a href="rsconf1_allowedsender.html">$AllowedSender</a></li>
+ 	<li><a href="rsconf1_controlcharacterescapeprefix.html">$ControlCharacterEscapePrefix</a></li>
+@@ -43,9 +43,6 @@ a description.</p>
+ 	<li><a href="rsconf1_filecreatemode.html">$FileCreateMode</a></li>
+ 	<li><a href="rsconf1_filegroup.html">$FileGroup</a></li>
+ 	<li><a href="rsconf1_fileowner.html">$FileOwner</a></li>
+-	<li><a href="rsconf1_gssforwardservicename.html">$GssForwardServiceName</a></li>
+-	<li><a href="rsconf1_gsslistenservicename.html">$GssListenServiceName</a></li>
+-	<li><a href="rsconf1_gssmode.html">$GssMode</a></li>
+ 	<li><a href="rsconf1_includeconfig.html">$IncludeConfig</a></li>
+ 	<li><a href="rsconf1_mainmsgqueuesize.html">$MainMsgQueueSize</a></li>
+ 	<li><a href="rsconf1_moddir.html">$ModDir</a></li>
+diff -upb rsyslog-2.0.0/rsyslogd.8.manPage rsyslog-2.0.0/rsyslogd.8
+--- rsyslog-2.0.0/rsyslogd.8.manPage	2008-02-07 11:35:22.000000000 +0100
++++ rsyslog-2.0.0/rsyslogd.8	2008-02-07 13:38:00.000000000 +0100
+@@ -18,9 +18,6 @@ rsyslogd \- reliable and extended syslog
+ .RB [ " \-f "
+ .I config file
+ ]
+-.RB [ " \-g "
+-.I port,max-nbr-of-sessions
+-]
+ .RB [ " \-h " ] 
+ .br
+ .RB [ " \-i "
+@@ -158,12 +155,6 @@ Specify an alternative configuration fil
+ .IR /etc/rsyslog.conf ","
+ which is the default.
+ .TP
+-.BI "\-g "
+-Identical to -t except that every tcp connection is authenticated
+-using gss-api (kerberos 5). Service name may be set using
+-$GssListenServiceName or the default "host" will be used. Encryption
+-can be used if specified by the client and supported by both sides.
+-.TP
+ .BI "\-h "
+ By default rsyslogd will not forward messages it receives from remote hosts.
+ Specifying this switch on the command line will cause the log daemon to
+@@ -276,15 +267,10 @@ will be reread and the
+ .BR rsyslog (3)
+ facility is started again.
+ .TP
+-.B SIGTERM
++.B SIGTERM "," SIGINT "," SIGQUIT
+ .B Rsyslogd
+ will die.
+ .TP
+-.BR SIGINT ", " SIGQUIT
+-If debugging is enabled these are ignored, otherwise 
+-.B rsyslogd
+-will die.
+-.TP
+ .B SIGUSR1
+ Switch debugging on/off.  This option can only be used if
+ .B rsyslogd
+@@ -501,8 +487,7 @@ If remote logging is enabled, messages c
+ As the messages are transmitted in clear-text, an attacker might use
+ the information obtained from the packets for malicious things. Also, an
+ attacker might reply recorded messages or spoof a sender's IP address,
+-which could lead to a wrong perception of system activity. These can
+-be prevented by using GSS-API authentication and encryption. Be sure
++which could lead to a wrong perception of system activity. Be sure
+ to think about syslog network security before enabling it.
+ .LP
+ .SH DEBUGGING

Added: trunk/rpms/rsyslog/rsyslog-2.0.0-sockhang.patch
===================================================================
--- trunk/rpms/rsyslog/rsyslog-2.0.0-sockhang.patch	                        (rev 0)
+++ trunk/rpms/rsyslog/rsyslog-2.0.0-sockhang.patch	2008-10-02 22:43:04 UTC (rev 6496)
@@ -0,0 +1,199 @@
+diff -up rsyslog-2.0.0/syslogd.c.sockHang rsyslog-2.0.0/syslogd.c
+--- rsyslog-2.0.0/syslogd.c.sockHang	2007-12-26 10:56:01.000000000 +0100
++++ rsyslog-2.0.0/syslogd.c	2008-01-22 17:53:47.000000000 +0100
+@@ -3563,7 +3563,7 @@ void logerror(char *type)
+ 	if (errno == 0)
+ 		snprintf(buf, sizeof(buf), "%s", type);
+ 	else {
+-		strerror_r(errno, errStr, sizeof(errStr));
++		rs_strerror_r(errno, errStr, sizeof(errStr));
+ 		snprintf(buf, sizeof(buf), "%s: %s", type, errStr);
+ 	}
+ 	buf[sizeof(buf)/sizeof(char) - 1] = '\0'; /* just to be on the safe side... */
+@@ -4349,7 +4349,7 @@ finalize_it:
+ 		if(fCurr != NULL)
+ 			selectorDestruct(fCurr);
+ 
+-		strerror_r(errno, errStr, sizeof(errStr));
++		rs_strerror_r(errno, errStr, sizeof(errStr));
+ 		dbgprintf("error %d processing config file '%s'; os error (if any): %s\n",
+ 			iRet, pConfFile, errStr);
+ 	}
+@@ -5466,6 +5466,20 @@ void dbgprintf(char *fmt, ...)
+ }
+ 
+ 
++char *rs_strerror_r(int errnum, char *buf, size_t buflen) {
++#ifdef STRERROR_R_CHAR_P
++	char *p = strerror_r(errnum, buf, buflen);
++	if (p != buf) {
++		strncpy(buf, p, buflen);
++		buf[buflen - 1] = '\0';
++	}
++#else
++	strerror_r(errnum, buf, buflen);
++#endif
++	return buf;
++}
++
++
+ /*
+  * The following function is resposible for handling a SIGHUP signal.  Since
+  * we are now doing mallocs/free as part of init we had better not being
+@@ -5727,7 +5741,7 @@ static rsRetVal processSelectAfter(int m
+ 				printchopped(LocalHostName, line, iRcvd,  fd, funixParseHost[i]);
+ 			} else if (iRcvd < 0 && errno != EINTR) {
+ 				char errStr[1024];
+-				strerror_r(errno, errStr, sizeof(errStr));
++				rs_strerror_r(errno, errStr, sizeof(errStr));
+ 				dbgprintf("UNIX socket error: %d = %s.\n", \
+ 					errno, errStr);
+ 				logerror("recvfrom UNIX");
+@@ -5768,7 +5782,7 @@ static rsRetVal processSelectAfter(int m
+ 				       }
+ 			       } else if (l < 0 && errno != EINTR && errno != EAGAIN) {
+ 					char errStr[1024];
+-					strerror_r(errno, errStr, sizeof(errStr));
++					rs_strerror_r(errno, errStr, sizeof(errStr));
+ 					dbgprintf("INET socket error: %d = %s.\n", errno, errStr);
+ 					       logerror("recvfrom inet");
+ 					       /* should be harmless */
+diff -up rsyslog-2.0.0/configure.ac.sockHang rsyslog-2.0.0/configure.ac
+--- rsyslog-2.0.0/configure.ac.sockHang	2007-12-28 19:02:44.000000000 +0100
++++ rsyslog-2.0.0/configure.ac	2008-01-22 17:53:47.000000000 +0100
+@@ -81,9 +81,10 @@ AC_FUNC_REALLOC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_TYPE_SIGNAL
+ AC_FUNC_STAT
++AC_FUNC_STRERROR_R
+ AC_FUNC_VPRINTF
+ AC_FUNC_WAIT3
+-AC_CHECK_FUNCS([alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strerror_r strndup strnlen strrchr strstr strtol strtoul uname ttyname_r])
++AC_CHECK_FUNCS([alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r])
+ 
+ 
+ # Large file support
+diff -up rsyslog-2.0.0/omfwd.c.sockHang rsyslog-2.0.0/omfwd.c
+--- rsyslog-2.0.0/omfwd.c.sockHang	2007-12-27 23:01:20.000000000 +0100
++++ rsyslog-2.0.0/omfwd.c	2008-01-22 17:53:47.000000000 +0100
+@@ -116,6 +116,7 @@ typedef struct _instanceData {
+ 
+ BEGINcreateInstance
+ CODESTARTcreateInstance
++	pData->sock = -1;
+ ENDcreateInstance
+ 
+ 
+@@ -278,8 +279,8 @@ static rsRetVal TCPSendInit(void *pvData
+ 	instanceData *pData = (instanceData *) pvData;
+ 
+ 	assert(pData != NULL);
+-	if(pData->sock <= 0) {
+-		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) <= 0)
++	if(pData->sock < 0) {
++		if((pData->sock = TCPSendCreateSocket(pData->f_addr)) < 0)
+ 			iRet = RS_RET_TCP_SOCKCREATE_ERR;
+ 	}
+ 
+@@ -440,7 +441,7 @@ CODESTARTdoAction
+ 								int eno = errno;
+ 								char errStr[1024];
+ 								dbgprintf("sendto() error: %d = %s.\n",
+-									eno, strerror_r(eno, errStr, sizeof(errStr)));
++									eno, rs_strerror_r(eno, errStr, sizeof(errStr)));
+ 							}
+ 		                                }
+ 						if (lsent == l && !send_to_all)
+diff -up rsyslog-2.0.0/syslogd.h.sockHang rsyslog-2.0.0/syslogd.h
+--- rsyslog-2.0.0/syslogd.h.sockHang	2007-12-19 08:20:16.000000000 +0100
++++ rsyslog-2.0.0/syslogd.h	2008-01-22 17:53:47.000000000 +0100
+@@ -48,6 +48,7 @@
+ #define MARK		0x008	/* this message is a mark */
+ 
+ void dbgprintf(char *, ...);
++char *rs_strerror_r(int errnum, char *buf, size_t buflen);
+ void logerror(char *type);
+ void logerrorSz(char *type, char *errMsg);
+ void logerrorInt(char *type, int iErr);
+diff -up rsyslog-2.0.0/net.c.sockHang rsyslog-2.0.0/net.c
+--- rsyslog-2.0.0/net.c.sockHang	2007-10-08 12:45:05.000000000 +0200
++++ rsyslog-2.0.0/net.c	2008-01-22 17:53:47.000000000 +0100
+@@ -66,7 +66,7 @@ int should_use_so_bsdcompat(void)
+ 	init_done = 1;
+ 	if (uname(&utsname) < 0) {
+ 		char errStr[1024];
+-		dbgprintf("uname: %s\r\n", strerror_r(errno, errStr, sizeof(errStr)));
++		dbgprintf("uname: %s\r\n", rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 		return 1;
+ 	}
+ 	/* Format is <version>.<patchlevel>.<sublevel><extraversion>
+diff -up rsyslog-2.0.0/rfc3195d.c.sockHang rsyslog-2.0.0/rfc3195d.c
+--- rsyslog-2.0.0/rfc3195d.c.sockHang	2007-09-25 12:45:07.000000000 +0200
++++ rsyslog-2.0.0/rfc3195d.c	2008-01-22 17:53:47.000000000 +0100
+@@ -96,7 +96,7 @@ static void openlog()
+ 		if(LogFile < 0) {
+ 			char errStr[1024];
+ 			printf("error opening '%s': %s\n", 
+-			       pPathLogname, strerror_r(errno, errStr, sizeof(errStr)));
++			       pPathLogname, rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 		}
+ 	}
+ 	if (LogFile != -1 && !connected &&
+@@ -106,7 +106,7 @@ static void openlog()
+ 	else {
+ 		char errStr[1024];
+ 		printf("error connecting '%s': %s\n", 
+-		       pPathLogname, strerror_r(errno, errStr, sizeof(errStr)));
++		       pPathLogname, rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 	}
+ }
+ 
+@@ -162,7 +162,7 @@ void OnReceive(srAPIObj* pAPI, srSLMGObj
+ 			if(nWritten < 0) {
+ 				/* error, recover! */
+ 				char errStr[1024];
+-				printf("error writing to domain socket: %s\r\n", strerror_r(errno, errStr, sizeof(errStr)));
++				printf("error writing to domain socket: %s\r\n", rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 				closelog();
+ 			} else {
+ 				/* prepare for (potential) next write */
+diff -up rsyslog-2.0.0/omfile.c.sockHang rsyslog-2.0.0/omfile.c
+--- rsyslog-2.0.0/omfile.c.sockHang	2007-11-21 11:52:18.000000000 +0100
++++ rsyslog-2.0.0/omfile.c	2008-01-22 17:50:47.000000000 +0100
+@@ -357,6 +357,7 @@ static void prepareFile(instanceData *pD
+ 		pData->fd = open((char*) newFileName, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY,
+ 				pData->fCreateMode);
+ 	} else {
++		pData->fd = -1;
+ 		/* file does not exist, create it (and eventually parent directories */
+ 		if(pData->bCreateDirs) {
+ 			/* we fist need to create parent dirs if they are missing
+@@ -596,6 +597,7 @@ again:
+ 
+ BEGINcreateInstance
+ CODESTARTcreateInstance
++	pData->fd = -1;
+ ENDcreateInstance
+ 
+ 
+diff -up rsyslog-2.0.0/tcpsyslog.c.sockHang rsyslog-2.0.0/tcpsyslog.c
+--- rsyslog-2.0.0/tcpsyslog.c.sockHang	2007-12-28 00:12:28.000000000 +0100
++++ rsyslog-2.0.0/tcpsyslog.c	2008-01-22 17:53:47.000000000 +0100
+@@ -1021,7 +1021,7 @@ int TCPSendCreateSocket(struct addrinfo 
+ 				} else {
+ 					char errStr[1024];
+ 					dbgprintf("create tcp connection failed, reason %s",
+-						strerror_r(errno, errStr, sizeof(errStr)));
++						rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 				}
+ 
+ 			}
+@@ -1032,7 +1032,7 @@ int TCPSendCreateSocket(struct addrinfo 
+ 		}
+ 		else {
+ 			char errStr[1024];
+-			dbgprintf("couldn't create send socket, reason %s", strerror_r(errno, errStr, sizeof(errStr)));
++			dbgprintf("couldn't create send socket, reason %s", rs_strerror_r(errno, errStr, sizeof(errStr)));
+ 		}		
+ 		r = r->ai_next;
+ 	}

Modified: trunk/rpms/rsyslog/rsyslog.init
===================================================================
--- trunk/rpms/rsyslog/rsyslog.init	2008-09-30 21:21:11 UTC (rev 6495)
+++ trunk/rpms/rsyslog/rsyslog.init	2008-10-02 22:43:04 UTC (rev 6496)
@@ -3,7 +3,7 @@
 # rsyslog        Starts rsyslogd/rklogd.
 #
 #
-# chkconfig: 2345 12 88
+# chkconfig: - 12 88
 # description: Syslog is the facility by which many daemons use to log \
 # messages to various system log files.  It is a good idea to always \
 # run rsyslog.
@@ -11,8 +11,7 @@
 # Provides: $syslog
 # Required-Start: $local_fs $network $remote_fs
 # Required-Stop: $local_fs $network $remote_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: Enhanced system logging and kernel message trapping daemons
 # Description: Rsyslog is an enhanced multi-threaded syslogd supporting, 
 #              among others, MySQL, syslog/tcp, RFC 3195, permitted 
@@ -29,6 +28,12 @@
 	[ -x /sbin/rsyslogd ] || exit 5
 	[ -x /sbin/rklogd ] || exit 5
 
+	# Do not start rsyslog when sysklogd is running
+	if [ -e /var/run/syslogd.pid ] ; then
+		echo $"Shut down sysklogd before you run rsyslog";
+		exit 1;
+	fi
+
 	# Source config
 	if [ -f /etc/sysconfig/rsyslog ] ; then
         	. /etc/sysconfig/rsyslog
@@ -42,21 +47,21 @@
 	fi
 	umask $SYSLOG_UMASK
 
-        echo -n $"Starting system logger (rsyslog): "
+        echo -n $"Starting system logger: "
         daemon rsyslogd $SYSLOGD_OPTIONS
         RETVAL=$?
         echo
-        echo -n $"Starting kernel logger (rklogd): "
+        echo -n $"Starting kernel logger: "
         daemon rklogd $KLOGD_OPTIONS
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog
         return $RETVAL
 }
 stop() {
-        echo -n $"Shutting down kernel logger (rklogd): "
+        echo -n $"Shutting down kernel logger: "
         killproc rklogd
         echo
-        echo -n $"Shutting down system logger (rsyslog): "
+        echo -n $"Shutting down system logger: "
         killproc rsyslogd
         RETVAL=$?
         echo
@@ -66,7 +71,7 @@
 reload()  {
     RETVAL=1
     syslog=`cat /var/run/rsyslogd.pid 2>/dev/null`
-    echo -n "Reloading syslogd..."
+    echo -n "Reloading system logger..."
     if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
 	kill -HUP "$syslog";
 	RETVAL=$?
@@ -78,7 +83,7 @@
     fi
     echo
     RETVAL=1
-    echo -n "Reloading klogd..."
+    echo -n "Reloading kernel logger..."
     klog=`cat /var/run/rklogd.pid 2>/dev/null`
     if [ -n "${klog}" ] && [ -e /proc/"${klog}" ]; then
 	kill -USR2 "$klog";

Modified: trunk/rpms/rsyslog/rsyslog.spec
===================================================================
--- trunk/rpms/rsyslog/rsyslog.spec	2008-09-30 21:21:11 UTC (rev 6495)
+++ trunk/rpms/rsyslog/rsyslog.spec	2008-10-02 22:43:04 UTC (rev 6496)
@@ -1,38 +1,54 @@
-# $id$
-# Authority: dries
+# $Id$
+# Authority: dag
 
-# Tag: test
+# Rationale: This package is part of RHEL5
 
+# ExclusiveDist: el2 rh7 rh9 el3 el4
 
-%define with_db 1
-%define	sbindir	/sbin
-%define libdir /lib
+%{?el3:%define _without_mysql4 1}
+%{?rh9:%define _without_mysql4 1}
+%{?rh7:%define _without_mysql4 1}
+%{?el2:%define _without_mysql4 1}
 
+%define _sbindir /sbin
+
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.2
-Release: 1
-License: GPL
+Version: 2.0.0
+Release: 0.11
+License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
-Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
+
+Source0: http://download.rsyslog.com/rsyslog/rsyslog-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Conflicts: logrotate < 3.5.2
-%if %{with_db}
-BuildRequires: mysql-devel >= 4.0
-%endif
+Source3: syslog.log
+Patch1: rsyslog-2.0.0-sockhang.patch
+Patch2: rsyslog-2.0.0-forwardMsg.patch
+Patch3: rsyslog-2.0.0-manPage.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: autoconf >= 1.10
+BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: zlib-devel
-Requires: logrotate
+%{!?_without_mysql4:BuildRequires: mysql-devel >= 4.0}
+Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
-Requires(preun): /sbin/chkconfig /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): /sbin/service
 Provides: syslog
-Provides: sysklogd = 1.4.3-1
-Obsoletes: sysklogd < 1.4.3-1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Conflicts: sysklogd < 1.4.1-43
+### A lot of packages depend on sysklogd, we provide this for RHEL4 and older
+Provides: sysklogd
 
+%package mysql
+Summary: MySQL support for rsyslog
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
 %description
 Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL,
 syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part,
@@ -42,106 +58,159 @@
 at the same time being very easy to setup for the novice user.
 
 
+%description mysql
+The rsyslog-mysql package contains a dynamic shared object that will add
+MySQL database support to rsyslog.
+
 %prep
-%setup -q
+%setup
+%patch1 -p1 -b .sockHang
+%patch2 -p1 -b .forwardMsg
+%patch3 -p1 -b .manPage
 
 %build
-%configure --sbindir=%{sbindir} --enable-mysql --libdir=%{libdir}
-make %{?_smp_mflags}
+export CFLAGS="%{optflags} -DHAVE_DECL_STRERROR_R -DSTRERROR_R_CHAR_P"
+%configure --disable-static --enable-mysql
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__install} -Dp -m0644 redhat/rsyslog.conf %{buildroot}%{_sysconfdir}/rsyslog.conf
+%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/rsyslog
+%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog
+%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 
-install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog
-install -p -m 644 redhat/rsyslog.conf $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
-install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rsyslog
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyslog
-
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
-if [ $1 = 1 ]; then
-	/sbin/chkconfig --add rsyslog
-fi
-for n in /var/log/{messages,secure,maillog,spooler}
-do
-	[ -f $n ] && continue
-	umask 066 && touch $n
+/sbin/chkconfig --add rsyslog
+for log in /var/log/{messages,secure,maillog,spooler}; do
+    [ -f $log ] && continue
+    umask 066 && touch $log
 done
-#use sysklogd configuration files
-if [ -f /etc/syslog.conf ]; then
-	mv -f /etc/rsyslog.conf /etc/rsyslog.conf.rpmnew
-	mv -f /etc/syslog.conf  /etc/rsyslog.conf
-fi
-if [ -f /etc/sysconfig/syslog ]; then
-	mv -f /etc/sysconfig/rsyslog /etc/sysconfig/rsyslog.rpmnew
-	mv -f /etc/sysconfig/syslog  /etc/sysconfig/rsyslog
-fi
 
 %preun
-if [ $1 = 0 ]; then
-	service rsyslog stop >/dev/null 2>&1 ||:
-	/sbin/chkconfig --del rsyslog
+if [ $1 -eq 0 ]; then
+    service rsyslog stop &>/dev/null ||:
+    /sbin/chkconfig --del rsyslog
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
-	service rsyslog condrestart > /dev/null 2>&1 ||:
-fi	
+if [ $1 -ge 1 ]; then
+    service rsyslog condrestart &>/dev/null ||:
+fi
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README doc
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING NEWS README doc/*html
+%doc %{_mandir}/man5/rsyslog.conf.5*
+%doc %{_mandir}/man8/rfc3195d.8*
+%doc %{_mandir}/man8/rklogd.8*
+%doc %{_mandir}/man8/rsyslogd.8*
+%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
-%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
-%{_initrddir}/rsyslog
-%{sbindir}/rsyslogd
-%{sbindir}/rklogd
-%{sbindir}/rfc3195d
-%{_mandir}/*/*
+%config %{_initrddir}/rsyslog
+%dir %{_libdir}/rsyslog/
+%{_sbindir}/rfc3195d
+%{_sbindir}/rklogd
+%{_sbindir}/rsyslogd
 
-%package mysql
-Group: System Environment/Daemons
-Summary: MySQL plugin for rsyslog
-Requires: %{name} = %{version}
-
-%description mysql
-MySQL output module for rsyslog
-
+%if %{!?_without_mysql4:1}0
 %files mysql
-%defattr(-,root,root,-)
-%{libdir}/%{name}/ommysql.so*
-%exclude %{libdir}/%{name}/*.a
-%exclude %{libdir}/%{name}/*.la
+%defattr(-, root, root, 0755)
+%doc plugins/ommysql/createDB.sql
+%dir %{_libdir}/rsyslog/
+%{_libdir}/rsyslog/ommysql.so
+%exclude %{_libdir}/rsyslog/*.la
+%endif
 
 %changelog
-* Mon Aug 28 2007 Michael Mansour <mic at npgx.com.au> 1.19.2-1
-- upstream bugfix release
+* Thu Oct 02 2008 Dag Wieers <dag at wieers.com> - 2.0.0-0.11
+- Initial package. (based on RHEL5)
 
-* Mon Aug 23 2007 Michael Mansour <mic at npgx.com.au> 1.19.1-1
-- upstream bugfix and enhancement release
+* Thu Feb 07 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-11
+- spec file adjustment
+  Resolves: #431070
 
-* Mon Aug 16 2007 Michael Mansour <mic at npgx.com.au> 1.19.0-1
-- supports dynamically loading of output plug-ins
-- the MySQL output module has been converted into a loadable plug-in
-- two RPM packages are now created, rsyslog and rsyslog-mysql
+* Thu Feb 07 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-10
+- fix documentation problems
+- init sript fixes
+  Resolves: #431070, #431583
 
-* Mon Aug 13 2007 Michael Mansour <mic at npgx.com.au> 1.18.2-1
+* Wed Jan 23 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-9
+- do not use autoconf in order to build it on RHEL5,
+  Resolves: #178855
+
+* Tue Jan 22 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-8
+- strerror fix,
+  Resolves: #178855
+ 
+* Mon Jan 21 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-7
+- change from requires sysklogd to conflicts sysklogd
+
+* Fri Jan 18 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-6
+- change logrotate file
+- use rsyslog own pid file
+
+* Thu Jan 17 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-5
+- fixing bad descriptor (#428775)
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-4
+- rename logrotate file
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-3
+- fix post script and init file
+
+* Wed Jan 16 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-2
+- change pid filename and use logrotata script from sysklogd
+
+* Tue Jan 15 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.0-1
+- upgrade to stable release
+- spec file clean up
+
+* Wed Jan 02 2008 Peter Vrabec <pvrabec at redhat.com> 1.21.2-1
+- new upstream release
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.19.11-2
+- Rebuild for deps
+
+* Thu Nov 29 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.11-1
+- new upstream release
+- add conflicts (#400671)
+
+* Mon Nov 19 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.10-1
+- new upstream release
+
+* Wed Oct 03 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.6-3
+- remove NUL character from recieved messages
+
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-2
+- fix message suppression (303341)
+
+* Tue Sep 25 2007 Tomas Heinrich <theinric at redhat.com> 1.19.6-1
 - upstream bugfix release
 
-* Mon Aug 9 2007 Michael Mansour <mic at npgx.com.au> 1.18.1-1
+* Tue Aug 28 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.2-1
 - upstream bugfix release
+- support for negative app selector, patch from 
+  theinric at redhat.com
 
-* Mon Aug 4 2007 Michael Mansour <mic at npgx.com.au> 1.18.0-1
+* Fri Aug 17 2007 Peter Vrabec <pvrabec at redhat.com> 1.19.0-1
+- new upstream release with MySQL support(as plugin)
+
+* Wed Aug 08 2007 Peter Vrabec <pvrabec at redhat.com> 1.18.1-1
 - upstream bugfix release
 
+* Mon Aug 06 2007 Peter Vrabec <pvrabec at redhat.com> 1.18.0-1
+- new upstream release
+
+* Thu Aug 02 2007 Peter Vrabec <pvrabec at redhat.com> 1.17.6-1
+- upstream bugfix release
+
 * Mon Jul 30 2007 Peter Vrabec <pvrabec at redhat.com> 1.17.5-1
 - upstream bugfix release
 - fix typo in provides 

Modified: trunk/rpms/rsyslog/rsyslog.sysconfig
===================================================================
--- trunk/rpms/rsyslog/rsyslog.sysconfig	2008-09-30 21:21:11 UTC (rev 6495)
+++ trunk/rpms/rsyslog/rsyslog.sysconfig	2008-10-02 22:43:04 UTC (rev 6496)
@@ -1,6 +1,6 @@
 # Options to syslogd
 # -m 0 disables 'MARK' messages.
-# -r port Enables logging from remote machines. The listener will listen to the specified port.
+# -rPortNumber Enables logging from remote machines. The listener will listen to the specified port.
 # -x disables DNS lookups on messages recieved with -r
 # See syslogd(8) for more details
 SYSLOGD_OPTIONS="-m 0"

Added: trunk/rpms/rsyslog/syslog.log
===================================================================
--- trunk/rpms/rsyslog/syslog.log	                        (rev 0)
+++ trunk/rpms/rsyslog/syslog.log	2008-10-02 22:43:04 UTC (rev 6496)
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec	2008-09-30 21:21:11 UTC (rev 6495)
+++ trunk/rpms/vlc/vlc.spec	2008-10-02 22:43:04 UTC (rev 6496)
@@ -123,7 +123,7 @@
 
 Summary: The VideoLAN client, also a very good standalone video player
 Name: vlc
-Version: 0.9.2
+Version: 0.9.3
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -468,6 +468,9 @@
 %endif
 
 %changelog
+* Thu Oct 02 2008 Dag Wieers <dag at wieers.com> - 0.9.3-1
+- Updated to release 0.9.3.
+
 * Mon Sep 15 2008 Dag Wieers <dag at wieers.com> - 0.9.2-1
 - Updated to release 0.9.2.
 




More information about the commits mailing list