nodogsplash2: update to version 2.1.1 (#376)

Signed-off-by: Moritz Warning <moritzwarning@web.de>

diff --git a/nodogsplash2/Makefile b/nodogsplash2/Makefile
index f17e5dabbd49534cca84fb60ac7985eea21dcfaa..56ffb8a6455930df6a8bd9a4cfb4e5a2e899ff7a 100644 (file)
--- a/nodogsplash2/Makefile
+++ b/nodogsplash2/Makefile
@@ -7,15 +7,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash2
 PKG_FIXUP:=autoreconf
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.1.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
-PKG_SOURCE_VERSION:=907f4e8c5a53868947ca547b0ebff5ae36fce7a8
-PKG_MIRROR_HASH:=c54fccd5649b5c33873e14e8fa766c5ba24dd06fb1a2ed0bdceb1d86bd83295e
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?
+PKG_SOURCE:=nodogsplash-$(PKG_VERSION).tar.gz
+PKG_HASH:=86463a93259f34745a7427d643e0810e7776d37470b32f4f823a1e6019ba9246
+PKG_BUILD_DIR:=$(BUILD_DIR)/nodogsplash-$(PKG_VERSION)
+
 PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0+
@@ -61,7 +60,7 @@ uci commit firewall
 endef
 
 define Package/nodogsplash2/conffiles
-/etc/nodogsplash/nodogsplash.conf
+/etc/config/nodogsplash
 endef
 
 $(eval $(call BuildPackage,nodogsplash2))

diff --git a/nodogsplash2/files/nodogsplash.config b/nodogsplash2/files/nodogsplash.config
index 34afe8977e09184008771e3bc90c3725cbeeee51..2107b77c1c3d0cb84da7669a41224701a8055ea7 100644 (file)
--- a/nodogsplash2/files/nodogsplash.config
+++ b/nodogsplash2/files/nodogsplash.config
@@ -31,7 +31,7 @@ config nodogsplash
   
   option gatewayname 'OpenWrt Nodogsplash'
   option maxclients '250'
-  #Client timeouts in minutes
+  # Client timeouts in minutes
   option clientidletimeout '120'
   option clientforcetimeout '1440'
 
@@ -48,7 +48,7 @@ config nodogsplash
   #list authenticated_users 'allow udp port 53'
   #list authenticated_users 'allow tcp port 80'
   #list authenticated_users 'allow tcp port 443'
-  #Or for happy customers allow all
+  # Or for happy customers allow all
   list authenticated_users 'allow all'
 
 
@@ -73,7 +73,7 @@ config nodogsplash
   #list allowedmac '00:00:C0:01:D0:1D'
   #list blockedmac '00:00:C0:01:D0:2D'
 
-  #MAC addresses that do not need to authenticate
+  # MAC addresses that do not need to authenticate
   #list trustedmac '00:00:C0:01:D0:1D'
 
   # Set FW_MARK for compatibilty with other OpenWrt Packages eg mwan3, sqm etc.