[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91b23ce05b77dc96b38de3589049cbe8350ba9ad

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91b23ce05b77dc96b38de3589049cbe8350ba9ad

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2663 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  91b23ce05b77dc96b38de3589049cbe8350ba9ad (commit)
      from  7479c993490ea57fb35a80523577309e36b63f90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91b23ce05b77dc96b38de3589049cbe8350ba9ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri May 22 11:49:03 2020 +0000

    squidGuard: Fix generating databases with libdb >= 5
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/squidguard                       |  1 +
 src/patches/squidGuard-1.4-db5.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/patches/squidGuard-1.4-db5.patch

Difference in files:
diff --git a/lfs/squidguard b/lfs/squidguard
index f627a27d8..38efab0ee 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
 		--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
 		--with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
diff --git a/src/patches/squidGuard-1.4-db5.patch b/src/patches/squidGuard-1.4-db5.patch
new file mode 100644
index 000000000..733fbad2e
--- /dev/null
+++ b/src/patches/squidGuard-1.4-db5.patch
@@ -0,0 +1,12 @@
+diff -ruN squidGuard-1.4-vanilla/src/sgDb.c squidGuard-1.4/src/sgDb.c
+--- squidGuard-1.4-vanilla/src/sgDb.c	2008-07-15 04:29:41.000000000 +1000
++++ squidGuard-1.4/src/sgDb.c	2013-01-21 12:47:41.049325756 +1100
+@@ -114,7 +114,7 @@
+     }
+   }
+ #endif
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+   if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
+     flag = DB_CREATE;
+     if(createdb)
\ No newline at end of file


hooks/post-receive
--
IPFire 2.x development tree