rpms/syslog-ng/F-10 syslog-ng-2.1.4-libnet.patch, NONE, 1.1 syslog-ng.init.d, NONE, 1.1 sources, 1.19, 1.20

[rayvd]

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24928

Modified Files:
	sources 
Added Files:
	syslog-ng-2.1.4-libnet.patch syslog-ng.init.d 
Log Message:
Goofed with sources

syslog-ng-2.1.4-libnet.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syslog-ng-2.1.4-libnet.patch ---
diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
+++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
@@ -466,7 +466,7 @@
 elif test "x$enable_static_linking" = "xyes"; then
 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
 else
-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
 fi
 LIBS="$DEPS_LIBS"
 YFLAGS="-d"


--- NEW FILE syslog-ng.init.d ---
#!/bin/sh
#
# syslog-ng starts/stops syslog-ng service
#
# chkconfig: - 12 88
# description: Syslog is the facility by which many daemons use to log \
#     messages to various system log files.
#

### BEGIN INIT INFO
# Provides: $syslog
# Required-Start: $local_fs
# Required-Stop: $local_fs
# Short-Description: Next-generation syslog server
# Description: syslog-ng, as the name shows, is a syslogd replacement, but
#     with new functionality for the new generation. The original syslogd
#     allows messages only to be sorted based on priority/facility pairs;
#     syslog-ng adds the possibility to filter based on message contents
#     using regular expressions. The new configuration scheme is intuitive
#     and powerful.  Forwarding logs over TCP and remembering all forwarding
#     hops makes it ideal for firewalled environments.  
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -e /etc/sysconfig/syslog-ng ] && . /etc/sysconfig/syslog-ng

RETVAL=0

check_syntax()
{
	[ -x /sbin/syslog-ng ] || exit 5
	syslog-ng -s $SYSLOGNG_OPTIONS
	RETVAL=$?
	return $RETVAL
}

verify_config()
{
	check_syntax
	RETVAL=$?
	[ $RETVAL -eq 0 ] || exit $retval
}

checkconfig()
{
	action $"Checking Configuration: " check_syntax
}

start()
{
	verify_config
	echo -n $"Starting syslog-ng: "
	if [ -e $SYSLOGNG_COMPAT_PID ]; then
		failure "PID file for existing syslog daemon exists"
	fi
	daemon syslog-ng $SYSLOGNG_OPTIONS
	ln -sf $SYSLOGNG_PID $SYSLOGNG_COMPAT_PID
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
	return $RETVAL
}

stop()
{
	echo -n $"Stopping syslog-ng: "
	REMOVE_COMPAT_PID=0
	if [ -e $SYSLOGNG_PID ]; then
		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
			REMOVE_COMPAT_PID=1
		fi
	fi
	killproc syslog-ng
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/syslog-ng
	[ $RETVAL -eq 0 -a $REMOVE_COMPAT_PID -eq 1 ] && rm -f $SYSLOGNG_COMPAT_PID
	return $RETVAL
}

reload()
{
	verify_config
	echo -n $"Reloading syslog-ng: "
	killproc syslog-ng -HUP
	RETVAL=$?
	echo
	return $RETVAL
}

restart()
{
	stop
	start
}


case "$1" in
	start|stop|reload)
		$1
		;;
	restart|force_reload)
		restart
		;;
	status)
		status syslog-ng
		;;
	checkconfig|configtest|check|test)
		checkconfig
		;;
	condrestart|try-restart)
		[ -f /var/lock/subsys/syslog-ng ] && restart || :
		;;
	*)
		echo $"Usage: $0 {start|stop|restart|reload|condrestart|checkconfig}"
		exit 1
esac

exit $?

# vim: ft=sh:ts=4:ai:si:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Sep 2009 04:20:09 -0000	1.19
+++ sources	16 Sep 2009 04:25:42 -0000	1.20
@@ -1,3 +1 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
-02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch
-61c794092a4c86ee4b152df74f44c954  syslog-ng.init.d