From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 4/6] squidguard: Fix build with db6
Date: Wed, 15 Jul 2015 15:40:59 +0200 [thread overview]
Message-ID: <1436967661-17353-5-git-send-email-michael.tremer@ipfire.org> (raw)
In-Reply-To: <1436967661-17353-1-git-send-email-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]
From: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/squidguard | 1 +
src/patches/squidguard-1.4.1-db6.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+)
create mode 100644 src/patches/squidguard-1.4.1-db6.patch
diff --git a/lfs/squidguard b/lfs/squidguard
index a48c25cbe2d2..ae872a17cd96 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 < $(DIR_SRC)/src/patches/squidguard-1.4.1-db6.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.1-db6.patch b/src/patches/squidguard-1.4.1-db6.patch
new file mode 100644
index 000000000000..214f89caf86b
--- /dev/null
+++ b/src/patches/squidguard-1.4.1-db6.patch
@@ -0,0 +1,15 @@
+Patch from Mon Jan 21 2013 Bojan Smojver <bojan(a)rexursive.com> - 1.4-16
+https://bugzilla.redhat.com/attachment.cgi?id=684010
+Fix for Berkeley DB 6
+
+--- squidGuard-1.4.1.orig/src/sgDb.c 2008-07-14 20:29:41.000000000 +0200
++++ squidGuard-1.4.1/src/sgDb.c 2015-06-25 09:44:24.009793986 +0200
+@@ -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)
--
2.4.3
next prev parent reply other threads:[~2015-07-15 13:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 13:40 [PATCH 0/6] Update for Berkeley DB Michael Tremer
2015-07-15 13:40 ` [PATCH 1/6] berkeley: Update berkeley database to version 6.1.26 Michael Tremer
2015-07-15 13:40 ` [PATCH 2/6] BerkeleyDB: Update berkely DB perl module to 0.55 Michael Tremer
2015-07-15 13:40 ` [PATCH 3/6] php: Fix build with db6 Michael Tremer
2015-07-15 13:40 ` Michael Tremer [this message]
2015-07-15 13:41 ` [PATCH 5/6] openldap: Update to 2.4.40 Michael Tremer
2015-07-15 13:41 ` [PATCH 6/6] postfix: Fix build with db6 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436967661-17353-5-git-send-email-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox