SOURCES: syslog-ng-fixes.patch - up from git
arekm
arekm at pld-linux.org
Thu Feb 19 21:09:03 CET 2009
Author: arekm Date: Thu Feb 19 20:09:03 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up from git
---- Files affected:
SOURCES:
syslog-ng-fixes.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/syslog-ng-fixes.patch
diff -u SOURCES/syslog-ng-fixes.patch:1.4 SOURCES/syslog-ng-fixes.patch:1.5
--- SOURCES/syslog-ng-fixes.patch:1.4 Thu Feb 5 11:34:23 2009
+++ SOURCES/syslog-ng-fixes.patch Thu Feb 19 21:08:58 2009
@@ -1,163 +1,2563 @@
---- syslog-ng-3.0.1/src/misc.c~ 2008-11-05 20:57:42.000000000 +0100
-+++ syslog-ng-3.0.1/src/misc.c 2009-01-16 11:43:30.896633603 +0100
-@@ -274,7 +274,7 @@
- struct passwd *pw;
+diff --git a/configure.in b/configure.in
+index d5f0769..1605bff 100644
+--- a/configure.in
++++ b/configure.in
+@@ -49,10 +49,8 @@ fi
- *uid = 0;
-- if (*user)
-+ if (!*user)
- return FALSE;
+ if test "x$prefix" = "xNONE"; then
+ prefix=$ac_default_prefix
+- pidfiledir="/var/run"
+-else
+- pidfiledir="${prefix}/var/run"
+ fi
++pidfiledir="${localstatedir}"
+
+ AM_CONFIG_HEADER(config.h)
+
+@@ -70,7 +68,7 @@ AC_ARG_WITH(pidfile-dir,
+
+ AC_ARG_WITH(timezone-dir,
+ [ --with-timezone-dir=path Use path as the directory to get the timezone files],
+- timezone_dir=$with_timezone_dir)
++ timezonedir=$with_timezone_dir)
+
+ AC_ARG_WITH(ld-library-path,
+ [ --with-ld-library-path=path Set LD_LIBRARY_PATH during runtime to the value given],
+@@ -92,10 +90,13 @@ AC_ARG_ENABLE(ssl,
+ [ --enable-ssl Enable SSL support.],,enable_ssl="auto")
+
+ AC_ARG_ENABLE(dynamic-linking,
+- [ --enable-dynamic-linking Link glib and eventlog dynamically instead of statically.])
++ [ --enable-dynamic-linking Link glib and eventlog dynamically instead of statically.],,enable_dynamic_linking="auto")
+
+ AC_ARG_ENABLE(static-linking,
+- [ --enable-static-linking Link everything statically.])
++ [ --enable-static-linking Link everything statically.],,enable_static_linking="auto")
++
++AC_ARG_ENABLE(mixed-linking,
++ [ --enable-mixed-linking Link 3rd party libraries statically, system libraries dynamically],,enable_mixed_linking="auto")
+
+ AC_ARG_ENABLE(ipv6,
+ [ --enable-ipv6 Enable support for IPv6.],,enable_ipv6="auto")
+@@ -319,9 +320,6 @@ dnl ***************************************************************************
+ dnl OpenSSL headers/libraries
+ dnl ***************************************************************************
+
+-OPENSSL_LIBS=""
+-OPENSSL_CPPFLAGS=""
+-
+ # openssl is needed for:
+ # * TLS support
+
+@@ -360,7 +358,13 @@ dnl libdbi headers/libraries
+ dnl ***************************************************************************
+
+ AC_CHECK_LIB(dl, dlsym, DL_LIBS="-ldl")
+-PKG_CHECK_MODULES(LIBDBI, dbi >= $LIBDBI_MIN_VERSION,, LIBDBI_LIBS="")
++PKG_CHECK_MODULES(LIBDBI, dbi >= $LIBDBI_MIN_VERSION,, libdbi_pkgconfig_not_found="1")
++
++if test "$libdbi_pkgconfig_not_found" -eq 1; then
++ dnl if libdbi has no .pc file, try it without one
++ AC_CHECK_LIB(dbi, dbi_initialize, LIBDBI_LIBS="-ldbi"; LIBDBI_CFLAGS="-I/usr/include")
++fi
++
+
+ dnl ***************************************************************************
+ dnl Some more checks based on the detected settings above
+@@ -606,8 +610,42 @@ int main()
+ fi
+ fi
+
+-if test "x$enable_dynamic_linking" = "xyes" -a "x$enable_static_linking" = "xyes"; then
+- AC_MSG_ERROR([You cannot specify dynamic and static linking at the same time.])
++if test "$enable_dynamic_linking" = "auto" -a "$enable_static_linking" = "auto" -a "$enable_mixed_linking" = "auto"; then
++ enable_dynamic_linking="yes"
++ enable_static_linking="no"
++ enable_mixed_linking="no"
++fi
++
++linkopts=0
++if test "x$enable_dynamic_linking" = "xyes"; then
++ linkopts=`expr $linkopts + 1`
++fi
++if test "x$enable_static_linking" = "xyes"; then
++ linkopts=`expr $linkopts + 1`
++fi
++if test "x$enable_mixed_linking" = "xyes"; then
++ linkopts=`expr $linkopts + 1`
++fi
++
++if test "$linkopts" -gt 1; then
++ AC_MSG_ERROR([You cannot specify multiple linking options at the same time (--enable-dynamic-linking, --enable-static-linking, --enable-mixed-linking).])
++fi
++
++if test "x$enable_dynamic_linking" = "xyes"; then
++ enable_dynamic_linking="yes"
++ enable_static_linking="no"
++ enable_mixed_linking="no"
++ linking_mode="dynamic"
++elif test "x$enable_static_linking" = "xyes"; then
++ enable_dynamic_linking="no"
++ enable_static_linking="yes"
++ enable_mixed_linking="no"
++ linking_mode="static"
++elif test "x$enable_mixed_linking" = "xyes"; then
++ enable_dynamic_linking="no"
++ enable_static_linking="no"
++ enable_mixed_linking="yes"
++ linking_mode="mixed"
+ fi
+
+ if test "x$enable_dynamic_linking" != "xyes" -a "x$blb_cv_static_glib" = "xno"; then
+@@ -615,7 +653,7 @@ if test "x$enable_dynamic_linking" != "xyes" -a "x$blb_cv_static_glib" = "xno";
+ fi
+
+ if test "x$enable_dynamic_linking" != "xyes" -a "x$blb_cv_static_openssl" = "xno"; then
+- AC_MSG_ERROR([static OpenSSL libraries not found (libssl.a and libcrypto.a), either link OpenSSL statically using the --enable-dynamic-linking, or install a static OpenSSL])
++ AC_MSG_ERROR([static OpenSSL libraries not found (libssl.a, libcrypto.a and their external dependencies like libz.a), either link OpenSSL statically using the --enable-dynamic-linking, or install a static OpenSSL])
+ fi
+
+
+@@ -672,8 +710,8 @@ AC_DEFINE_UNQUOTED(PATH_PREFIX, "`patheval $prefix`", [prefix directory])
+ AC_DEFINE_UNQUOTED(PATH_SYSCONFDIR, "`patheval $sysconfdir`", [sysconfdir])
+ AC_DEFINE_UNQUOTED(PATH_LOCALSTATEDIR, "`patheval $localstatedir`", [local state directory])
+ AC_DEFINE_UNQUOTED(PATH_PIDFILEDIR, "`patheval $pidfiledir`", [local state directory])
+-if test -n "$timezone_dir"; then
+- AC_DEFINE_UNQUOTED(PATH_TIMEZONEDIR, "`patheval $timezone_dir`", [timezone base directory])
++if test -n "$timezonedir"; then
++ AC_DEFINE_UNQUOTED(PATH_TIMEZONEDIR, "`patheval $timezonedir`", [timezone base directory])
+ fi
+ if test -n "$env_ld_library_path"; then
+ AC_DEFINE_UNQUOTED(ENV_LD_LIBRARY_PATH, "$env_ld_library_path", [set LD_LIBRARY_PATH to this value])
+@@ -695,6 +733,8 @@ AC_DEFINE_UNQUOTED(ENABLE_ENV_WRAPPER, `enable_value $enable_env_wrapper`, [Enab
+
+ AM_CONDITIONAL(ENABLE_ENV_WRAPPER, [test "$enable_env_wrapper" = "yes"])
+
++AC_SUBST(timezonedir)
++AC_SUBST(pidfiledir)
+ AC_SUBST(DEPS_CPPFLAGS)
+ AC_SUBST(DEPS_LIBS)
+ AC_SUBST(BASE_LIBS)
+@@ -729,6 +769,7 @@ echo " compiler : $CC"
+ echo " compiler options : $CFLAGS $CPPFLAGS"
+ echo " linker flags : $LDFLAGS $LIBS"
+ echo " prefix : $prefix"
++echo " linking mode : $linking_mode"
+ echo " Features:"
+ echo " Sun STREAMS support : ${enable_sun_streams:=no}"
+ echo " Sun Door support : ${enable_sun_door:=no}"
+diff --git a/contrib/balabit-initscripts/init-functions b/contrib/balabit-initscripts/init-functions
+index e1898a8..c3b18ef 100644
+--- a/contrib/balabit-initscripts/init-functions
++++ b/contrib/balabit-initscripts/init-functions
+@@ -6,12 +6,35 @@ NORMAL=
+ FANCYTTY=
+ PSOPTS=
+
+-case `uname -s` in
++ECHO=echo
++
++OS=`uname -s`
++
++disable_xpg_echo() {
++ # \X chars only passed to echo under bash, if xpg_echo enabled or echo -e
++ # used on Linux.
++ if [ -n "$BASH_VERSION" ];then
++ shopt -s xpg_echo
++ fi
++}
++
++case $OS in
+ # default ps -e cuts the process' name at 8 characters, so we have to list it
+ # in a long form
+- SunOS) PSOPTS=" -o pid -o tty -o time -o comm" ;;
++ SunOS)
++ PSOPTS=" -o pid -o tty -o time -o comm"
++ disable_xpg_echo
++ ;;
++ Linux)
++ if [ -z "$BASH_VERSION" ]; then
++ # beware of dash's builtin echo ...
++ ECHO="/bin/echo -e"
++ fi
++ ;;
++ *) disable_xpg_echo ;;
+ esac
+
++
+ _checkpid() {
+ _pid=$1
+ _proc=$2
+@@ -30,7 +53,7 @@ _pid_from_pidfile() {
+ pid=
+
+ if [ -f "$pidfile" ];then
+- pid=`head -1 $pidfile`
++ pid=`head -1 $pidfile 2> /dev/null`
+ if [ $? -ne 0 ]; then
+ # on slow machines (or ones under high load) the pidfile could be
+ # erased between -f and `head` ...
+@@ -195,17 +218,17 @@ log_use_fancy_output() {
+
+
+ log_success_msg() {
+- echo "$@"
++ $ECHO "$@"
+ }
+
+ log_failure_msg() {
+ log_use_fancy_output
+- echo "${RED}$@${NORMAL}"
++ $ECHO "${RED}$@${NORMAL}"
+ }
+
+ log_warning_msg() {
+ log_use_fancy_output
+- echo "${YELLOW}$@${NORMAL}"
++ $ECHO "${YELLOW}$@${NORMAL}"
+ }
+
+ # NON-LSB Functions
+@@ -215,7 +238,7 @@ log_begin_msg() {
+ return 1
+ fi
+
+- echo "$@\c "
++ $ECHO "$@\c "
+ }
+
+ log_daemon_msg() {
+@@ -224,11 +247,11 @@ log_daemon_msg() {
+ fi
+
+ if [ -z "$2" ]; then
+- echo "$1:\c "
++ $ECHO "$1:\c "
+ return
+ fi
+
+- echo "$1: $2\c "
++ $ECHO "$1: $2\c "
+ }
+
+ log_progress_msg() {
+@@ -237,9 +260,9 @@ log_progress_msg() {
+ fi
+
+ if [ $1 -eq 0 ]; then
+- echo "."
++ $ECHO "."
+ else
+- echo " failed"
++ $ECHO " failed"
+ fi
+ }
+
+@@ -250,23 +273,23 @@ log_end_msg() {
+
+ log_fancy_output
+ if [ $1 -eq 0 ];then
+- echo "."
++ $ECHO "."
+ else
+- echo "${RED}failed!${NORMAL}"
++ $ECHO "${RED}failed!${NORMAL}"
+ fi
+ return $1
+ }
+
+ log_action_msg() {
+- echo "$@."
++ $ECHO "$@."
+ }
+
+ log_action_begin_msg() {
+- echo "$@...\c "
++ $ECHO "$@...\c "
+ }
+
+ log_action_cont_msg() {
+- echo "$@...\c "
++ $ECHO "$@...\c "
+ }
+
+ log_action_end_msg() {
+@@ -278,15 +301,12 @@ log_action_end_msg() {
+
+ log_fancy_output
+ if [ $1 -eq 0 ]; then
+- echo "done${end}"
++ $ECHO "done${end}"
+ else
+- echo "${RED}failed${end}${NORMAL}"
++ $ECHO "${RED}failed${end}${NORMAL}"
+ fi
+ }
+
+-# \X chars only passed to echo under bash, if xpg_echo enabled....
+-if [ -n "$BASH_VERSION" ];then
+- shopt -s xpg_echo
+-fi
+
+ # vim: ft=sh ts=2 expandtab
++
+diff --git a/contrib/balabit-initscripts/init.d b/contrib/balabit-initscripts/init.d
+index ff2e249..589da86 100644
+--- a/contrib/balabit-initscripts/init.d
++++ b/contrib/balabit-initscripts/init.d
+@@ -25,6 +25,7 @@ SYSLOGNG_PREFIX=/opt/syslog-ng
+ SYSLOGNG="$SYSLOGNG_PREFIX/sbin/syslog-ng"
+ CONFFILE=$SYSLOGNG_PREFIX/etc/syslog-ng.conf
+ PIDFILE=$SYSLOGNG_PREFIX/var/run/syslog-ng.pid
++SYSLOGPIDFILE="/var/run/syslog.pid"
+
+ INIT_FUNCTIONS=/lib/lsb/init-functions
+ SLNG_INIT_FUNCTIONS=$SYSLOGNG_PREFIX/lib/init-functions
+@@ -64,6 +65,17 @@ if [ -f /etc/lsb-release ]; then
+ . /etc/lsb-release
+ fi
+
++if [ -f "/etc/redhat-release" ];then
++ # redhat uses a different syslogd pidfile...
++ SYSLOGPIDFILE="/var/run/syslogd.pid"
++fi
++
++if [ "$OS" = "SunOS" ] || [ "$OS" = "Solaris" ];then
++ if [ "`uname -r`" = "5.8" ];then
++ SYSLOGPIDFILE="/etc/syslog.pid"
++ fi
++fi
++
+ if [ -f /lib/lsb/init-functions ];then
+ # long list of exclusions...
+ if [ -f "/etc/redhat-release" ] || [ -f "/etc/SuSE-release" ];then
+@@ -117,7 +129,7 @@ check_syntax() {
+
+ slng_waitforpid() {
+ _pid=$1
+- _process=$2
++ _process=$2
+ _cnt=$MAXWAIT
+
+ # no pid, return...
+@@ -147,6 +159,11 @@ returnmessage() {
+
+ syslogng_start() {
+ echo_n "Starting syslog-ng: "
++ PID=`pidofproc -p ${PIDFILE} ${SYSLOGNG} | head -1`
++ if [ -n "$PID" ] && [ $PID -gt 0 ] ;then
++ log_success_msg "already running: $PID"
++ return $retval
++ fi
+ start_daemon -p ${PIDFILE} ${SYSLOGNG} ${SYSLOGNG_OPTIONS}
+ retval=$?
+ returnmessage $retval
+@@ -154,6 +171,13 @@ syslogng_start() {
+ if [ "$OS" = "Linux" ] && [ -d $SUBSYSDIR ];then
+ touch $SUBSYSDIR/syslog-ng
+ fi
++ # remove symlinks
++ if [ -h $SYSLOGPIDFILE ];then
++ rm -f $SYSLOGPIDFILE
++ fi
++ if [ ! -f $SYSLOGPIDFILE ];then
++ ln -s $PIDFILE $SYSLOGPIDFILE
++ fi
+ fi
+ return $retval
+ }
+@@ -180,6 +204,9 @@ syslogng_stop() {
+ fi
+ if [ $retval -eq 0 ];then
+ rm -f $SUBSYSDIR/syslog-ng ${PIDFILE}
++ if [ -h $SYSLOGPIDFILE ];then
++ rm -f $SYSLOGPIDFILE
++ fi
+ fi
+ return $retval
+ }
+@@ -270,6 +297,14 @@ case "$1" in
+ force-reload)
+ syslogng_restart
+ ;;
++ reload-or-restart)
++ PID=`pidofproc -p ${PIDFILE} ${SYSLOGNG} | head -1`
++ if [ -n "$PID" ] && [ $PID -gt 0 ] ;then
++ syslogng_reload
++ else
++ syslogng_start
++ fi
++ ;;
+ status)
+ syslogng_status
+ ;;
+@@ -284,4 +319,4 @@ esac
+
+ exit $retval
+
+-# vim: ts=2 ft=sh
++# vim: ts=2 ft=sh noexpandtab
+diff --git a/contrib/balabit-initscripts/init.d.freebsd b/contrib/balabit-initscripts/init.d.freebsd
+index 997b4db..de04473 100644
+--- a/contrib/balabit-initscripts/init.d.freebsd
++++ b/contrib/balabit-initscripts/init.d.freebsd
+@@ -33,9 +33,13 @@ command="$SYSLOGNG_PREFIX/sbin/syslog-ng"
+ required_files="$SYSLOGNG_PREFIX/etc/syslog-ng.conf"
+
+ start_precmd="syslog_ng_start_precmd"
++start_postcmd="syslog_ng_start_postcmd"
++stop_postcmd="syslog_ng_stop_postcmd"
+ reload_precmd="syslog_ng_reload_precmd"
+ extra_commands="reload"
+
++# get original syslog pidfile from initscript.
++_syslogd_pidfile=`sed -n -e 's/^pidfile="\([^"]*\)"/\1/p' /etc/rc.d/syslogd 2> /dev/null`
+ syslog_ng_start_precmd() {
+ if [ ! -L /dev/log ]; then
+ ln -s /var/run/log /dev/log
+@@ -50,6 +54,26 @@ syslog_ng_reload_precmd() {
+ fi
+ }
+
++syslog_ng_start_postcmd() {
++ if [ -n "$_syslogd_pidfile" ]; then
++ # remove symlinks
++ if [ -h $_syslogd_pidfile ]; then
++ rm -f $_syslogd_pidfile
++ fi
++ if [ ! -f $_syslogd_pidfile ]; then
++ ln -s "$pidfile" "$_syslogd_pidfile"
++ fi
++ fi
++}
++
++syslog_ng_stop_postcmd() {
++ if [ -n "$_syslogd_pidfile" ]; then
++ if [ -h $_syslogd_pidfile ]; then
++ rm -f "$_syslogd_pidfile"
++ fi
++ fi
++}
++
+ load_rc_config "$name"
+
+ case $1 in
+diff --git a/contrib/cygwin-packaging/cygwin-postinstall b/contrib/cygwin-packaging/cygwin-postinstall
+index 4b7bf7d..e812ead 100755
+--- a/contrib/cygwin-packaging/cygwin-postinstall
++++ b/contrib/cygwin-packaging/cygwin-postinstall
+@@ -21,11 +21,11 @@ then
+ exit 3
+ fi
+ mkdir -p "${DESTDIR}/usr/bin"
+-mkdir -p "${DESTDIR}/usr/share/doc/syslog-ng"
++#mkdir -p "${DESTDIR}/usr/share/doc/syslog-ng"
+ mkdir -p "${DESTDIR}/usr/share/doc/Cygwin"
+ cp contrib/cygwin-packaging/syslog-ng-config "${DESTDIR}/usr/bin"
+-cp -rp doc/examples/syslog-ng.conf.s* doc/reference/syslog-ng.[tx]* "${DESTDIR}/usr/share/doc/syslog-ng"
+-tar xzfC doc/reference/syslog-ng.html.tar.gz "${DESTDIR}/usr/share/doc/syslog-ng"
++#cp -rp doc/examples/syslog-ng.conf.s* doc/reference/syslog-ng.[tx]* "${DESTDIR}/usr/share/doc/syslog-ng"
++#tar xzfC doc/reference/syslog-ng.html.tar.gz "${DESTDIR}/usr/share/doc/syslog-ng"
+ cat > "${DESTDIR}/usr/share/doc/Cygwin/syslog-ng.README" <<'EOF'
+ If you want to use syslog-ng, just run the /usr/bin/syslog-ng-config
+ script. This script will create a default configuration file
+@@ -42,15 +42,15 @@ The syslog-ng package has been built using the following command
+ sequence from the top level source dir:
+
+ ./configure \
+- --disable-ipv6 \
+- --disable-tcp-wrapper \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir='$(prefix)/sbin' \
+ --localstatedir=/var \
+ --datadir='$(prefix)/share' \
+ --mandir='$(prefix)/share/man' \
+- --infodir='$(prefix)/share/info'
++ --infodir='$(prefix)/share/info' \
++ --enable-dynamic-linking \
++ --with-pidfile-dir=/var
+ make
+ make install-strip
+ contrib/cygwin-packaging/cygwin-postinstall
+diff --git a/contrib/cygwin-packaging/syslog-ng-config b/contrib/cygwin-packaging/syslog-ng-config
+index 790f0cc..7ae5fec 100755
+--- a/contrib/cygwin-packaging/syslog-ng-config
++++ b/contrib/cygwin-packaging/syslog-ng-config
+@@ -205,13 +205,13 @@ if [ ! -f "${SYSCONFDIR}/syslog-ng.conf" ]
+ then
+ echo "Creating default ${SYSCONFDIR}/syslog-ng.conf file"
+ cat > ${SYSCONFDIR}/syslog-ng.conf << EOF
++ at version 3.0
+ options {
+ keep_hostname(yes);
+- chain_hostnames(no);
+ owner("system");
+ group("root");
+ perm(0664);
+- sync(0);
++ flush_lines(0);
+ };
+
+ source applications {
+@@ -220,7 +220,7 @@ source applications {
+ };
+
+ source kernel {
+- file("/dev/kmsg", log_prefix("kernel: "));
++ file("/dev/kmsg", program_override("kernel: "));
+ };
+
+ destination messages {
+@@ -240,42 +240,35 @@ EOF
+ fi
+ setfacl -m u:system:rw- "${SYSCONFDIR}/syslog-ng.conf"
+
+-# Check if running on NT
+-_sys="`uname`"
+-_nt=`expr "${_sys}" : "CYGWIN_NT"`
+-# On NT ask if syslog-ng should be installed as service
+-if [ ${_nt} -gt 0 ]
++# Check if syslogd is installed and remove on user request.
++if cygrunsrv -Q syslogd > /dev/null 2>&1
+ then
+- # Check if syslogd is installed and remove on user request.
+- if cygrunsrv -Q syslogd > /dev/null 2>&1
++ echo "Warning: The syslogd service is already installed. You can not"
++ echo "run both, syslogd and syslog-ng in parallel."
++ echo
++ if request "Do you want to deinstall the syslogd service in favor of syslog-ng?"
+ then
+- echo "Warning: The syslogd service is already installed. You can not"
+- echo "run both, syslogd and syslog-ng in parallel."
+- echo
+- if request "Do you want to deinstall the syslogd service in favor of syslog-ng?"
+- then
+- cygrunsrv -E syslogd
+- cygrunsrv -R syslogd
+- fi
++ cygrunsrv -E syslogd
++ cygrunsrv -R syslogd
+ fi
+- # Install syslog-ng service if it is not already installed
+- if ! cygrunsrv -Q syslog-ng > /dev/null 2>&1
++fi
++# Install syslog-ng service if it is not already installed
++if ! cygrunsrv -Q syslog-ng > /dev/null 2>&1
++then
++ echo
++ echo
++ echo "Warning: The following function requires administrator privileges!"
++ echo
++ echo "Do you want to install syslog-ng as service?"
++ if request "(Say \"no\" if it's already installed as service)"
+ then
+- echo
+- echo
+- echo "Warning: The following function requires administrator privileges!"
+- echo
+- echo "Do you want to install syslog-ng as service?"
+- if request "(Say \"no\" if it's already installed as service)"
++ if cygrunsrv -I syslog-ng -d "CYGWIN syslog-ng" -p /usr/sbin/syslog-ng -a "-F --fd-limit 256"
+ then
+- if cygrunsrv -I syslog-ng -d "CYGWIN syslog-ng" -p /usr/sbin/syslog-ng -a -F
+- then
+- echo
+- echo "The service has been installed under LocalSystem account."
+- echo "To start the service, call \`net start syslog-ng' or \`cygrunsrv -S syslog-ng'."
+- echo
+- echo "Check ${SYSCONFDIR}/syslog-ng.conf first, if it suits your needs."
+- fi
++ echo
++ echo "The service has been installed under LocalSystem account."
++ echo "To start the service, call \`net start syslog-ng' or \`cygrunsrv -S syslog-ng'."
++ echo
++ echo "Check ${SYSCONFDIR}/syslog-ng.conf first, if it suits your needs."
+ fi
+ fi
+ fi
+diff --git a/contrib/solaris-packaging/syslog-ng.method b/contrib/solaris-packaging/syslog-ng.method
+index f0fee58..d819a3c 100755
+--- a/contrib/solaris-packaging/syslog-ng.method
++++ b/contrib/solaris-packaging/syslog-ng.method
+@@ -13,6 +13,7 @@ SYSLOGNG_PREFIX=/opt/syslog-ng
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/syslog-ng-fixes.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list