Mailinglist Archive: opensuse-commit (875 mails)
| < Previous | Next > |
commit squidGuard
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 25 Jul 2008 05:02:43 +0200
- Message-id: <20080725030244.1501867817B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package squidGuard
checked in at Fri Jul 25 05:02:43 CEST 2008.
--------
--- squidGuard/squidGuard.changes 2008-07-02 19:32:04.000000000 +0200
+++ squidGuard/squidGuard.changes 2008-07-22 17:57:49.160683000 +0200
@@ -1,0 +2,7 @@
+Tue Jul 22 17:57:45 CEST 2008 - kssingvo@xxxxxxx
+
+- added latest upstream patch (20080714) as two individual patches:
+ * fix for squid complaining about progress bar
+ * fix if URL was requested which ends with "://"
+
+-------------------------------------------------------------------
New:
----
squidGuard-1.3-progressbar.patch
squidGuard-1.3-unusual_url_end.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squidGuard.spec ++++++
--- /var/tmp/diff_new_pack.Ma3752/_old 2008-07-25 05:02:25.000000000 +0200
+++ /var/tmp/diff_new_pack.Ma3752/_new 2008-07-25 05:02:25.000000000 +0200
@@ -17,7 +17,7 @@
Group: Productivity/Networking/Web/Proxy
AutoReqProv: on
Version: 1.3
-Release: 48
+Release: 57
Url: http://www.squidguard.org/
Provides: squidgrd
Obsoletes: squidgrd
@@ -29,6 +29,8 @@
Patch0: squidGuard-1.3-config.patch
Patch1: squidGuard-1.3-bl_less_noise.patch
Patch2: squidGuard-1.3-trailing_dot.patch
+Patch3: squidGuard-1.3-progressbar.patch
+Patch4: squidGuard-1.3-unusual_url_end.patch
%description
SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector,
@@ -48,6 +50,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
find -type d | xargs chmod 755
cp %{SOURCE1} .
@@ -93,6 +97,10 @@
%doc contrib doc samples test
%changelog
+* Tue Jul 22 2008 kssingvo@xxxxxxx
+- added latest upstream patch (20080714) as two individual patches:
+ * fix for squid complaining about progress bar
+ * fix if URL was requested which ends with "://"
* Wed Jul 02 2008 kssingvo@xxxxxxx
- added latest upstream patch (20080613) as trailing_dot.patch
- "Requires: http_proxy" now, as squid3 is an alternative
++++++ squidGuard-1.3-progressbar.patch ++++++
--- squidGuard-1.3/src/sgDb.c.orig 2008-07-22 17:41:46.000000000 +0200
+++ squidGuard-1.3/src/sgDb.c 2008-07-14 20:42:06.000000000 +0200
@@ -306,7 +306,7 @@ void startProgressBar()
else
{
printf(" [");
- fflush(stdout);
+ fflush(stderr);
}
return;
}
@@ -325,7 +325,7 @@ void finishProgressBar()
{
printf("] 100 %% done\n");
}
- fflush(stdout);
+ fflush(stderr);
return;
}
@@ -340,7 +340,7 @@ void updateProgressBar(prog)
{
int j,k=0;
k = (int)(prog * 50.0);
- printf("\r");fflush(stdout);
+ printf("\r");fflush(stderr);
printf(" [");
for(j=0; j<50; j++)
{
@@ -349,12 +349,12 @@ void updateProgressBar(prog)
else
printf(" ");
}
- printf("] %d %% done", (int)(prog*100.0));fflush(stdout);
+ printf("] %d %% done", (int)(prog*100.0));fflush(stderr);
}
else
{
if(((int)(prog*100.0) % 100) == 0)
- printf(".");fflush(stdout);
+ printf(".");fflush(stderr);
}
return;
++++++ squidGuard-1.3-unusual_url_end.patch ++++++
--- squidGuard-1.3/src/sgDiv.c.in.orig 2008-07-22 17:41:46.000000000 +0200
+++ squidGuard-1.3/src/sgDiv.c.in 2008-07-14 20:42:39.000000000 +0200
@@ -133,7 +133,7 @@ int parseLine(line, s)
{
/* in case this is a '://' skip over it, but try to not read past EOS
*/
if(3 <= strsz-ndx) {
- if(':' == p[ndx] && '/' == p[ndx+1] && '/' == p[ndx+2]) {
+ if(':' == p[ndx] && '/' == p[ndx+1] && '/' == p[ndx+2] && '\0' !=
p[ndx+3]) {
ndx+=3; /* 3 == strlen("://"); */
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |