Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (87bb54168b2dbb8d7a2f0ef57d529c99b30918ca)
  • Date: Sun, 6 Sep 2009 10:08:57 -0500

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

http/squid/DETAILS | 4 ++--
http/squid/HISTORY | 6 ++++++
http/squid/PRE_BUILD | 3 +++
http/squid/squid-linux-headers.patch | 15 +++++++++++++++
4 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 87bb54168b2dbb8d7a2f0ef57d529c99b30918ca
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

squid: Updated to version 3.0.STABLE19. Added Gentoo patch to fix
issues with new linux headers.

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 5bb9165..80d76e7 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
SPELL=squid
- VERSION=3.0.STABLE18
+ VERSION=3.0.STABLE19
SOURCE=$SPELL-$VERSION.tar.bz2
# 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
-
SOURCE_HASH=sha512:bb8469dcdb1daed9a58fb79cfd30b808d2f71d25034210fd4de8cb6623d01ef1335a7d274c96f027534d3595871d85a493ebd5a67b88de66c770fb21750c666b
+
SOURCE_HASH=sha512:9c703c60e32bda14d255f1d5934cae0fcea386601f13f35e9d373d9d361a911dbcbea1a301747ecd4851b18f00617171eaf5ca3e13b8e9251692a0a24dbdd5e0
WEB_SITE=http://www.squid-cache.org/
ENTERED=20011214
SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index ebf94e5..cc5b0c6 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,9 @@
+2009-09-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.0.STABLE19
+ * PRE_BUILD: Added gentoo patch
+ * squid-linux-headers.patch: Gentoo patchto fix problem with
+ linux headers. http://bugs.gentoo.org/270450
+
2009-08-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.0.STABLE18

diff --git a/http/squid/PRE_BUILD b/http/squid/PRE_BUILD
new file mode 100755
index 0000000..55ee280
--- /dev/null
+++ b/http/squid/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/squid-linux-headers.patch
diff --git a/http/squid/squid-linux-headers.patch
b/http/squid/squid-linux-headers.patch
new file mode 100644
index 0000000..46147a8
--- /dev/null
+++ b/http/squid/squid-linux-headers.patch
@@ -0,0 +1,15 @@
+--- src/tools.cc.old 2009-05-21 11:27:57.000000000 +0200
++++ src/tools.cc 2009-05-21 11:28:03.000000000 +0200
+@@ -44,9 +44,9 @@
+ #if HAVE_SYS_CAPABILITY_H
+ #undef _POSIX_SOURCE
+ /* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
++// #define _LINUX_TYPES_H
+ #define _LINUX_FS_H
+-typedef uint32_t __u32;
++// typedef uint32_t __u32;
+ #include <sys/capability.h>
+ #endif
+ #endif
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (87bb54168b2dbb8d7a2f0ef57d529c99b30918ca), George Sherwood, 09/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page