[packages] coova-chilli: update to 1.2.2 (#6721)

SVN-Revision: 19817

diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile
index f0c90ce928911b1f30d1c1d79dae6d5323f27820..e93c7eb57179713961b55dae7a9dfeb380d0408e 100644 (file)
--- a/net/coova-chilli/Makefile
+++ b/net/coova-chilli/Makefile
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coova-chilli
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coova-chilli

-PKG_VERSION:=1.2.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=http://ap.coova.org/chilli/
-PKG_MD5SUM:=f4c0cdb903b6a830cd7c8a54db2334e8
+PKG_SOURCE_URL:=http://ap.coova.org/chilli
+PKG_MD5SUM:=44042e26c3b3c6e64a9a8769328b437d

 
 PKG_FIXUP:=libtool
 
 PKG_FIXUP:=libtool

+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -23,7 +24,7 @@ define Package/coova-chilli
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+kmod-tun
+  DEPENDS:=+kmod-tun +librt

   TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
   URL:=http://www.coova.org/CoovaChilli
 endef
   TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
   URL:=http://www.coova.org/CoovaChilli
 endef


@@ -42,19 +43,13 @@ define Package/coova-chilli/conffiles
 /etc/chilli.conf
 endef
 
 /etc/chilli.conf
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-

 define Package/coova-chilli/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/chilli
        $(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
        $(INSTALL_DIR) $(1)/usr/sbin
 define Package/coova-chilli/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/chilli
        $(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
 endef
        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
 endef

diff --git a/net/coova-chilli/patches/001-readd-macauth.patch b/net/coova-chilli/patches/001-readd-macauth.patch
index 868b5047fe34c0ecea0cc18d111f705dc5e0c9a3..0ca6f3f45c557ccbadcd2bbce8771868a23196b3 100644 (file)
--- a/net/coova-chilli/patches/001-readd-macauth.patch
+++ b/net/coova-chilli/patches/001-readd-macauth.patch
@@ -1,6 +1,6 @@
 --- a/conf/functions.in
 +++ b/conf/functions.in
 --- a/conf/functions.in
 +++ b/conf/functions.in

-@@ -164,6 +164,7 @@
+@@ -173,6 +173,7 @@ writeconfig() {

      if [ "$HS_RADCONF" != "on" -a "$HS_RADCONF" != "url" ]; then 
        [ "$HS_PAP_OK" = "on" ] && addconfig2 "papalwaysok"
        [ "$HS_MACAUTH" = "on" ] && addconfig2 "macauth"
      if [ "$HS_RADCONF" != "on" -a "$HS_RADCONF" != "url" ]; then 
        [ "$HS_PAP_OK" = "on" ] && addconfig2 "papalwaysok"
        [ "$HS_MACAUTH" = "on" ] && addconfig2 "macauth"