squidguard: new package

PATCH New Guillaume GARDET 3 participants 5 messages Oct 8, 2014 – Jul 2, 2015

lore

Share & tools

lore

Guillaume GARDET

author

2014-10-08 20:38 UTC #0 lore raw

PATCH 1/1 squidguard: new package

Signed-off-by Guillaume GARDET <[email protected]>

---
 package/Config.in                                  |   1 +
 package/squidguard/Config.in                       |  24 +++++
 package/squidguard/fix-for-db5.patch               |  11 ++
 package/squidguard/squidGuard-CVE-2009-3700.patch  |  46 +++++++++
 package/squidguard/squidGuard-CVE-2009-3826.patch  |  26 +++++
 package/squidguard/squidGuard-Makefile.patch       | 115 +++++++++++++++++++++
 package/squidguard/squidGuard.conf                 |  20 ++++
 .../squidguard/squidguard-1.4-cross-compile.patch  |  38 +++++++
 package/squidguard/squidguard.mk                   |  41 ++++++++
 9 files changed, 322 insertions(+)
 create mode 100644 package/squidguard/Config.in
 create mode 100644 package/squidguard/fix-for-db5.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3700.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3826.patch
 create mode 100644 package/squidguard/squidGuard-Makefile.patch
 create mode 100644 package/squidguard/squidGuard.conf
 create mode 100644 package/squidguard/squidguard-1.4-cross-compile.patch
 create mode 100644 package/squidguard/squidguard.mk

package/Config.in +1 -0

index ea89c96..9c1f282 100644
@@ -1083,6 +1083,7 @@ endif
 	source "package/spice/Config.in"
 	source "package/spice-protocol/Config.in"
 	source "package/squid/Config.in"
+	source "package/squidguard/Config.in"
 	source "package/sshpass/Config.in"
 	source "package/strongswan/Config.in"
 	source "package/stunnel/Config.in"

package/squidguard/Config.in new file +24 -0

new file mode 100644
index 0000000..8d3c28e
@@ -0,0 +1,24 @@
+comment "squidguards needs Squid"
+	depends on !BR2_PACKAGE_SQUID
+
+config BR2_PACKAGE_SQUIDGUARD
+	bool "squidguard"
+	select BR2_PACKAGE_BISON
+	select BR2_PACKAGE_FLEX
+	select BR2_PACKAGE_BERKELEYDB
+	depends on BR2_PACKAGE_SQUID
+	help
+	  SquidGuard is a free (GPL), flexible and ultra-fast filter,
+	  redirector, and access controller plugin for squid.
+
+	  http://www.squidguard.org/
+
+if BR2_PACKAGE_SQUIDGUARD
+	config BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF
+	bool "squidguard default blacklists and configuration"
+	help
+	  Add default blacklists provided by squidGuard and associated
+	  configuration file.
+
+	  http://www.squidguard.org/
+endif

package/squidguard/fix-for-db5.patch new file +11 -0

new file mode 100644
index 0000000..29fd19b
@@ -0,0 +1,11 @@
+--- a/src/sgDb.c.orig	2014-07-23 13:10:54.335454387 +0200
++++ b/src/sgDb.c	2014-07-23 13:14:15.167901834 +0200
+@@ -114,7 +114,7 @@ void sgDbInit(Db, file)
+     }
+   }
+ #endif
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+   if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
+     flag = DB_CREATE;
+     if(createdb)

package/squidguard/squidGuard-CVE-2009-3700.patch new file +46 -0

46 lines not on this page · raw message

package/squidguard/squidGuard-CVE-2009-3826.patch new file +26 -0

