Revision: 7487
http://sourceforge.net/p/ipcop/svn/7487
Author: owes
Date: 2014-04-17 20:39:35 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
Patch squidGuard to make syslog more readable.
Modified Paths:
--------------
ipcop/trunk/lfs/squidGuard
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
Added Paths:
-----------
ipcop/trunk/src/patches/squidGuard-1.5-beta_remove-debug-logging.patch
Modified: ipcop/trunk/lfs/squidGuard
===================================================================
--- ipcop/trunk/lfs/squidGuard 2014-04-17 20:34:24 UTC (rev 7486)
+++ ipcop/trunk/lfs/squidGuard 2014-04-17 20:39:35 UTC (rev 7487)
@@ -91,6 +91,7 @@
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
+ cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_remove-debug-logging.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
@@ -101,6 +102,8 @@
cd $(DIR_APP) && sed -i '/struct IpInfo uq;/d;/ struct UserInfo
uq;/d' src/sg.y.in
# Fix 'yyunput' and 'input' defined but not used
cd $(DIR_APP) && sed -i 's/ignore /%option noinput\n%option
nounput\n&/' src/sg.l
+ # add additional version info
+ cd $(DIR_APP) && sed -i 's:#define VERSION\(.*\):#define VERSION\1 \"
\(IPCop patchlevel 5\)\":g' src/version.h
# Use --with-db, so /usr/local does not appear for db
cd $(DIR_APP) && ./configure --prefix=/usr \
Added: ipcop/trunk/src/patches/squidGuard-1.5-beta_remove-debug-logging.patch
===================================================================
--- ipcop/trunk/src/patches/squidGuard-1.5-beta_remove-debug-logging.patch
(rev 0)
+++ ipcop/trunk/src/patches/squidGuard-1.5-beta_remove-debug-logging.patch
2014-04-17 20:39:35 UTC (rev 7487)
@@ -0,0 +1,66 @@
+--- a/src/sg.y.in 2014-04-14 16:23:39.183396677 +0200
++++ b/src/sg.y.in 2014-04-14 16:24:19.000000000 +0200
+@@ -815,9 +815,9 @@
+ {
+ struct Source *sp;
+ sp = lastSource;
+-
++/* DEBUG
+ @NOLOG1@ sgLogError("DEBUG: sgSourceLdapIpSearch called with: %s", url);
@NOLOG2@
+-
++*/
+ if(!ldap_is_ldap_url(url)) {
+ sgLogError("%s: can't parse LDAP url %s",progname, url);
+ return;
+@@ -1330,10 +1329,12 @@
+ }
+ sp->domainlistDb = (struct sgDb *) sgCalloc(1,sizeof(struct sgDb));
+ sp->domainlistDb->type=SGDBTYPE_DOMAINLIST;
++/* DEBUG
+ sgLogError("init domainlist %s",sp->domainlist);
++*/
+ sgDbInit(sp->domainlistDb,sp->domainlist);
+ if(sp->domainlistDb->entries == 0) { /* empty database */
+- sgLogError("domainlist empty, removed from memory");
++ sgLogError("domainlist %s empty, removed from memory",sp->domainlist);
+ sgFree(sp->domainlistDb);
+ sp->domainlistDb = NULL;
+ }
+@@ -1375,10 +1376,12 @@
+ }
+ sp->urllistDb = (struct sgDb *) sgCalloc(1,sizeof(struct sgDb));
+ sp->urllistDb->type=SGDBTYPE_URLLIST;
++/* DEBUG
+ sgLogError("init urllist %s",sp->urllist);
++*/
+ sgDbInit(sp->urllistDb,sp->urllist);
+ if(sp->urllistDb->entries == 0) { /* empty database */
+- sgLogError("urllist empty, removed from memory");
++ sgLogError("urllist empty %s, removed from memory",sp->urllist);
+ sgFree(sp->urllistDb);
+ sp->urllistDb = NULL;
+ }
+@@ -2792,9 +2792,9 @@
+ char *interval;
+ struct UserInfo *userinfo;
+ static struct UserInfo info;
+-
++/* DEBUG
+ @NOLOG1@ sgLogError("DEBUG: sgFindUser called with: %s", ident); @NOLOG2@
+-
++*/
+ /* defined in the userDB? */
+ if(defined(src->userDb, ident, (char **) &userinfo) == 1) {
+ #ifdef HAVE_LIBLDAP
+--- a/src/sgDb.c 2014-04-17 08:53:29.961367395 +0200
++++ b/src/sgDb.c 2014-04-17 08:53:58.000000000 +0200
+@@ -48,7 +48,9 @@
+ strcat(dbfile,".db");
+ if(stat(dbfile,&st) == 0){
+ if(!createdb){
++/* DEBUG
+ sgLogNotice("INFO: loading dbfile %s",dbfile);
++*/
+ }
+ } else {
+ if(!createdb){
Modified: ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-17 20:34:24 UTC
(rev 7486)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-17 20:39:35 UTC
(rev 7487)
@@ -186,6 +186,9 @@
/usr/lib/libsqlite3.so.0
/usr/lib/libsqlite3.so.0.8.6
##
+## squidGuard-1.5-beta (patched)
+/usr/bin/squidGuard
+##
## usb-modeswitch-2.1.1
/etc/usb_modeswitch.conf
/lib/udev/usb_modeswitch
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
