Attachment 85496 Details for Bug 121719 – squidguard.diff

[patch] squidguard.diff

squidguard.diff (text/x-diff; charset=iso-8859-1), 8.28 KB, created by Guido Falsi on 2008-03-19 09:57:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2008-03-19 09:57:10 UTC

Size: 8.28 KB

patch

obsolete

>diff -ruN squidguard.old/Makefile squidguard/Makefile
>--- squidguard.old/Makefile	2008-02-25 15:44:47.000000000 +0100
>+++ squidguard/Makefile	2008-03-19 09:58:29.000000000 +0100
>@@ -6,12 +6,9 @@
> #
> 
> PORTNAME=	squidGuard
>-PORTVERSION=	1.2.0
>-PORTREVISION=	1
>+PORTVERSION=	1.3
> CATEGORIES=	www
>-MASTER_SITES=	http://ftp.teledanmark.no/pub/www/proxy/squidGuard/ \
>-		ftp://ftp.teledanmark.no/pub/www/proxy/squidGuard/ \
>-		http://web01.ux.tyfon.net/ports/distfiles/
>+MASTER_SITES=	http://www.squidguard.org/Downloads/
> 
> MAINTAINER=	ports@tyfon.net
> COMMENT=	A fast redirector for squid
>diff -ruN squidguard.old/distinfo squidguard/distinfo
>--- squidguard.old/distinfo	2008-02-25 15:44:47.000000000 +0100
>+++ squidguard/distinfo	2008-03-19 09:58:45.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (squidGuard-1.2.0.tar.gz) = c6e2e9112fdbda0602656f94c1ce31fd
>-SHA256 (squidGuard-1.2.0.tar.gz) = 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d
>-SIZE (squidGuard-1.2.0.tar.gz) = 1852737
>+MD5 (squidGuard-1.3.tar.gz) = d7c2c2e03a2835e4d1c3bef751ace76f
>+SHA256 (squidGuard-1.3.tar.gz) = be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
>+SIZE (squidGuard-1.3.tar.gz) = 1905252
>diff -ruN squidguard.old/files/patch-Makefile.in squidguard/files/patch-Makefile.in
>--- squidguard.old/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ squidguard/files/patch-Makefile.in	2008-02-25 16:11:39.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	2008-02-25 16:11:04.000000000 +0100
>++++ Makefile.in	2008-02-25 16:11:17.000000000 +0100
>+@@ -43,7 +43,7 @@
>+ # Dependencies for installing
>+ #	
>+ 
>+-install:	install-build install-conf
>++install:	install-build
>+ 
>+ install-conf:
>+ 	@echo Installing configuration file  ;
>diff -ruN squidguard.old/files/patch-configure squidguard/files/patch-configure
>--- squidguard.old/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ squidguard/files/patch-configure	2008-02-25 15:58:26.000000000 +0100
>@@ -0,0 +1,34 @@
>+--- configure.orig	2008-02-25 15:56:52.000000000 +0100
>++++ configure	2008-02-25 15:58:10.000000000 +0100
>+@@ -3793,7 +3793,7 @@
>+ echo "$as_me:$LINENO: checking suppress runtime logging " >&5
>+ echo $ECHO_N "checking suppress runtime logging... $ECHO_C" >&6
>+ 
>+-if [ "x$nolog" == x"yes" ]; then
>++if [ "x$nolog" = x"yes" ]; then
>+   echo $ECHO_N " $ECHO_C" >&6
>+ else
>+   echo $ECHO_N " no" >&6
>+@@ -3802,7 +3802,7 @@
>+ echo "$as_me:$LINENO: result: $nolog" >&5
>+ echo "${ECHO_T}$nolog" >&6
>+ 
>+-if [ "x$nolog" == x"yes" ]; then
>++if [ "x$nolog" = x"yes" ]; then
>+ NOLOG1="/* nolog option set:"
>+ NOLOG2="*/"
>+ fi
>+@@ -3822,11 +3822,11 @@
>+ echo "$as_me:$LINENO: result: $with_ldap" >&5
>+ echo "${ECHO_T}$with_ldap" >&6
>+ 
>+-if [ "x$with_ldap" == x"no" ]; then
>++if [ "x$with_ldap" = x"no" ]; then
>+ ldap_yacc=""
>+ fi
>+ 
>+-if [ "x$with_ldap" == x"yes" ]; then
>++if [ "x$with_ldap" = x"yes" ]; then
>+ 
>+ ldap_yacc="                     | LDAPUSERSEARCH WORD { sgSourceLdapUserSearch(\$2); }"
>+ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
>diff -ruN squidguard.old/files/patch-src_sgDB.c squidguard/files/patch-src_sgDB.c
>--- squidguard.old/files/patch-src_sgDB.c	2008-02-25 15:44:47.000000000 +0100
>+++ squidguard/files/patch-src_sgDB.c	2008-03-19 10:46:11.000000000 +0100
>@@ -1,6 +1,23 @@
>---- src/sgDb.c.orig	Mon May 14 08:40:12 2001
>-+++ src/sgDb.c	Thu Dec 29 23:31:32 2005
>-@@ -97,14 +97,20 @@
>+--- src/sgDb.c.orig	2007-11-03 14:59:49.000000000 +0100
>++++ src/sgDb.c	2008-03-19 10:35:18.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
>+@@ -99,14 +101,20 @@
>      flag = DB_CREATE;
>      if(createdb)
>        flag = flag | DB_TRUNCATE;
>@@ -8,9 +25,9 @@
> -	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
> +    if ((ret = Db->dbp->open(Db->dbp,
> +#if DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR >= 41
>-+	 NULL,
>++       NULL,
> +#endif
>-+	 dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
>++       dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
>        (void) Db->dbp->close(Db->dbp, 0);
>        sgLogFatalError("Error db_open: %s", strerror(ret));
>      }
>@@ -19,9 +36,124 @@
> -	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
> +    if ((ret = Db->dbp->open(Db->dbp,
> +#if DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR >= 41
>-+	 NULL,
>++       NULL,
> +#endif
>-+	 dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
>++       dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
>        sgLogFatalError("Error db_open: %s", strerror(ret));
>      }
>    }
>+@@ -287,29 +295,75 @@
>+   return result;
>+ }
>+ 
>++static int stdoutisatty;
>++
>+ #if __STDC__
>+-void drawProgressBar(float prog)
>++void startProgressBar()
>+ #else
>+-void drawProgressBar(prog)
>++void startProgressBar()
>++#endif
>++{
>++  stdoutisatty = isatty(STDOUT_FILENO);
>++
>++  if(1 == stdoutisatty)
>++  {
>++    /* do nothing */
>++  }
>++  else
>++  {
>++    printf("    [");
>++    fflush(stdout);
>++  }
>++  return;
>++}
>++
>++#if __STDC__
>++void finishProgressBar()
>++#else
>++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 +394,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 +473,7 @@
>+   if(update){
>+     sgLogError("update: added %d entries, deleted %d entries",entries,deleted);
>+   }
>+-  printf("\n");
>++  finishProgressBar();
>+   Db->entries = entries;
>+   fclose(fp);
>+ }
>diff -ruN squidguard.old/pkg-plist squidguard/pkg-plist
>--- squidguard.old/pkg-plist	2008-02-25 15:44:47.000000000 +0100
>+++ squidguard/pkg-plist	2008-02-25 16:58:29.000000000 +0100
>@@ -1,11 +1,18 @@
> bin/squidGuard
>+share/doc/squidGuard/LDAPFlow.txt
> share/doc/squidGuard/README
> share/doc/squidGuard/README.blacklists
> share/doc/squidGuard/configuration.html
> share/doc/squidGuard/configuration.txt
>+share/doc/squidGuard/configure.html
>+share/doc/squidGuard/configure.txt
>+share/doc/squidGuard/extended.html
>+share/doc/squidGuard/extended.txt
> share/doc/squidGuard/faq.html
> share/doc/squidGuard/faq.txt
> share/doc/squidGuard/index.html
>+share/doc/squidGuard/install.html
>+share/doc/squidGuard/install.txt
> share/doc/squidGuard/installation.html
> share/doc/squidGuard/installation.txt
> share/doc/squidGuard/squidGuard.gif

Actions: View | Diff

Attachments on bug 121719: 85495 | 85496