commit squid-beta

21 Jun 2006

Hello community,

here is the log from the commit of package squid-beta
checked in at Wed Jun 21 18:05:48 CEST 2006.

--------

--- squid-beta/squid-beta.changes	2006-02-09 12:00:33.000000000 +0100
+++ squid-beta/squid-beta.changes	2006-06-21 18:04:32.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun 21 18:03:26 CEST 2006 - kssingvo@suse.de
+
+- upgrade to version 3.0.PRE4
+
+-------------------------------------------------------------------

Old:
----
  squid-3.0-PRE3-20060116-gpl.tar.bz2
  squid-3.0-gcc.patch
  squid-beta-3.0-gcc41_wur.patch

New:
----
  squid-3.0.PRE4-RELEASENOTES.html
  squid-3.0.PRE4.tar.bz2
  squid-beta-3.0.pre4-gcc41_wur.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ squid-beta.spec ++++++
--- /var/tmp/diff_new_pack.7RzRa6/_old	2006-06-21 18:05:30.000000000 +0200
+++ /var/tmp/diff_new_pack.7RzRa6/_new	2006-06-21 18:05:30.000000000 +0200
@@ -13,9 +13,9 @@
 BuildRequires:  expat gcc-c++ krb5 libxml2-devel openldap2 openldap2-devel opensp-devel pam-devel sharutils
 Summary:        Squid V3.0 WWW Proxy Server (new version)
 Version:        3.0
-Release:        248
+Release:        260
 License:        GPL
-%define		ver PRE3-20060116
+%define		ver PRE4
 URL:            http://www.squid-cache.org
 Group:          Productivity/Networking/Web/Proxy
 Requires:       logrotate
@@ -28,10 +28,11 @@
 %else
 Prereq:         /usr/sbin/useradd
 %endif
-Source0:        http://www.squid-cache.org/Versions/v3/3.0/squid-%{version}-%{ver}-gpl.tar.bz2
+Source0:        http://www.squid-cache.org/Versions/v3/3.0/squid-%{version}.%{ver}.tar.bz2
 #%define       squid_ldapauth_version 1.3
 #Source1:      squid_ldapauth-%{squid_ldapauth_version}.tar.bz2
 Source2:        rc.squid
+Source3:        squid-3.0.PRE4-RELEASENOTES.html
 Source5:        pam.squid
 Source6:        unsquid.pl
 Source7:        squid.logrotate
@@ -105,11 +106,11 @@
 # Patch58:      http://www.squid-cache.org/Versions/v3/3.0/bugs/squid-3.0.PRE3-dns_error.pat...
 # Patch59:      http://www.squid-cache.org/Versions/v3/3.0/bugs/squid-3.0.PRE3-rfc1035NameUn...
 # Patch60:      http://www.squid-cache.org/Versions/v3/3.0/bugs/
-Patch100:       squid-3.0-gcc.patch
+# Patch100:       squid-3.0-gcc.patch
 Patch101:       squid-beta-3.0-libmxl2.patch
 Patch102:       squid-beta-3.0-64bit.patch
 Patch103:       squid-beta-3.0-ia64.patch
-Patch104:       squid-beta-3.0-gcc41_wur.patch
+Patch104:       squid-beta-3.0.pre4-gcc41_wur.patch
 Patch105:       squid-beta-3.0-openldap.patch
 Patch106:       squid-beta-3.0-mem_node_64bit.patch
 Patch107:       squid-beta-3.0-md5.patch
@@ -127,7 +128,7 @@
     Duane Wessels <wessels@ircache.net>
 
 %prep
-%setup -n squid-%{version}-%{ver}
+%setup -n squid-%{version}.%{ver}
 cp -ai %{SOURCE10} src
 %patch -p0
 # %patch1 -p1
@@ -199,7 +200,7 @@
 # %patch67 -p1
 # %patch68 -p1
 # %patch69 -p1
-%patch100 -p1
+# %patch100 -p1
 %patch101 -p1
 perl -p -i -e 's|SAMBAPREFIX=/usr/local/samba|SAMBAPREFIX=/usr|' helpers/basic_auth/SMB/Makefile.in
 perl -p -i -e 's|SAMBAPREFIX=/usr/local/samba|SAMBAPREFIX=/usr|' helpers/ntlm_auth/SMB/Makefile.in
@@ -419,6 +420,8 @@
 #%doc squid_ldapauth.conf
 
 %changelog -n squid-beta
+* Wed Jun 21 2006 - kssingvo@suse.de
+- upgrade to version 3.0.PRE4
 * Thu Feb 09 2006 - kssingvo@suse.de
 - removed/replaced non-GPL code with GPL compliant (bugzilla#143472)
 * Wed Jan 25 2006 - mls@suse.de




++++++ squid-3.0-PRE3-20060116-gpl.tar.bz2 -> squid-3.0.PRE4.tar.bz2 ++++++
++++   65153 lines of diff (skipped)

++++++ squid-beta-3.0.pre4-gcc41_wur.patch ++++++
--- squid-3.0.PRE4/src/StoreIOBuffer.h.orig	2005-11-22 00:14:22.000000000 +0100
+++ squid-3.0.PRE4/src/StoreIOBuffer.h	2006-06-21 14:36:08.000000000 +0200
@@ -68,8 +68,9 @@
 
     void dump() const
     {
-        fwrite(data, length, 1, stderr);
-        fwrite("\n", 1, 1, stderr);
+	int t;
+        t=fwrite(data, length, 1, stderr);
+        t=fwrite("\n", 1, 1, stderr);
     }
 
     struct
--- squid-3.0.PRE4/lib/util.c.orig	2005-07-03 17:25:07.000000000 +0200
+++ squid-3.0.PRE4/lib/util.c	2006-06-21 14:36:08.000000000 +0200
@@ -770,8 +770,9 @@
 void
 default_failure_notify(const char *message)
 {
-    write(2, message, strlen(message));
-    write(2, "\n", 1);
+    int t;
+    t=write(2, message, strlen(message));
+    t=write(2, "\n", 1);
     abort();
 }
 
--- squid-3.0.PRE4/src/comm.cc.orig	2006-05-30 23:15:58.000000000 +0200
+++ squid-3.0.PRE4/src/comm.cc	2006-06-21 14:36:16.000000000 +0200
@@ -2344,7 +2344,8 @@
 void CommIO::Initialise() {
     /* Initialize done pipe signal */
     int DonePipe[2];
-    pipe(DonePipe);
+    int t;
+    t=pipe(DonePipe);
     DoneFD = DonePipe[1];
     DoneReadFD = DonePipe[0];
     fd_open(DoneReadFD, FD_PIPE, "async-io completetion event: main");
--- squid-3.0.PRE4/src/tools.cc.orig	2006-05-09 01:38:33.000000000 +0200
+++ squid-3.0.PRE4/src/tools.cc	2006-06-21 14:36:16.000000000 +0200
@@ -140,7 +140,8 @@
 
     snprintf(command, 256, "%s %s < %s", Config.EmailProgram, Config.adminEmail, filename);
 
-    system(command);		/* XXX should avoid system(3) */
+    int t;
+    t = system(command);		/* XXX should avoid system(3) */
 
     unlink(filename);
 }




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)