new file mode 100644
index 0000000..8d2b623
@@ -0,0 +1,26 @@
+Index: squidGuard-1.4/src/sg.h.in
+===================================================================
+--- squidGuard-1.4.orig/src/sg.h.in
++++ squidGuard-1.4/src/sg.h.in
+@@ -73,7 +73,7 @@ int tolower();
+ #define REQUEST_TYPE_REDIRECT   2
+ #define REQUEST_TYPE_PASS       3
+ 
+-#define MAX_BUF 4096
++#define MAX_BUF 12288
+ 
+ #define DEFAULT_LOGFILE "squidGuard.log"
+ #define WARNING_LOGFILE "squidGuard.log"
+Index: squidGuard-1.4/src/sgDiv.c.in
+===================================================================
+--- squidGuard-1.4.orig/src/sgDiv.c.in
++++ squidGuard-1.4/src/sgDiv.c.in
+@@ -745,7 +745,7 @@ char *sgParseRedirect(redirect, req, acl
+       p++;
+       break;
+     case 'u': /* Requested URL */
+-      strcat(buf, req->orig);
++      strncat(buf, req->orig, 2048);
+       p++;
+       break;
+     default:

package/squidguard/squidGuard-Makefile.patch new file +115 -0

115 lines not on this page · raw message

package/squidguard/squidGuard.conf new file +20 -0

new file mode 100644
index 0000000..c2d612f
@@ -0,0 +1,20 @@
+#
+# Default config file for squidGuard
+#
+
+dbhome /var/lib/squidGuard/db
+logdir /var/log/squidGuard
+
+
+dest blacklist {
+        domainlist      blacklist/domains
+        urllist         blacklist/urls
+        expressionlist  blacklist/expressions
+        }
+
+acl {
+        default {
+                pass !blacklist all
+                redirect http://localhost/block.html
+        }
+}
\ No newline at end of file

package/squidguard/squidguard-1.4-cross-compile.patch new file +38 -0

new file mode 100644
index 0000000..43fced9
@@ -0,0 +1,38 @@
+--- a/configure.orig	2014-07-17 13:40:02.276083485 +0200
++++ b/configure	2014-07-17 13:41:04.645497630 +0200
+@@ -4602,7 +4602,7 @@ fi
+ 
+ LIBS="$LIBS -ldb"
+ if test "$cross_compiling" = yes; then
+-  db_ok_version=no
++  db_ok_version=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -4671,7 +4671,7 @@ if test $db_ok_version = no; then
+ fi
+ 
+ if test "$cross_compiling" = yes; then
+-  db_ok_version=no
++  db_ok_version=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -4741,7 +4741,7 @@ if test $db_ok_version = no; then
+ fi
+ 
+ if test "$cross_compiling" = yes; then
+-  dbg2_ok_version=no
++  dbg2_ok_version=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ 
+@@ -4806,7 +4806,7 @@ _ACEOF
+ fi
+ 
+ if test "$cross_compiling" = yes; then
+-  dbg3_ok_version=no
++  dbg3_ok_version=yes
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+

package/squidguard/squidguard.mk new file +41 -0

41 lines not on this page · raw message

Signature · 1 line

1.8.4.5

Peter Korsgaard

2014-10-10 21:51 UTC #1 lore raw

PATCH 1/1 squidguard: new package

Quoted 41 lines

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
"Guillaume" == Guillaume GARDET <[email protected]> writes:

Signed-off-by Guillaume GARDET <[email protected]>

---
 package/Config.in                                  |   1 +
 package/squidguard/Config.in                       |  24 +++++
 package/squidguard/fix-for-db5.patch               |  11 ++
 package/squidguard/squidGuard-CVE-2009-3700.patch  |  46 +++++++++
 package/squidguard/squidGuard-CVE-2009-3826.patch  |  26 +++++
 package/squidguard/squidGuard-Makefile.patch       | 115 +++++++++++++++++++++
 package/squidguard/squidGuard.conf                 |  20 ++++
 .../squidguard/squidguard-1.4-cross-compile.patch  |  38 +++++++
 package/squidguard/squidguard.mk                   |  41 ++++++++
 9 files changed, 322 insertions(+)
 create mode 100644 package/squidguard/Config.in
 create mode 100644 package/squidguard/fix-for-db5.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3700.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3826.patch
 create mode 100644 package/squidguard/squidGuard-Makefile.patch
 create mode 100644 package/squidguard/squidGuard.conf
 create mode 100644 package/squidguard/squidguard-1.4-cross-compile.patch
 create mode 100644 package/squidguard/squidguard.mk

package/Config.in +1 -0

index ea89c96..9c1f282 100644
@@ -1083,6 +1083,7 @@ endif
 	source "package/spice/Config.in"
 	source "package/spice-protocol/Config.in"
 	source "package/squid/Config.in"
+	source "package/squidguard/Config.in"
 	source "package/sshpass/Config.in"
 	source "package/strongswan/Config.in"
 	source "package/stunnel/Config.in"

package/squidguard/Config.in new file +0 -0

new file mode 100644
index 0000000..8d3c28e

package/squidguard/Config.in line 2

Quoted 2 lines

package/squidguard/Config.in new file +2 -0
@@ -0,0 +1,24 @@
+comment "squidguards needs Squid"
+	depends on !BR2_PACKAGE_SQUID

squid should not be capitalized. I don't know much about squid and these plugins, but would anybody needing this NOT enable squid just above already? Perhaps the comment isn't really needed?

package/squidguard/Config.in line 6

Quoted 4 lines

package/squidguard/Config.in new file +4 -0
+
+config BR2_PACKAGE_SQUIDGUARD
+	bool "squidguard"
+	select BR2_PACKAGE_BISON

BR2_PACKAGE_BISON has a number of toolchain dependencies that you need to reproduce here (wchar, mmu). With that said, are you sure you need bison on the TARGET and not host-bison?

Quoted 5 lines

package/squidguard/Config.in new file +3 -0

+	select BR2_PACKAGE_FLEX
 
 
+	select BR2_PACKAGE_BERKELEYDB
+	depends on BR2_PACKAGE_SQUID

package/squidguard/Config.in line 17

Quoted 10 lines

package/squidguard/Config.in new file +8 -0

+	help
+	  SquidGuard is a free (GPL), flexible and ultra-fast filter,
+	  redirector, and access controller plugin for squid.
 
 
+
+	  http://www.squidguard.org/
+
+if BR2_PACKAGE_SQUIDGUARD
+	config BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF

This 'config' line should not be indented.

package/squidguard/fix-for-db5.patch

Quoted 12 lines

package/squidguard/Config.in new file +7 -0

+	bool "squidguard default blacklists and configuration"
+	help
+	  Add default blacklists provided by squidGuard and associated
+	  configuration file.
+
+	  http://www.squidguard.org/
+endif

package/squidguard/fix-for-db5.patch new file +0 -0

new file mode 100644
index 0000000..29fd19b

All patches should contain a git-style header with description and your signed-off-by tag. They should also be prefixed with <pkg>-<number>-, E.G squidguard-01-fix-for-db5.patch.

Quoted 8 lines

+++ b/package/squidguard/squidguard.mk

package/squidguard/fix-for-db5.patch new file +6 -0

@@ -0,0 +1,41 @@
+###############################################################################
+#
+# squidguard
+#
+###############################################################################
+

package/squidguard/fix-for-db5.patch line 16

Quoted 10 lines

package/squidguard/fix-for-db5.patch new file +10 -0

+SQUIDGUARD_VERSION = 1.4
+SQUIDGUARD_SOURCE = squidGuard-$(SQUIDGUARD_VERSION).tar.gz
+SQUIDGUARD_SITE = http://www.squidguard.org/Downloads/
+SQUIDGUARD_LICENCE = GPLv2+
+SQUIDGUARD_LICENCE_FILE = COPYING
+SQUIDGUARD_CONF_OPTS += --with-sg-config=/etc/squidGuard.conf \
+			--with-sg-logdir=/var/log/squidGuard \
+			--with-sg-dbhome=/var/lib/squidGuard/db \
+			--with-db-inc=$(STAGING_DIR)/usr/include \
+			--with-db-lib=$(STAGING_DIR)/usr/lib

Are these --with-db-* needed? The cross compiler should automatically look there for headers/libraries.

Quoted 10 lines

package/squidguard/fix-for-db5.patch new file +10 -0

+SQUIDGUARD_DEPENDENCIES = bison flex berkeleydb
+
+
+ifeq ($(BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF),y)
+
+define DEFAULT_BLACKLIST
+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/domains \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/domains
+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/expressions \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/expressions

package/squidguard/fix-for-db5.patch line 36

Quoted 10 lines

package/squidguard/fix-for-db5.patch new file +10 -0

+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/urls \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/urls
+endef
+
+define DEFAULT_CONF
+	$(INSTALL) -m 0644 -D package/squidguard/squidGuard.conf \
+		$(TARGET_DIR)/etc/squidGuard.conf
+endef
+
+SQUIDGUARD_POST_INSTALL_TARGET_HOOKS = DEFAULT_BLACKLIST DEFAULT_CONF

Buildroot uses a global namespace, so these should be prefixed with SQUIDGUARD_.

Care to fix these issues and resend? Thanks.

Signature · 1 line

Bye, Peter Korsgaard

Guillaume GARDET - Oliséo

author

2014-10-16 10:23 UTC #2 lore raw

PATCH 1/1 squidguard: new package

Le 10/10/2014 23:51, Peter Korsgaard a ?crit :

Quoted 38 lines

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
"Guillaume" == Guillaume GARDET <[email protected]> writes:

Signed-off-by Guillaume GARDET <[email protected]>

---
 package/Config.in                                  |   1 +
 package/squidguard/Config.in                       |  24 +++++
 package/squidguard/fix-for-db5.patch               |  11 ++
 package/squidguard/squidGuard-CVE-2009-3700.patch  |  46 +++++++++
 package/squidguard/squidGuard-CVE-2009-3826.patch  |  26 +++++
 package/squidguard/squidGuard-Makefile.patch       | 115 +++++++++++++++++++++
 package/squidguard/squidGuard.conf                 |  20 ++++
 .../squidguard/squidguard-1.4-cross-compile.patch  |  38 +++++++
 package/squidguard/squidguard.mk                   |  41 ++++++++
 9 files changed, 322 insertions(+)
 create mode 100644 package/squidguard/Config.in
 create mode 100644 package/squidguard/fix-for-db5.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3700.patch
 create mode 100644 package/squidguard/squidGuard-CVE-2009-3826.patch
 create mode 100644 package/squidguard/squidGuard-Makefile.patch
 create mode 100644 package/squidguard/squidGuard.conf
 create mode 100644 package/squidguard/squidguard-1.4-cross-compile.patch
 create mode 100644 package/squidguard/squidguard.mk

package/Config.in +1 -0

index ea89c96..9c1f282 100644
@@ -1083,6 +1083,7 @@ endif
 	source "package/spice/Config.in"
 	source "package/spice-protocol/Config.in"
 	source "package/squid/Config.in"
+	source "package/squidguard/Config.in"
 	source "package/sshpass/Config.in"
 	source "package/strongswan/Config.in"
 	source "package/stunnel/Config.in"

package/squidguard/Config.in new file +0 -1

new file mode 100644
index 0000000..8d3c28e
--- /dev/null

Quoted 8 lines

package/squidguard/Config.in line 2
Quoted 4 lines
+++ b/package/squidguard/Config.in
package/squidguard/Config.in new file +2 -0
@@ -0,0 +1,24 @@
+comment "squidguards needs Squid"
+	depends on !BR2_PACKAGE_SQUID
squid should not be capitalized. I don't know much about squid and these plugins, but would anybody needing this NOT enable squid just above already? Perhaps the comment isn't really needed?

I think it is better to keep it but if you think I should remove it, I will. Just tell me.

Quoted 9 lines

package/squidguard/Config.in line 6
Quoted 5 lines
package/squidguard/Config.in new file +4 -0
+
+config BR2_PACKAGE_SQUIDGUARD
+	bool "squidguard"
+	select BR2_PACKAGE_BISON
BR2_PACKAGE_BISON has a number of toolchain dependencies that you need to reproduce here (wchar, mmu). With that said, are you sure you need bison on the TARGET and not host-bison?

Good catch, host-bison is what is needed. Will fix it.

Quoted 11 lines

Quoted 9 lines

package/squidguard/Config.in new file +6 -0

+	select BR2_PACKAGE_FLEX
 
 
+	select BR2_PACKAGE_BERKELEYDB
+	depends on BR2_PACKAGE_SQUID
+	help
+	  SquidGuard is a free (GPL), flexible and ultra-fast filter,
+	  redirector, and access controller plugin for squid.

Quoted 7 lines

package/squidguard/Config.in line 17
Quoted 5 lines
package/squidguard/Config.in new file +5 -0
+
+	  http://www.squidguard.org/
+
+if BR2_PACKAGE_SQUIDGUARD
+	config BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF
This 'config' line should not be indented.

ok.

Quoted 17 lines

package/squidguard/fix-for-db5.patch
Quoted 13 lines
package/squidguard/Config.in new file +7 -0
+	bool "squidguard default blacklists and configuration"
+	help
+	  Add default blacklists provided by squidGuard and associated
+	  configuration file.
+
+	  http://www.squidguard.org/
+endif
package/squidguard/fix-for-db5.patch new file +0 -0
new file mode 100644
index 0000000..29fd19b
All patches should contain a git-style header with description and your signed-off-by tag. They should also be prefixed with <pkg>-<number>-, E.G squidguard-01-fix-for-db5.patch.

ok.

Quoted 14 lines

+++ b/package/squidguard/squidguard.mk

package/squidguard/fix-for-db5.patch new file +11 -0

@@ -0,0 +1,41 @@
+###############################################################################
+#
+# squidguard
+#
+###############################################################################
+
+SQUIDGUARD_VERSION = 1.4
+SQUIDGUARD_SOURCE = squidGuard-$(SQUIDGUARD_VERSION).tar.gz
+SQUIDGUARD_SITE = http://www.squidguard.org/Downloads/
+SQUIDGUARD_LICENCE = GPLv2+
+SQUIDGUARD_LICENCE_FILE = COPYING

Quoted 8 lines

package/squidguard/fix-for-db5.patch line 16
Quoted 5 lines
package/squidguard/fix-for-db5.patch new file +5 -0
+SQUIDGUARD_CONF_OPTS += --with-sg-config=/etc/squidGuard.conf \
+			--with-sg-logdir=/var/log/squidGuard \
+			--with-sg-dbhome=/var/lib/squidGuard/db \
+			--with-db-inc=$(STAGING_DIR)/usr/include \
+			--with-db-lib=$(STAGING_DIR)/usr/lib
Are these --with-db-* needed? The cross compiler should automatically look there for headers/libraries.

It does not, that is why I added it.

Quoted 16 lines

package/squidguard/fix-for-db5.patch new file +14 -0

+SQUIDGUARD_DEPENDENCIES = bison flex berkeleydb
+
+
+ifeq ($(BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF),y)
+
+define DEFAULT_BLACKLIST
+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/domains \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/domains
+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/expressions \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/expressions
+	$(INSTALL) -m 0644 -D $(SQUIDGUARD_DIR)/test/blacklist/urls \
+		$(TARGET_DIR)/var/lib/squidGuard/db/blacklist/urls
+endef
+

Quoted 8 lines

package/squidguard/fix-for-db5.patch line 36
Quoted 6 lines
package/squidguard/fix-for-db5.patch new file +6 -0
+define DEFAULT_CONF
+	$(INSTALL) -m 0644 -D package/squidguard/squidGuard.conf \
+		$(TARGET_DIR)/etc/squidGuard.conf
+endef
+
+SQUIDGUARD_POST_INSTALL_TARGET_HOOKS = DEFAULT_BLACKLIST DEFAULT_CONF
Buildroot uses a global namespace, so these should be prefixed with SQUIDGUARD_.

ok.

Quoted 3 lines

Care to fix these issues and resend? Thanks.

Will do.

Guillaume

Yann E. MORIN

2014-10-17 21:10 UTC #3 lore raw

PATCH 1/1 squidguard: new package

Guillaume, All,

On 2014-10-16 12:23 +0200, Guillaume GARDET - Olis?o spake thusly:

Quoted 2 lines

Le 10/10/2014 23:51, Peter Korsgaard a ?crit :
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Guillaume" == Guillaume GARDET <[email protected]> writes:

[--SNIP--]

Quoted 9 lines

Quoted 9 lines
Quoted 8 lines
package/squidguard/Config.in new file +2 -0
new file mode 100644
index 0000000..8d3c28e
@@ -0,0 +1,24 @@
+comment "squidguards needs Squid"
+	depends on !BR2_PACKAGE_SQUID

Quoted 5 lines

Quoted 3 lines
squid should not be capitalized. I don't know much about squid and these plugins, but would anybody needing this NOT enable squid just above already? Perhaps the comment isn't really needed?
I think it is better to keep it but if you think I should remove it, I will. Just tell me.

I side with Peter here. Squid is an obvious dependency of squidguard, so the comment is not needed.

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Guillaume GARDET

author

2015-07-02 09:50 UTC #4 lore raw

PATCH v2 1/1 squidguard: new package

In reply to Guillaume GARDET - Oliséo

Signed-off-by Guillaume GARDET <[email protected]>

Cc Peter Korsgaard <[email protected]>

---

Changes in V2:
* Remove comment on squid dependency
* Switch to 'host-' bison and flex dependencies
* Fix config line indentation
* Add git-style header to patches
* Rename patches to <pkg>-<number>-XXX.patch format
* Add missing SQUIDGUARD_ prefix in squidguard.mk
* Add one more official patch

 package/Config.in                                  |   1 +
 package/squidguard/Config.in                       |  19 ++++
 package/squidguard/squidGuard.conf                 |  20 ++++
 package/squidguard/squidguard-01-fix-for-db5.patch |  15 +++
 .../squidguard/squidguard-02-Fix_Makefile.patch    | 120 +++++++++++++++++++++
 .../squidguard/squidguard-03-cross-compile.patch   |  42 ++++++++
 .../squidguard-04-Official-patch-20091015.patch    |  65 +++++++++++
 .../squidguard-05-Official-patch-20091019.patch    |  45 ++++++++
 .../squidguard-06-Official-patch-20150201.patch    |  87 +++++++++++++++
 package/squidguard/squidguard.mk                   |  41 +++++++
 10 files changed, 455 insertions(+)
 create mode 100644 package/squidguard/Config.in
 create mode 100644 package/squidguard/squidGuard.conf
 create mode 100644 package/squidguard/squidguard-01-fix-for-db5.patch
 create mode 100644 package/squidguard/squidguard-02-Fix_Makefile.patch
 create mode 100644 package/squidguard/squidguard-03-cross-compile.patch
 create mode 100644 package/squidguard/squidguard-04-Official-patch-20091015.patch
 create mode 100644 package/squidguard/squidguard-05-Official-patch-20091019.patch
 create mode 100644 package/squidguard/squidguard-06-Official-patch-20150201.patch
 create mode 100644 package/squidguard/squidguard.mk

package/Config.in +1 -0

index 13a7e74..da0e3a5 100644
@@ -1295,6 +1295,7 @@ endif
 	source "package/spice/Config.in"
 	source "package/spice-protocol/Config.in"
 	source "package/squid/Config.in"
+	source "package/squidguard/Config.in"
 	source "package/sshpass/Config.in"
 	source "package/strongswan/Config.in"
 	source "package/stunnel/Config.in"

package/squidguard/Config.in new file +19 -0

new file mode 100644
index 0000000..8b06c3c
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_SQUIDGUARD
+	bool "squidguard"
+	select BR2_PACKAGE_BERKELEYDB
+	depends on BR2_PACKAGE_SQUID
+	help
+	  SquidGuard is a free (GPL), flexible and ultra-fast filter,
+	  redirector, and access controller plugin for squid.
+
+	  http://www.squidguard.org/
+
+if BR2_PACKAGE_SQUIDGUARD
+config BR2_PACKAGE_SQUIDGUARD_DEFAULT_CONF
+	bool "squidguard default blacklists and configuration"
+	help
+	  Add default blacklists provided by squidGuard and associated
+	  configuration file.
+
+	  http://www.squidguard.org/
+endif

package/squidguard/squidGuard.conf new file +20 -0

new file mode 100644
index 0000000..c2d612f
@@ -0,0 +1,20 @@
+#
+# Default config file for squidGuard
+#
+
+dbhome /var/lib/squidGuard/db
+logdir /var/log/squidGuard
+
+
+dest blacklist {
+        domainlist      blacklist/domains
+        urllist         blacklist/urls
+        expressionlist  blacklist/expressions
+        }
+
+acl {
+        default {
+                pass !blacklist all
+                redirect http://localhost/block.html
+        }
+}
\ No newline at end of file

package/squidguard/squidguard-01-fix-for-db5.patch new file +15 -0

new file mode 100644
index 0000000..6600722
@@ -0,0 +1,15 @@
+Fix DB5 usage.
+
+Signed-off-by: Guillaume GARDET <[email protected]>
+
+--- a/src/sgDb.c.orig	2014-07-23 13:10:54.335454387 +0200
++++ b/src/sgDb.c	2014-07-23 13:14:15.167901834 +0200
+@@ -114,7 +114,7 @@ void sgDbInit(Db, file)
+     }
+   }
+ #endif
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+   if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
+     flag = DB_CREATE;
+     if(createdb)

package/squidguard/squidguard-02-Fix_Makefile.patch new file +120 -0

120 lines not on this page · raw message

package/squidguard/squidguard-03-cross-compile.patch new file +42 -0

42 lines not on this page · raw message

package/squidguard/squidguard-04-Official-patch-20091015.patch new file +65 -0

65 lines not on this page · raw message

package/squidguard/squidguard-05-Official-patch-20091019.patch new file +45 -0

45 lines not on this page · raw message

package/squidguard/squidguard-06-Official-patch-20150201.patch new file +87 -0

87 lines not on this page · raw message

package/squidguard/squidguard.mk new file +41 -0

41 lines not on this page · raw message

Signature · 1 line

1.8.4.5