[SM-Commit] GIT changes to master grimoire by George Sherwood (45d620e1eedf25667e289dafdd366f651bfbdc37)

George Sherwood scm at mail.sourcemage.org
Sat Oct 7 07:41:08 EDT 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 http/squid/DETAILS     |    9 +++--
 http/squid/HISTORY     |    6 +++
 http/squid/PRE_BUILD   |    4 ++
 http/squid/aiops.patch |   80 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)

New commits:
commit 45d620e1eedf25667e289dafdd366f651bfbdc37
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    Updated squid to version 2.6STABLE4. Requires patch for compile error.
    No sig provided upstream, using SHA512.

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index dafb70e..b1773cf 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,11 +1,12 @@
            SPELL=squid
-         VERSION=2.6.STABLE3
+         VERSION=2.6.STABLE4
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
+#        SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
-     SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
-      SOURCE_GPG=squid.gpg:$SOURCE2
+#    SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
+     SOURCE_HASH=sha512:cf14918ab14b771eded06a9edb3e36245d64d245b8878d4d722a1888d27bc10d33db77d32d730473ffc64d7778a0b68b5d2dbba6cdbc18206c474bc33d98c03c
+#     SOURCE_GPG=squid.gpg:$SOURCE2
         WEB_SITE=http://www.squid-cache.org/
          ENTERED=20011214
          UPDATED=20040616
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 7dabd2f..d74ef4a 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,9 @@
+2006-10-07 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to 2.6STABLE4. No sig for this update.
+	* PRE_BUILD: Added to apply required patch
+	* aiops.patch: Added from upstream to fix compile error.
+	  http://www.squid-cache.org/Versions/v2/2.6/changesets/11036.patch
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/http/squid/PRE_BUILD b/http/squid/PRE_BUILD
new file mode 100755
index 0000000..97c693a
--- /dev/null
+++ b/http/squid/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/aiops.patch
+
diff --git a/http/squid/aiops.patch b/http/squid/aiops.patch
new file mode 100644
index 0000000..81243dd
--- /dev/null
+++ b/http/squid/aiops.patch
@@ -0,0 +1,80 @@
+---------------------
+PatchSet 11036 
+Date: 2006/09/25 19:31:34
+Author: serassio
+Branch: HEAD
+Tag: (none) 
+Log:
+Bug #1776: squid -2.6.STABLE4-20060925 doesn't compile properly
+
+n_coss_dirs is referenced from both coss and aufs, this errror happens
+when building with aufs only. To avoid this, n_coss_dirs must be in globals.c
+
+Members: 
+	src/globals.h:1.121->1.122 
+	src/fs/aufs/async_io.h:1.2->1.3 
+	src/fs/coss/store_dir_coss.c:1.59->1.60 
+
+Index: squid/src/globals.h
+===================================================================
+RCS file: /cvsroot/squid/squid/src/globals.h,v
+retrieving revision 1.121
+retrieving revision 1.122
+diff -u -r1.121 -r1.122
+--- src/globals.h	30 Jul 2006 23:27:03 -0000	1.121
++++ src/globals.h	25 Sep 2006 19:31:34 -0000	1.122
+@@ -1,6 +1,6 @@
+ 
+ /*
+- * $Id: globals.h,v 1.121 2006/07/30 23:27:03 hno Exp $
++ * $Id: globals.h,v 1.122 2006/09/25 19:31:34 serassio Exp $
+  *
+  *
+  * SQUID Web Proxy Cache          http://www.squid-cache.org/
+@@ -177,5 +177,6 @@
+ extern int need_linux_tproxy;	/* 0 */
+ #endif
+ extern int opt_parse_cfg_only;	/* 0 */
++extern int n_coss_dirs;		/* 0 */
+ 
+ #endif /* SQUID_GLOBALS_H */
+Index: squid/src/fs/aufs/async_io.h
+===================================================================
+RCS file: /cvsroot/squid/squid/src/fs/aufs/async_io.h,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- src/fs/aufs/async_io.h	29 Jul 2006 17:37:18 -0000	1.2
++++ src/fs/aufs/async_io.h	25 Sep 2006 19:31:34 -0000	1.3
+@@ -8,7 +8,6 @@
+ #define __ASYNC_IO_H__
+ 
+ extern int n_asyncufs_dirs;
+-extern int n_coss_dirs;
+ extern int squidaio_nthreads;
+ extern int squidaio_magic1;
+ extern int squidaio_magic2;
+Index: squid/src/fs/coss/store_dir_coss.c
+===================================================================
+RCS file: /cvsroot/squid/squid/src/fs/coss/store_dir_coss.c,v
+retrieving revision 1.59
+retrieving revision 1.60
+diff -u -r1.59 -r1.60
+--- src/fs/coss/store_dir_coss.c	23 Sep 2006 10:34:41 -0000	1.59
++++ src/fs/coss/store_dir_coss.c	25 Sep 2006 19:31:35 -0000	1.60
+@@ -1,6 +1,6 @@
+ 
+ /*
+- * $Id: store_dir_coss.c,v 1.59 2006/09/23 10:34:41 serassio Exp $
++ * $Id: store_dir_coss.c,v 1.60 2006/09/25 19:31:35 serassio Exp $
+  *
+  * DEBUG: section 47    Store COSS Directory Routines
+  * AUTHOR: Eric Stern
+@@ -48,7 +48,6 @@
+ #define STORE_META_BUFSZ 4096
+ #define HITONLY_BUFS 2
+ 
+-int n_coss_dirs = 0;
+ int max_coss_dir_size = 0;
+ /* static int last_coss_pick_index = -1; */
+ int coss_initialised = 0;



More information about the SM-Commit mailing list