Hello community, here is the log from the commit of package squidGuard checked in at Thu Nov 29 12:49:10 CET 2007. -------- --- squidGuard/squidGuard.changes 2007-07-04 20:52:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/squidGuard/squidGuard.changes 2007-11-29 12:13:09.181471000 +0100 @@ -1,0 +2,27 @@ +Thu Nov 29 12:10:44 CET 2007 - kssingvo@suse.de + +- update to version 1.3: + * Included configurable logging. New configure option --nolog + suppress all runtime logmessages. Start and stop is still + logged. Default behaviour is now to log the non debug + messages except when the runtime option -d is supplied to + squidGuard. May need some more finetuning in later versions. + (bug 11) Made some slight changes to the outdated FAQ file. + * Modified auth code to work with and without ldap (choosing + subroutine rfc1738_unescape or sgFindUser in sg.y.in) + * Corrected include statement in sg.h.in. + * Added patch by Marc Clayton to include a progressbar to the + build of the database files (bug 6). + * Added patch by Eric Harrison to enable full sed compliance to + rewrite statements (bug 7). + * Corrected missing evaluation of configure parameters for + logdir, dbhome and config file (bug 11). + * Added patch from satish to block urls entries that include + hostnames (bug 4). + * Fixed broken regex evaluation (bug 12) + * Fixed a compile problem on some systems (bug 10). + * Corrected an issue with the fix for the double slash + vulnerability (incorrectly found double slashes) (bug 1). +- fixed build/config issues + +------------------------------------------------------------------- Old: ---- squidGuard-1.2.0-dbopen.patch squidGuard-1.2.1-compile.patch squidGuard-1.2.1-config.patch squidGuard-1.2.1-double_slash.patch squidGuard-1.2.1-regexp.patch squidGuard-1.2.1.tar.bz2 New: ---- squidGuard-1.3-bl_less_noise.patch squidGuard-1.3-config.patch squidGuard-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidGuard.spec ++++++ --- /var/tmp/diff_new_pack.o28450/_old 2007-11-29 12:46:37.000000000 +0100 +++ /var/tmp/diff_new_pack.o28450/_new 2007-11-29 12:46:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package squidGuard (Version 1.2.1) +# spec file for package squidGuard (Version 1.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,10 +14,10 @@ BuildRequires: bison db-devel flex openldap2-devel License: GPL v2 or later Group: Productivity/Networking/Web/Proxy -Autoreqprov: on -Version: 1.2.1 -Release: 15 -URL: http://www.squidguard.org/ +AutoReqProv: on +Version: 1.3 +Release: 1 +Url: http://www.squidguard.org/ Provides: squidgrd Obsoletes: squidgrd PreReq: squid @@ -25,11 +25,8 @@ Summary: filter plugin for squid Source0: squidGuard-%{version}.tar.bz2 Source1: README.SuSE -Patch0: squidGuard-1.2.1-config.patch -Patch1: squidGuard-1.2.0-dbopen.patch -Patch2: squidGuard-1.2.1-double_slash.patch -Patch3: squidGuard-1.2.1-regexp.patch -Patch4: squidGuard-1.2.1-compile.patch +Patch0: squidGuard-1.3-config.patch +Patch1: squidGuard-1.3-bl_less_noise.patch %description SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector, @@ -67,9 +64,10 @@ # --------------------------------------------------------------------------- %install +mkdir $RPM_BUILD_ROOT/etc make install DESTDIR=$RPM_BUILD_ROOT # config file to the correct place... -install -m 644 test/test1.conf $RPM_BUILD_ROOT/etc/squidGuard.conf +# install -m 644 test/test1.conf $RPM_BUILD_ROOT/etc/squidGuard.conf mkdir -p $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist install -m 644 test/blacklist/* $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist mkdir -p $RPM_BUILD_ROOT/var/log/squidGuard @@ -84,14 +82,38 @@ %attr(700, squid, root) %dir /var/lib/squidGuard %attr(700, squid, root) %dir /var/lib/squidGuard/db %attr(700, squid, root) %dir /var/log/squidGuard -%config(noreplace) /etc/squidGuard.conf +%config(noreplace) /etc/squidguard.conf %config(noreplace) /var/lib/squidGuard/db/blacklist /usr/sbin/* -%doc ANNOUNCE CHANGELOG CONFIGURATION COPYING -%doc FAQ GPL INSTALL README README.LDAP README.SuSE +%doc ANNOUNCE CHANGELOG CONFIGURATION COPYING FAQ GPL +%doc INSTALL ISSUES.txt README README.LDAP README.SuSE %doc contrib doc samples test %changelog +* Thu Nov 29 2007 - kssingvo@suse.de +- update to version 1.3: + * Included configurable logging. New configure option --nolog + suppress all runtime logmessages. Start and stop is still + logged. Default behaviour is now to log the non debug + messages except when the runtime option -d is supplied to + squidGuard. May need some more finetuning in later versions. + (bug 11) Made some slight changes to the outdated FAQ file. + * Modified auth code to work with and without ldap (choosing + subroutine rfc1738_unescape or sgFindUser in sg.y.in) + * Corrected include statement in sg.h.in. + * Added patch by Marc Clayton to include a progressbar to the + build of the database files (bug 6). + * Added patch by Eric Harrison to enable full sed compliance to + rewrite statements (bug 7). + * Corrected missing evaluation of configure parameters for + logdir, dbhome and config file (bug 11). + * Added patch from satish to block urls entries that include + hostnames (bug 4). + * Fixed broken regex evaluation (bug 12) + * Fixed a compile problem on some systems (bug 10). + * Corrected an issue with the fix for the double slash + vulnerability (incorrectly found double slashes) (bug 1). +- fixed build/config issues * Wed Jul 04 2007 - kssingvo@suse.de - fixes from upstream: * double slash bug fix extracted from Patch-20070513 tarball ++++++ squidGuard-1.3-bl_less_noise.patch ++++++ --- squidGuard-1.3/src/sgDb.c.orig 2007-11-03 14:59:49.000000000 +0100 +++ squidGuard-1.3/src/sgDb.c 2007-11-16 21:10:47.000000000 +0100 @@ -1,10 +1,12 @@ /* By accepting this notice, you agree to be bound by the following agreements: - - This software product, squidGuard, is copyrighted (C) 1998-2007 - by Christine Kronberg, Shalla Secure Services. All rights reserved. - + + This software product, squidGuard, is copyrighted (C) 1998 by + ElTele �st AS, Oslo, Norway, with all rights reserved. + With December 27th 2006 all rights moved to Christine Kronberg, + Shalla Secure Services. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License (version 2) as published by the Free Software Foundation. It is distributed in the @@ -287,29 +289,75 @@ return result; } +static int stdoutisatty; + +#if __STDC__ +void startProgressBar() +#else +void startProgressBar() +#endif +{ + stdoutisatty = isatty(STDOUT_FILENO); + + if(1 == stdoutisatty) + { + /* do nothing */ + } + else + { + printf(" ["); + fflush(stdout); + } + return; +} + #if __STDC__ -void drawProgressBar(float prog) +void finishProgressBar() #else -void drawProgressBar(prog) +void finishProgressBar() +#endif +{ + if(1 == stdoutisatty) + { + printf("\n"); + } + else + { + printf("] 100 %% done\n"); + } + fflush(stdout); + return; +} + +#if __STDC__ +void updateProgressBar(float prog) +#else +void updateProgressBar(prog) float prog; #endif { - int j,k=0; - k = (int)(prog * 50.0); - printf(" ["); - for(j=0; j<50; j++) + if(1 == stdoutisatty) { - if(j <= k) + int j,k=0; + k = (int)(prog * 50.0); + printf("\r");fflush(stdout); + printf(" ["); + for(j=0; j<50; j++) + { + if(j <= k) printf("="); - else + else printf(" "); + } + printf("] %d %% done", (int)(prog*100.0));fflush(stdout); } - printf("] %d %% done", (int)(prog*100.0));fflush(stdout); - for(j=0; j<1000000; j++) {/*slow down to make progress bar more obvious*/} - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout); + else + { + if(((int)(prog*100.0) % 100) == 0) + printf(".");fflush(stdout); + } + + return; } #if __STDC__ @@ -340,13 +388,14 @@ fstat(fileno(fp), &fpst); fpsz = fpst.st_size; + startProgressBar(); memset(&Db->key, 0, sizeof(DBT)); memset(&Db->data, 0, sizeof(DBT)); while(fgets(line, sizeof(line), fp) != NULL){ lnsz += strlen(line); - drawProgressBar((float)lnsz/(float)fpsz); + updateProgressBar((float)lnsz/(float)fpsz); if(*line == '#') continue; @@ -418,7 +467,7 @@ if(update){ sgLogError("update: added %d entries, deleted %d entries",entries,deleted); } - printf("\n"); + finishProgressBar(); Db->entries = entries; fclose(fp); } ++++++ squidGuard-1.2.1-config.patch -> squidGuard-1.3-config.patch ++++++ --- squidGuard/squidGuard-1.2.1-config.patch 2007-05-10 15:48:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/squidGuard/squidGuard-1.3-config.patch 2007-11-29 12:06:55.167860000 +0100 @@ -13,19 +13,6 @@ infodir = $(prefix)/info SQUIDUSER = @squiduser@ ---- squidGuard-1.2.1/samples/sample.conf.in.orig 2007-03-25 11:36:39.000000000 +0200 -+++ squidGuard-1.2.1/samples/sample.conf.in 2007-05-10 14:48:35.000000000 +0200 -@@ -2,8 +2,8 @@ - # CONFIG FILE FOR SQUIDGUARD - # - --dbhome @prefix@/squidGuard/db --logdir @prefix@/squidGuard/log -+dbhome /var/lib/squidGuard/db -+logdir /var/log/squidGuard - - # - # TIME RULES: --- squidGuard-1.2.1/src/Makefile.in.orig 2007-03-16 16:58:37.000000000 +0100 +++ squidGuard-1.2.1/src/Makefile.in 2007-05-10 14:47:14.000000000 +0200 @@ -31,11 +31,11 @@ @@ -72,32 +59,59 @@ #define ERROR_LOGFILE "squidGuard.error" -#define DEFAULT_CONFIGFILE "@prefix@/squidGuard/squidGuard.conf" -+#define DEFAULT_CONFIGFILE "/etc/squidguard.conf" ++#define DEFAULT_CONFIGFILE "/etc/squidGuard.conf" #define DEFAULT_LOGDIR "@prefix@/squidGuard/log" #define DEFAULT_DBHOME "@prefix@/squidGuard/db" #define EXEC_PROGRAM "@prefix@/bin/squidGuard" ---- squidGuard-1.2.1/Makefile.in.orig 2006-12-29 10:03:53.000000000 +0100 -+++ squidGuard-1.2.1/Makefile.in 2007-05-10 15:42:25.000000000 +0200 -@@ -45,17 +45,15 @@ - install-conf: - @echo Installing configuration file +--- squidGuard-1.3/Makefile.in.orig 2007-11-29 11:30:24.000000000 +0100 ++++ squidGuard-1.3/Makefile.in 2007-11-29 11:35:44.000000000 +0100 +@@ -50,20 +50,14 @@ @if [ ! -d $(prefix)/squidGuard ]; then \ -- $(MKINSTALLDIRS) $(prefix)/squidGuard ; \ -- $(MKINSTALLDIRS) $(prefix)/squidGuard/db ; \ -- $(MKINSTALLDIRS) $(prefix)/squidGuard/log ; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@sg_cfgdir@ ; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@sg_dbhome@ ; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@sg_logdir@ ; \ - echo Created necessary squidGuard directories ; \ + $(MKINSTALLDIRS) $(prefix)/squidGuard ; \ + echo Created directory $(prefix)/squidGuard ; \ - chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1 ; \ - echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \ - fi ; \ - if test ! -f $(prefix)/squidGuard/squidGuard.conf; then \ -- cp samples/sample.conf $(prefix)/squidGuard/squidGuard.conf || exit 1 ; \ -+ cp samples/sample.conf $(DESTDIR)@sg_cfgdir@/squidGuard.conf || exit 1 ; \ + fi ; + @if [ ! -d $(dbhomedir) ]; then \ + $(MKINSTALLDIRS) $(dbhomedir) ; \ + echo Created directory $(dbhomedir) ; \ +- chown -R $(SQUIDUSER) $(dbhomedir) || exit 1 ; \ +- echo Assigned $(dbhomedir) to user $(SQUIDUSER) ; \ + fi ; + @if [ ! -d $(logdir) ]; then \ + $(MKINSTALLDIRS) $(logdir) ; \ + echo Created directory $(logdir) ; \ +- chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \ +- echo Assigned $(logdir) to user $(SQUIDUSER) ; \ + fi ; + @if test ! -f $(configfile); then \ + cp samples/sample.conf $(configfile) || exit 1 ; \ +--- squidGuard-1.3/Makefile.in.orig 2007-11-29 11:42:28.000000000 +0100 ++++ squidGuard-1.3/Makefile.in 2007-11-29 11:43:39.000000000 +0100 +@@ -48,21 +48,21 @@ + install-conf: + @echo Installing configuration file ; + @if [ ! -d $(prefix)/squidGuard ]; then \ +- $(MKINSTALLDIRS) $(prefix)/squidGuard ; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/squidGuard ; \ + echo Created directory $(prefix)/squidGuard ; \ + fi ; + @if [ ! -d $(dbhomedir) ]; then \ +- $(MKINSTALLDIRS) $(dbhomedir) ; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \ + echo Created directory $(dbhomedir) ; \ + fi ; + @if [ ! -d $(logdir) ]; then \ +- $(MKINSTALLDIRS) $(logdir) ; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \ + echo Created directory $(logdir) ; \ + fi ; + @if test ! -f $(configfile); then \ +- cp samples/sample.conf $(configfile) || exit 1 ; \ ++ cp samples/sample.conf $(DESTDIR)$(configfile) || exit 1 ; \ echo Copied sample squidGuard.conf ; \ -- chmod 644 $(prefix)/squidGuard/squidGuard.conf || exit 1 ; \ -+ chmod 644 $(DESTDIR)@sg_cfgdir@/squidGuard.conf || exit 1 ; \ - echo $(prefix)/squidGuard/squidGuard.conf is now readable ; \ +- chmod 644 $(configfile) || exit 1 ; \ ++ chmod 644 $(DESTDIR)$(configfile) || exit 1 ; \ + echo $(configfile) is now readable ; \ echo The initial configuration is complete. ; \ else \ ++++++ squidGuard-1.2.1.tar.bz2 -> squidGuard-1.3.tar.bz2 ++++++ ++++ 10129 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de