summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brown2007-10-18 07:39:24 -0700
committerDavid Brown2007-10-30 04:10:25 +0000
commitcda51b72423c7453134301d4f4766742b8eb7273 (patch)
tree6e14d3e14fde9136834a6ccdac7e9fe1f4c73e2f
parent091738b3b49471f8a4421de1266269a064dca0fc (diff)
Revert "glibc updated glibc kernel headers to the new version"
This reverts commit c50decb0ff8f42d62d60dda24d099757a6dd2f02.
-rwxr-xr-xlibs/FUNCTIONS20
-rwxr-xr-xlibs/glibc/DETAILS10
-rw-r--r--libs/glibc/HISTORY4
-rw-r--r--libs/glibc/sha512sums22
4 files changed, 7 insertions, 49 deletions
diff --git a/libs/FUNCTIONS b/libs/FUNCTIONS
index bb2fd1afe9..28ac9ca313 100755
--- a/libs/FUNCTIONS
+++ b/libs/FUNCTIONS
@@ -30,23 +30,3 @@ function build_apr()
make
}
-
-#
-## Gets the source hash from a sha* file in the spell directory
-## This assumes SOURCEN has been specified before this is called
-#
-function get_source_hash()
-{
- local SNUM=$1
- # fail if it hasn't been rcreated yet
- [[ -z $(eval '$SOURCE'$SNUM) ]] && return 1
- for i in sha512 sha256 sha1 md5
- do
- local source=$(eval '$SOURCE'$SNUM)
- local sum=$(awk '$2 ~ /'$source'/ { print $1 }' $SPELL_DIRECTORY/${i}sums
- [[ $sum ]] &&
- echo $sum &&
- return 0
- done
- return 1
-}
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 177a5bc60b..17dced0bba 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,28 +1,34 @@
SPELL=glibc
if [ "$GLIBC_NPTL" = "y" ]; then
VERSION=2.6.1
- HEADERS_VERSION=2.6.23.1
+ HEADERS_VERSION=2.6.22.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32)
SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2
+ SOURCE3_HASH=sha512:e328abe55c7d3c239ec3dbede78ce405a662d3159382a2cb3db8dbf5b7783d230a237d44c23280171893c9213b55c4f9bf8963f193fc50158803078e3875ecef
;;
x86_64)
SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
+ SOURCE3_HASH=sha512:1d032b35eee2593896cdffd779ed3f695f5abb552c83f96fcabec46d5977b649db0741690be5dd40d712779b0f3816c6e04e7840991dad4e0a6881adee097852
;;
ppc)
SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
+ SOURCE3_HASH=sha512:06c5ff0fdbe39367df6538000358058fb6a804bc3711ad621fd825fa2887b2cb13b6992c32fe64da3381402b681b9ac526ac2b7eb2320966fcb9a6f6b1830737
;;
alpha)
SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
+ SOURCE3_HASH=sha512:a462e6ee9c446a71181e189d36b430fbdbf7070f2499d06e234b50f91ec3f0172a3428ecd37e7dad85bb153bfc985cea39e33785b7cffa9ac371a579412e6361
;;
sparc)
if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
then
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
+ SOURCE3_HASH=sha512:45665ceb4c8622615c3e9bbcbe57e8f9bd96d1cfd7d50aa7269ca8be9f6400c35feddc4b93251e56a7e0d5fbb48cf1b1e0f81bd9ca2853dc154cd38c1bd5ebe8
else
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
+ SOURCE3_HASH=sha512:264bf8f30dcfd72b8fcdb8e9486c8ffe59ec20bbb5f7379b9e300510d761128f636f2d6945ba97f7672fae878a0976e0dabf500a0c53702d67bf7790562a9484
fi
;;
*)
@@ -31,7 +37,6 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
return 222
;;
esac
- SOURCE3_HASH=$(get_source_hash 3)
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE3_URL[0]=http://dmlb2000.homelinux.org/pub/kernel-headers/$SOURCE3
@@ -45,7 +50,6 @@ esac
fi
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=1
else
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index d513ad1b40..51f2bfef28 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,7 +1,3 @@
-2007-10-18 David Brown <dmlb2000@gmail.com>
- * DETAILS: updated kernel header version to 2.6.23.1 and made a smarter
- way to get the sha512sums for the sources
-
2007-09-23 David Brown <dmlb2000@gmail.com>
* PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed
* nisplus_fix.diff: removed
diff --git a/libs/glibc/sha512sums b/libs/glibc/sha512sums
deleted file mode 100644
index 4c44757c48..0000000000
--- a/libs/glibc/sha512sums
+++ /dev/null
@@ -1,22 +0,0 @@
-002a7d1003eedc257c5be00970f61667cc6e328f6ee9d20572f755f74e0498193042e0a0a3d4ba0751f8481a682be090e358edb3167b211c8fc5c1c7ff69d81b linux-headers-2.6.23.1-alpha.tar.bz2
-9049a3b0344951551c76130ed597e21f4c745c413e810dd0bd27f300e13f775f2037851236213557ee117e1d84a24be274d156fe1fc06181023bf52fbb1ba027 linux-headers-2.6.23.1-arm.tar.bz2
-d5e37af108a3ee55c62464086c99eba726d47f79815be132f55c91b10de0762616bc81bd58956d4241979e44af2f5b7f29d8aab09839cb0189010444b7c6266d linux-headers-2.6.23.1-avr32.tar.bz2
-b4b746af1b50e830ccdf75414a8a9882bdbd071435f4fefeb2a8253094fd8aa027976563bb1471d7d797eb9752762307bc9d9b05b3598f71763460b4ac10c936 linux-headers-2.6.23.1-blackfin.tar.bz2
-6ff7e653283687ffb5290d88b3049c28a736482397dd749c85046c6226cbdaafa3d8fdd8735b188673af1458682a707cddf16f28baf18bfd608dd67cf751e273 linux-headers-2.6.23.1-cris.tar.bz2
-b6d31cb665050cf608336c9a21caa6e306c53920d4fa439839bb4371cdf80c4256072d1a612626bc027ffee3cacc3a3f41f721cb8365ba53c4b4f5998d72e096 linux-headers-2.6.23.1-frv.tar.bz2
-bca6ba7a6cc55e475b5d2b8a8fa2dc8cac9c1166cd456d5aee47c54e089e6cd2b5e5fd7ffc1599a36133583baae59f3814ba1c75bd3a1c03e616555a3120f78e linux-headers-2.6.23.1-h8300.tar.bz2
-8860505c6d1b32b0f3f1180f648da65c3fc0a91b696e13ae9198a87dbfc2ea6e29eca471628237540857a993d43977cb3e5d794abb77bf07e6fa7bc0d4a76d12 linux-headers-2.6.23.1-i386.tar.bz2
-55bc5280dea9ae42c6f7275a4510d6dbe9af44aa7c3e9528190012d28b0b5fc91283ac50b6596586db94b549846b728d94929d712698cb00d62843918caa60af linux-headers-2.6.23.1-ia64.tar.bz2
-373802a713e933f45ff43b2e7edac3934b85252ea3c66ee032834cf074d4e55726377b016c0d8407e6bdb4835e7339a0aaf5a0ccd9d0a43e19481c3b953ea7aa linux-headers-2.6.23.1-m32r.tar.bz2
-f097d0bc8f524cce022163aae27432f84a2807048a8a4643c0d8989fcef661357e25a2f3b67fc351fed31d91b18323ef1a33b6545862c42b01f1fddcbfd150a7 linux-headers-2.6.23.1-m68k.tar.bz2
-d346c2fb8ae4f88bd9b8ec530e783a4824bc63efd25c2f04ab8ea3bef2214987dae00946dc4152aa89a626852dd99ac2cf60932d6a96851390e6f68923471d22 linux-headers-2.6.23.1-m68knommu.tar.bz2
-fca58282124ed1cf19e2cc8adcf2a45e75614cf0ba7fb25eb5b31c30a581b5c568236579f6dc1535b4aec92ab9bac627a014120ac807b8cc54b9babf57bbd105 linux-headers-2.6.23.1-mips.tar.bz2
-1e64989ce33eba084f6a612c2d798bae070b8dd42ef5cf4cf127a9c28645082b3d170026aa03de48ed0bbfd99942c38e6e28e3c58756b254ae960c9b6b13a9b5 linux-headers-2.6.23.1-powerpc.tar.bz2
-10866bdeb68084c072726154b39c99fa6023d812eee5b04834dcbab52580564612e08d001996e76afff6abba723c75183f308be86dd68c7efc29e4d2ea571df8 linux-headers-2.6.23.1-s390.tar.bz2
-0d5096700f61f37dfdbe9f1bf4f604328e990d3c17335ffce8847817fd2d5d6e3caa71a571a92018e79ec0a227119c98b3265f11ad44f81d53ebf30acaa4fa5a linux-headers-2.6.23.1-sh.tar.bz2
-7ecdfe64d6bf9b889b00d9d4c5d814437095bc0604880baf7ffa3f8864954a32b385cfe683f7714a6512a762fa506f745dfc2a1bf2a21785985505b9cc41fc00 linux-headers-2.6.23.1-sh64.tar.bz2
-5e398a9ccf5b19ce2ea910002e9ac4d054c90b5b7cb54edab97634da0f34002056e1d1b0dd02cc623557b32422fae286905bb60be327d5e4912e75b00e10660d linux-headers-2.6.23.1-sparc.tar.bz2
-d7e04e212ad1dc0605bf5d77cde8d150d0961c8a72c012bf9679115af993d857a9760a3ad54f207c4126dd4228882b60d553095cb59a00c390339b36dba9c4a3 linux-headers-2.6.23.1-sparc64.tar.bz2
-84f55b4f6ba6bbd119e4fb0a2e98dc8158728c22f2f47bc84a253081c0e2bc4999a62eac8a886a3e322b1bb21a567ccc7638eb0a3388b65a565a9a9a450ff01a linux-headers-2.6.23.1-v850.tar.bz2
-122eba0147cbd1e6eb6dedc3701d7118851e192a8d6189bbb95ed1822b637239b99abe80322368c1039e747d1129f0571014557b2d4775bc94f024a58991353f linux-headers-2.6.23.1-x86_64.tar.bz2
-5862ef23a6afd66c3d8e4b82360fbbe61c569e1c858b6a4520eed13317936a5c97fdc284a831d508a245b0757cdcb8baa919abf473754b104827547d67b39db8 linux-headers-2.6.23.1-xtensa.tar.bz2