[SM-Commit] GIT changes to master grimoire by George Sherwood (492629bfdb1fcd92bdc6f060144bf88365afd48a)

George Sherwood scm at sourcemage.org
Sun Nov 1 11:47:34 EST 2009


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

 http/squid/DETAILS                   |    4 ++--
 http/squid/HISTORY                   |    5 +++++
 http/squid/PRE_BUILD                 |    3 ---
 http/squid/squid-linux-headers.patch |   15 ---------------
 4 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit 492629bfdb1fcd92bdc6f060144bf88365afd48a
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    squid: Updated to version 3.0.STABLE20. Removed unneeded patch.
    Fixed upstream.

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 80d76e7..2bff4d1 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
            SPELL=squid
-         VERSION=3.0.STABLE19
+         VERSION=3.0.STABLE20
           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:9c703c60e32bda14d255f1d5934cae0fcea386601f13f35e9d373d9d361a911dbcbea1a301747ecd4851b18f00617171eaf5ca3e13b8e9251692a0a24dbdd5e0
+     SOURCE_HASH=sha512:b115cb605a0fbfd761a0bc6629147fb299dc979a2bf44b6d54188a72db1adc3bcca9d50aafd6e0afd9f753132fc3f36fef7d781f1465663d5711478f739c09cd
         WEB_SITE=http://www.squid-cache.org/
          ENTERED=20011214
   SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index cc5b0c6..c6c29b8 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,8 @@
+2009-11-01 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.0.STABLE20
+	* PRE_BUILD: Removed
+	* squid-linux-headers.patch: Removed. Fixed upstream.
+
 2009-09-06 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.0.STABLE19
 	* PRE_BUILD: Added gentoo patch
diff --git a/http/squid/PRE_BUILD b/http/squid/PRE_BUILD
deleted file mode 100755
index 55ee280..0000000
--- a/http/squid/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 46147a8..0000000
--- a/http/squid/squid-linux-headers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
-



More information about the SM-Commit mailing list