[packages_10.03.2] ulogd: merge r28919

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30273 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index ddfdc1c..83ae37e 100644 (file)
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ulogd
 PKG_VERSION:=1.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
@@ -26,7 +26,7 @@ endef
 
 define Package/ulogd
   $(call Package/ulogd/Default)
-  DEPENDS:=+iptables
+  DEPENDS:=+iptables-mod-ulog 
   TITLE:=Netfilter userspace logging daemon
   MENU:=1
 endef

diff --git a/net/ulogd/files/ulogd.init b/net/ulogd/files/ulogd.init
index aef82e7..1e13bdb 100644 (file)
--- a/net/ulogd/files/ulogd.init
+++ b/net/ulogd/files/ulogd.init
@@ -1,16 +1,17 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=ulogd
-DEFAULT=/etc/default/$BIN
-LOG_D=/var/log
+PROG="ulogd"
+COMMAND="/usr/sbin/$PROG"
+DEFAULT="/etc/default/$PROG"
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       $BIN $OPTIONS
+       service_start $COMMAND $OPTIONS
 }
 
 stop() {
-       killall $BIN
+       service_stop $COMMAND
 }