[packages_10.03.2] ftpd-topfield: merge r29199, r29223

SVN-Revision: 30072

diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile
index 6259d4d27c5560e0c4ebab357d2f6eafd266e78d..c271cb4a0ca0f0bab4ba1c0135df2f28d6a79286 100644 (file)
--- a/multimedia/ftpd-topfield/Makefile
+++ b/multimedia/ftpd-topfield/Makefile
@@ -1,9 +1,15 @@
+#
+# Copyright (C) 2008-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ftpd-topfield
 PKG_VERSION:=0.7.4
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/puppy
@@ -30,9 +36,13 @@ define Package/ftpd-topfield/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/ftpd-topfield.sh $(1)/etc/init.d/ftpd-topfield
+       $(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/ftpd-topfield.conf $(1)/etc/config/ftpd-topfield
+       $(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield
+endef
+
+define Package/ftpd-topfield/conffiles
+/etc/config/ftpd-topfield
 endef
 
 $(eval $(call BuildPackage,ftpd-topfield))

diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.conf b/multimedia/ftpd-topfield/files/ftpd-topfield.conf
deleted file mode 100644 (file)
index ec5ef2e..0000000
--- a/multimedia/ftpd-topfield/files/ftpd-topfield.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-config 'ftpd-topfield'
-       option 'port' '21'
-       option 'turbo' 'disabled'
-       option 'elpf' 'disabled'

diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.config b/multimedia/ftpd-topfield/files/ftpd-topfield.config
new file mode 100644 (file)
index 0000000..ec5ef2e
--- /dev/null
+++ b/multimedia/ftpd-topfield/files/ftpd-topfield.config
@@ -0,0 +1,4 @@
+config 'ftpd-topfield'
+       option 'port' '21'
+       option 'turbo' 'disabled'
+       option 'elpf' 'disabled'

diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.init b/multimedia/ftpd-topfield/files/ftpd-topfield.init
new file mode 100644 (file)
index 0000000..27c4825
--- /dev/null
+++ b/multimedia/ftpd-topfield/files/ftpd-topfield.init
@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=50
+
+config_cb() {
+       local cfg="$CONFIG_SECTION"
+       local cfgt
+       config_get cfgt "$cfg" TYPE
+
+       case "$cfgt" in
+               ftpd-topfield)
+                       config_get turbo $cfg turbo
+                       config_get port $cfg port
+                       config_get elpf $cfg elpf
+
+                       case "$turbo" in
+                               yes|on|enabled|1) turbo=1;;
+                       esac
+                       case "$elpf" in
+                               yes|on|enabled|1) elpf=1;;
+                       esac
+                       TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}"
+               ;;
+       esac
+}
+                                                                                                                                                                                                            
+start() {
+       config_load ftpd-topfield
+       /usr/sbin/ftpd-topfield $TOPFIELD_ARGS 
+}
+  
+stop() {
+    killall ftpd-topfield
+}

diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.sh b/multimedia/ftpd-topfield/files/ftpd-topfield.sh
deleted file mode 100644 (file)
index 27c4825..0000000
--- a/multimedia/ftpd-topfield/files/ftpd-topfield.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=50
-
-config_cb() {
-       local cfg="$CONFIG_SECTION"
-       local cfgt
-       config_get cfgt "$cfg" TYPE
-
-       case "$cfgt" in
-               ftpd-topfield)
-                       config_get turbo $cfg turbo
-                       config_get port $cfg port
-                       config_get elpf $cfg elpf
-
-                       case "$turbo" in
-                               yes|on|enabled|1) turbo=1;;
-                       esac
-                       case "$elpf" in
-                               yes|on|enabled|1) elpf=1;;
-                       esac
-                       TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}"
-               ;;
-       esac
-}
-                                                                                                                                                                                                            
-start() {
-       config_load ftpd-topfield
-       /usr/sbin/ftpd-topfield $TOPFIELD_ARGS 
-}
-  
-stop() {
-    killall ftpd-topfield
-}