Attachment 684010 Details for Bug 894294 – Proposed patch for squidGuard RPM

[patch] Proposed patch for squidGuard RPM

squidGuard-rpm-db5.patch (text/plain), 1.85 KB, created by Bojan Smojver on 2013-01-21 02:00:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bojan Smojver

Created: 2013-01-21 02:00:52 UTC

Size: 1.85 KB

patch

obsolete

> squidGuard-1.4-db5.patch | 12 ++++++++++++
> squidGuard.spec          |  7 ++++++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
>diff --git a/squidGuard-1.4-db5.patch b/squidGuard-1.4-db5.patch
>new file mode 100644
>index 0000000..190b129
>--- /dev/null
>+++ b/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)
>diff --git a/squidGuard.spec b/squidGuard.spec
>index 50a721c..e5cc5f9 100644
>--- a/squidGuard.spec
>+++ b/squidGuard.spec
>@@ -8,7 +8,7 @@
> 
> Name:			squidGuard
> Version:		1.4
>-Release:		15%{?dist}
>+Release:		16%{?dist}
> Summary:		Filter, redirector and access controller plugin for squid
> 
> Group:			System Environment/Daemons
>@@ -42,6 +42,7 @@ Patch5:			squidGuard-makeinstall.patch
> #Patch6:			squidGuard-1.3-SG-2008-06-13.patch
> Patch7:			squidGuard-1.4-20091015.patch
> Patch8:			squidGuard-1.4-20091019.patch
>+Patch9:			squidGuard-1.4-db5.patch
> 
> URL:			http://www.squidguard.org/
> 
>@@ -90,6 +91,7 @@ Neither squidGuard nor Squid can be used to
> #%patch6 -p0
> %patch7 -p0
> %patch8 -p0
>+%patch9 -p1
> 
> %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
> %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
>@@ -246,6 +248,9 @@ fi
> %{_localstatedir}/log/squid/squidGuard.log
> 
> %changelog
>+* Mon Jan 21 2013 Bojan Smojver <bojan@rexursive.com> - 1.4-16
>+- Fix for Berkeley DB 5
>+
> * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-15
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 894294: 684010