ports/95011: sysutils/syslog-ng: Update to 1.6.9; add rcng support
Vince Valenti
vince at blue-box.net
Mon Mar 27 20:30:23 UTC 2006
>Number: 95011
>Category: ports
>Synopsis: sysutils/syslog-ng: Update to 1.6.9; add rcng support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 27 20:30:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vince Valenti
>Release: FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD kenny.blue-box.net 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Sun May 29 21:56:42 PDT 2005 vince at kenny.blue-box.net:/usr/obj/usr/src/sys/KENNY i386
>Description:
This update:
- Updates syslog-ng to version 1.6.9
- Removes dependency on libol as it is now included
- Removes obsolete USE_REINPLACE
- Adds a rcng startup script
>How-To-Repeat:
Old startup script (syslog-ng.sh.sample) is deleted.
>Fix:
diff -ruN syslog-ng/Makefile syslog-ng.new/Makefile
--- syslog-ng/Makefile Sun Feb 19 10:35:00 2006
+++ syslog-ng.new/Makefile Mon Mar 27 12:18:26 2006
@@ -6,7 +6,7 @@
#
PORTNAME= syslog-ng
-PORTVERSION= 1.6.8
+PORTVERSION= 1.6.9
CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/syslog-ng/1.6/src/ \
http://www.balabit.com/downloads/syslog-ng/1.6/src/old/
@@ -14,13 +14,11 @@
MAINTAINER= vince at blue-box.net
COMMENT= A powerful syslogd replacement
-BUILD_DEPENDS= ${LOCALBASE}/lib/libol.a:${PORTSDIR}/devel/libol
-
MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8
+USE_RC_SUBR= syslog-ng.sh
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
USE_GCC= 3.3+
PKGMESSAGE= ${WRKDIR}/MESSAGE
@@ -56,10 +54,6 @@
@if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \
${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \
${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \
- fi
- @if [ ! -f ${PREFIX}/etc/rc.d/syslog-ng.sh.sample ]; then \
- ${ECHO} "Installing ${PREFIX}/etc/rc.d/syslog-ng.sh.sample startup file."; \
- ${INSTALL_SCRIPT} ${FILESDIR}/syslog-ng.sh.sample ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
fi
@${CAT} ${PKGMESSAGE}
diff -ruN syslog-ng/distinfo syslog-ng.new/distinfo
--- syslog-ng/distinfo Mon Jan 23 17:06:34 2006
+++ syslog-ng.new/distinfo Sun Mar 19 11:44:45 2006
@@ -1,3 +1,3 @@
-MD5 (syslog-ng-1.6.8.tar.gz) = ffbad7e8e6dcbe385820b8ffba23b622
-SHA256 (syslog-ng-1.6.8.tar.gz) = 3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
-SIZE (syslog-ng-1.6.8.tar.gz) = 383589
+MD5 (syslog-ng-1.6.9.tar.gz) = 5280a86b4f5c25b2ba157c8cea302cf0
+SHA256 (syslog-ng-1.6.9.tar.gz) = e7f2d6dbeae17c14245cd20e9893d0144b969d98a29c230d4e8a0c9cc0f7dde9
+SIZE (syslog-ng-1.6.9.tar.gz) = 765341
diff -ruN syslog-ng/files/syslog-ng.sh.in syslog-ng.new/files/syslog-ng.sh.in
--- syslog-ng/files/syslog-ng.sh.in Wed Dec 31 16:00:00 1969
+++ syslog-ng.new/files/syslog-ng.sh.in Mon Mar 27 11:48:21 2006
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: syslogd
+# REQUIRE: mountcritremote cleanvar
+# BEFORE: SERVERS
+
+#
+# Add the following line to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+#syslog_ng_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=syslog_ng
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/syslog-ng
+required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+pidfile=/var/run/syslog.pid
+extra_commands=reload
+stop_postcmd=stop_postcmd
+
+load_rc_config $name
+
+: ${syslog_ng_enable:="NO"}
+
+stop_postcmd() {
+ rm -f $pidfile
+}
+
+run_rc_command "$1"
diff -ruN syslog-ng/files/syslog-ng.sh.sample syslog-ng.new/files/syslog-ng.sh.sample
--- syslog-ng/files/syslog-ng.sh.sample Wed Jul 5 05:36:56 2000
+++ syslog-ng.new/files/syslog-ng.sh.sample Wed Dec 31 16:00:00 1969
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-case "$1" in
-start)
- [ -x ${PREFIX}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && echo -n ' syslog-ng'
- ;;
-stop)
- killall syslog-ng && echo -n ' syslog-ng'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff -ruN syslog-ng/pkg-message syslog-ng.new/pkg-message
--- syslog-ng/pkg-message Sun Dec 2 10:31:06 2001
+++ syslog-ng.new/pkg-message Mon Mar 27 11:55:37 2006
@@ -5,19 +5,13 @@
1. Create a configuration file named __PREFIX__/etc/syslog-ng/syslog-ng.conf
(a sample named syslog-ng.conf.sample has been included)
-2. If you are using FreeBSD 4.4 or later, add these lines to your /etc/rc.conf:
+2. Configure syslog-ng to start automatically by adding the following
+ to /etc/rc.conf:
- syslogd_program="__PREFIX__/sbin/syslog-ng"
- syslogd_flags=""
+ syslog_ng_enable="YES"
-3. If you are using FreeBSD 4.3 or earlier, follow these steps:
-
- a. Configure syslog-ng to start automatically by creating a startup script
- in __PREFIX__/etc/rc.d. (a sample named syslog-ng.sh.sample has been
- included)
-
- b. Prevent the standard FreeBSD syslogd from starting automatically by
- adding a line to the end of your /etc/rc.conf file that reads:
+3. Prevent the standard FreeBSD syslogd from starting automatically by
+ adding a line to the end of your /etc/rc.conf file that reads:
syslogd_enable="NO"
@@ -27,5 +21,5 @@
5. Start syslog-ng:
- __PREFIX__/sbin/syslog-ng
+ __PREFIX__/etc/rc.d/syslog-ng.sh start
diff -ruN syslog-ng/pkg-plist syslog-ng.new/pkg-plist
--- syslog-ng/pkg-plist Thu Jul 7 11:57:24 2005
+++ syslog-ng.new/pkg-plist Mon Mar 27 12:22:21 2006
@@ -1,4 +1,4 @@
-etc/rc.d/syslog-ng.sh.sample
+ at unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/syslog-ng/syslog-ng.conf.sample
sbin/syslog-ng
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list