Updated to squidGuard 1.6.0-1

Makefile

@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk 
 
 PKG_NAME:=squidGuard
-PKG_VERSION:=1.5-beta
+PKG_VERSION:=1.6.0-1
 PKG_RELEASE:=2
 PKG_LICENSE:=GNU
 PKG_MAINTAINER:=Ivan Ivanov <andrroidtex@gmail.com>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.squidguard.org/Downloads/Devel/
-PKG_MD5SUM:=85216992d14acb29d6f345608f21f268 
-
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://salsa.debian.org/joowie-guest/maintain_squidguard.git
+PKG_SOURCE_VERSION:=7b373fffa224c6a350553d8f9f4aef9cd7a125bf
+PKG_MIRROR_HASH:=97a023caada7506d7dde0a0169215c5b0f81ec89b80ed10b1e8fff445ccaaeec
 PKG_BUILD_PARALLEL:=1 
 PKG_INSTALL:=1 
 
@@ -39,10 +39,14 @@ CONFIGURE_ARGS += \
 	--with-sg-config=/opt/etc/squidguard/squidguard.conf \
 	--with-squiduser=nobody 
 
+define Build/Configure
+	( cd $(PKG_BUILD_DIR); ./autogen.sh)
+	$(call Build/Configure/Default,$CONFIGURE_ARGS)
+endef
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
+		DESTDIR="$(PKG_INSTALL_DIR)"
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" install 
 endef
@@ -52,7 +56,7 @@ define Package/squidGuard/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/squidGuard $(1)/opt/sbin
 
 	$(INSTALL_DIR) $(1)/opt/etc/squidguard
-	$(INSTALL_CONF) ./files/squidguard.conf $(1)/opt/etc/squidguard/squidguard.conf
+	$(INSTALL_CONF) ./files/squidGuard.conf $(1)/opt/etc/squidguard/squidGuard.conf
 
 	$(INSTALL_DIR) $(1)/opt/usr/squidguard/db/blacklist
 	$(CP) $(PKG_BUILD_DIR)/test/blacklist/* $(1)/opt/usr/squidguard/db/blacklist

README.md

@@ -1,7 +1,2 @@
 SquidGuard for Entware-ng
-
-Пакет собирается в корень файловой системы /opt
-
-
-
 The package is compiled to the root of the file system /opt

files/squidGuard.conf

@@ -0,0 +1,82 @@
+#
+# CONFIG FILE FOR SQUIDGUARD
+#
+# Caution: do NOT use comments inside { }
+#
+
+dbhome /opt/usr/squidguard/db
+logdir /var/log/squidguard
+
+#
+# TIME RULES:
+# abbrev for weekdays: 
+# s = sun, m = mon, t =tue, w = wed, h = thu, f = fri, a = sat
+
+time workhours {
+	weekly mtwhf 08:00 - 16:30
+	date *-*-01  08:00 - 16:30
+}
+
+#
+# SOURCE ADDRESSES:
+#
+
+src admin {
+	ip  		1.2.3.4  1.2.3.5
+	user		root foo bar
+	within		workhours
+}
+
+src foo-clients {
+	ip		172.16.2.32-172.16.2.100 172.16.2.100 172.16.2.200
+}
+
+src bar-clients {
+	ip		172.16.4.0/26
+}
+
+#
+# DESTINATION CLASSES:
+#
+# [see also in file dest-snippet.txt]
+
+dest good {
+}
+
+dest local {
+}
+
+dest porn {
+}
+
+#dest adult {
+#	domainlist	BL/adult/domains
+#	urllist		BL/adult/urls
+#	expressionlist	BL/adult/expressions
+#	redirect http://admin.foo.bar.de/cgi-bin/blocked.cgi?clientaddr=%a&clientname=%n&clientuser=%i&clientgroup=%s&targetgroup=%t&url=%u
+#}
+
+#
+# ACL RULES:
+#
+
+acl {
+	admin {
+		pass	 any
+	}
+
+	foo-clients within workhours {
+		pass	 good !in-addr !porn any
+	} else {
+		pass any
+	}
+
+	bar-clients {
+		pass	local none
+	}
+
+	default {
+		pass	 local none
+		redirect http://admin.foo.bar.de/cgi-bin/blocked.cgi?clientaddr=%a&clientname=%n&clientuser=%i&clientgroup=%s&targetgroup=%t&url=%u
+	}
+}