Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (208a193005a3738437bf3d69b5b693f9243ec31e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (208a193005a3738437bf3d69b5b693f9243ec31e)
  • Date: Tue, 7 Nov 2006 11:21:03 -0600

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

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

New commits:
commit 208a193005a3738437bf3d69b5b693f9243ec31e
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

squid: Updated to 2.6.STABLE5.

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index b1773cf..86c9d2c 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,15 +1,13 @@
SPELL=squid
- VERSION=2.6.STABLE4
+ VERSION=2.6.STABLE5
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_HASH=sha512:cf14918ab14b771eded06a9edb3e36245d64d245b8878d4d722a1888d27bc10d33db77d32d730473ffc64d7778a0b68b5d2dbba6cdbc18206c474bc33d98c03c
-# SOURCE_GPG=squid.gpg:$SOURCE2
+
SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
+ SOURCE_GPG=squid.gpg:$SOURCE2
WEB_SITE=http://www.squid-cache.org/
ENTERED=20011214
- UPDATED=20040616
LICENSE[0]=GPL
KEYWORDS="web http"
SHORT="Full-featured Web proxy cache"
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index d74ef4a..1972a72 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,8 @@
+2006-11-07 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 2.6STABLE5. Removed UPDATED. GPG Checking.
+ * PRE_BUILD: Removed. Patch not needed.
+ * aiops.patch: Removed fixed upstream.
+
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
diff --git a/http/squid/PRE_BUILD b/http/squid/PRE_BUILD
deleted file mode 100755
index 97c693a..0000000
--- a/http/squid/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/aiops.patch
-
diff --git a/http/squid/aiops.patch b/http/squid/aiops.patch
deleted file mode 100644
index 81243dd..0000000
--- a/http/squid/aiops.patch
+++ /dev/null
@@ -1,80 +0,0 @@
----------------------
-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;



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (208a193005a3738437bf3d69b5b693f9243ec31e), George Sherwood, 11/07/2006

Archive powered by MHonArc 2.6.24.

Top of Page