syslog-ng3: merge r28891, r29283

SVN-Revision: 30303

diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile
index 3372377e53eec3116b31f19db8ab6b7631e2d10d..0a85fac98860236901ccd4c5e6761853ecb1b1a0 100644 (file)
--- a/admin/syslog-ng3/Makefile
+++ b/admin/syslog-ng3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=3.0.5
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/syslog-ng3
   SECTION:=admin
   CATEGORY:=Administration
-  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +zlib
+  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib
   TITLE:=A powerful syslog daemon
   URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
 endef

diff --git a/admin/syslog-ng3/files/syslog-ng.init b/admin/syslog-ng3/files/syslog-ng.init
index 4609f6fab955fd1d81374ca23f7af5e9661a6ed8..a8bad3d98943107ca41102f71cd0c5eac9d7f260 100644 (file)
--- a/admin/syslog-ng3/files/syslog-ng.init
+++ b/admin/syslog-ng3/files/syslog-ng.init
@@ -1,27 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
+SERVICE_USE_PID=1
+
 start() {
-  [ -f /etc/syslog-ng.conf ] || {
-    echo "/etc/syslog-ng.conf does not exist !";
-    exit 0;
-  };
-  [ -d /var/run ] || mkdir -p /var/run
-  [ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng
+       [ -f /etc/syslog-ng.conf ] || return 1
+       service_start /usr/sbin/syslog-ng
 }
 
 stop() {
-  killall syslog-ng
-}
-
-restart() {
-       stop
-       sleep 1
-       start
+       service_stop /usr/sbin/syslog-ng
 }
 
 reload() {
-       kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null
+       service_reload /usr/sbin/syslog-ng
 }
-