freecwmp: upgrade to latest git version

SVN-Revision: 35668

diff --git a/utils/freecwmp/Config.in b/utils/freecwmp/Config.in
index 95f358329e33099c2cfa5059469838713035ea07..3b81e60395e29696e8be6f462fb2a00982a2e87c 100644 (file)
--- a/utils/freecwmp/Config.in
+++ b/utils/freecwmp/Config.in
@@ -19,8 +19,8 @@ config FREECWMP_DEBUG
        bool "Compile with debug options"
        default n
 
-config FREECWMP_DEVEL_DEBUG
-       bool "Compile with development debug options"
+config FREECWMP_DEVEL
+       bool "Compile with development options"
        default n
 
 endif

diff --git a/utils/freecwmp/Makefile b/utils/freecwmp/Makefile
index 6b70fa4215ab2f04fec3812f33c02ee1c99f94b3..c0cfd0cedeae63c98ff6d8511b1754e42f10e5b2 100644 (file)
--- a/utils/freecwmp/Makefile
+++ b/utils/freecwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freecwmp
-PKG_VERSION:=2012-09-25
+PKG_VERSION:=2013-02-18
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://dev.freecwmp.org/freecwmp
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4bfbd994921dee06a7a28bed1f2dee3d527490f4
+PKG_SOURCE_VERSION:=c1a9c1883189fec77cba32c46bc26658ca3f8123
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_FIXUP:=autoreconf
@@ -23,7 +23,7 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_FREECWMP_ACS_MULTI \
        CONFIG_FREECWMP_ACS_HDM \
        CONFIG_FREECWMP_DEBUG \
-       CONFIG_FREECWMP_DEVEL_DEBUG
+       CONFIG_FREECWMP_DEVEL
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -103,7 +103,7 @@ CONFIGURE_ARGS += \
        --enable-debug
 endif
 
-ifeq ($(CONFIG_FREECWMP_DEVEL_DEBUG),y)
+ifeq ($(CONFIG_FREECWMP_DEVEL),y)
 CONFIGURE_ARGS += \
        --enable-devel
 endif

diff --git a/utils/freecwmp/files/freecwmpd.init b/utils/freecwmp/files/freecwmpd.init
index 2c4b3474a652b8fd922dd0f6d6c5b5599f363c86..2f4ff7539fadffbddd09d6ca279a6845c1ecfd9c 100644 (file)
--- a/utils/freecwmp/files/freecwmpd.init
+++ b/utils/freecwmp/files/freecwmpd.init
@@ -1,12 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org
 
 START=90
 
 start() {
-       freecwmpd 2>/dev/null >/dev/null &
+       service_start freecwmpd
 }
 
 stop() {
-       killall -9 freecwmpd 2>/dev/null >/dev/null
+       service_stop freecwmpd
 }