[packages_10.03.2] httptunnel: merge r29199, r29226

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

diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile
index 4cebdd4..ba753ee 100644 (file)
--- a/net/httptunnel/Makefile
+++ b/net/httptunnel/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=httptunnel
 PKG_VERSION:=3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.nocrew.org/pub/nocrew/unix/
@@ -31,14 +31,18 @@ define Package/httptunnel/description
        The HTTP requests can be sent via an HTTP proxy if so desired.
 endef
 
-define Package/httptunnel/install      
+define Package/httptunnel/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hts $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/htc $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/httptunnel.init $(1)/etc/init.d/httptunnel
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/httptunnel.conf $(1)/etc/config/httptunnel      
+       $(INSTALL_DATA) ./files/httptunnel.config $(1)/etc/config/httptunnel
+endef
+
+define Package/httptunnel/conffiles
+/etc/config/httptunnel
 endef
 
 $(eval $(call BuildPackage,httptunnel))

diff --git a/net/httptunnel/files/httptunnel.conf b/net/httptunnel/files/httptunnel.conf
deleted file mode 100644 (file)
index fb5a5dd..0000000
--- a/net/httptunnel/files/httptunnel.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-config httptunnel
-        option destination 'localhost:443'
-       option sourceport '80'
-

diff --git a/net/httptunnel/files/httptunnel.config b/net/httptunnel/files/httptunnel.config
new file mode 100644 (file)
index 0000000..fb5a5dd
--- /dev/null
+++ b/net/httptunnel/files/httptunnel.config
@@ -0,0 +1,4 @@
+config httptunnel
+        option destination 'localhost:443'
+       option sourceport '80'
+