[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7161] ipcop/trunk
From:       dotzball () users ! sourceforge ! net
Date:       2013-11-23 13:36:55
Message-ID: E1VkDON-0000pt-23 () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7161
          http://sourceforge.net/p/ipcop/svn/7161
Author:   dotzball
Date:     2013-11-23 13:36:53 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Patch squidGuard to make BerkeleyDB version 4.7 and higher working.

Modified Paths:
--------------
    ipcop/trunk/lfs/squidGuard

Added Paths:
-----------
    ipcop/trunk/src/patches/squidGuard-1.5-beta_db_v4_up.patch

Modified: ipcop/trunk/lfs/squidGuard
===================================================================
--- ipcop/trunk/lfs/squidGuard	2013-11-23 08:55:54 UTC (rev 7160)
+++ ipcop/trunk/lfs/squidGuard	2013-11-23 13:36:53 UTC (rev 7161)
@@ -90,6 +90,7 @@
 	cd $(DIR_APP) && tar xf $(DIR_DL)/$(PATCH1)
 	cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do echo "Using \
$$patch"; patch -p1 -i debian/patches/$$patch; done  cd $(DIR_APP) && patch -Np1 -i \
$(DIR_PATCHES)/$(THISAPP)_stdout-always.patch +	cd $(DIR_APP) && patch -Np1 -i \
$(DIR_PATCHES)/$(THISAPP)_db_v4_up.patch  # Fix implicit declaration of function \
'HTUnEscape'  cd $(DIR_APP) && sed -i 's/sgEx.h.*/&\n#include "HTEscape.h"/' \
src/sgDiv.c.in  # Fix format %d vs size_t

Added: ipcop/trunk/src/patches/squidGuard-1.5-beta_db_v4_up.patch
===================================================================
--- ipcop/trunk/src/patches/squidGuard-1.5-beta_db_v4_up.patch	                       \
                (rev 0)
+++ ipcop/trunk/src/patches/squidGuard-1.5-beta_db_v4_up.patch	2013-11-23 13:36:53 \
UTC (rev 7161) @@ -0,0 +1,14 @@
+Make BerkeleyDB version 4.7 and higher working.
+
+diff -Nur a/src/sgDb.c b/src/sgDb.c
+--- a/src/sgDb.c	2010-09-09 12:35:22.000000000 +0200
++++ b/src/sgDb.c	2013-11-23 10:05:55.000000000 +0100
+@@ -112,7 +112,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)

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]