From daf1fa6b12d36fb59d411de33b868caa20ad281d Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Fri, 21 Nov 2008 18:51:58 +0000 Subject: Upgraded curl, openssl, and class-dump. git-svn-id: http://svn.telesphoreo.org/trunk@510 514c082c-b64e-11dc-b46d-3d985efe055d --- data/class-dump/_metadata/depiction | 1 + data/class-dump/_metadata/version | 2 +- data/class-dump/class-dump-3.1.2-x-1.0.1.tar.bz2 | Bin 0 -> 1929501 bytes data/class-dump/class-dump-3.1.2-x.tar.bz2 | Bin 2157825 -> 0 bytes data/class-dump/classname.diff | 11 ---------- data/class-dump/format.diff | 12 ----------- data/class-dump/null.diff | 25 ----------------------- data/curl/_metadata/version | 2 +- data/curl/curl-7.17.1.tar.gz | Bin 2225788 -> 0 bytes data/curl/curl-7.19.0.tar.bz2 | Bin 0 -> 2125703 bytes data/openssl/_metadata/version | 2 +- data/openssl/darwin.diff | 13 ------------ data/openssl/iphoneos.diff | 15 ++++++++++++++ data/openssl/mbstring.diff | 12 +++++++++++ data/openssl/openssl-0.9.8g.tar.gz | Bin 3354792 -> 0 bytes data/openssl/openssl-0.9.8h.tar.gz | Bin 0 -> 3439981 bytes 16 files changed, 31 insertions(+), 64 deletions(-) create mode 100644 data/class-dump/_metadata/depiction create mode 100644 data/class-dump/class-dump-3.1.2-x-1.0.1.tar.bz2 delete mode 100644 data/class-dump/class-dump-3.1.2-x.tar.bz2 delete mode 100644 data/class-dump/classname.diff delete mode 100644 data/class-dump/format.diff delete mode 100644 data/class-dump/null.diff delete mode 100644 data/curl/curl-7.17.1.tar.gz create mode 100644 data/curl/curl-7.19.0.tar.bz2 delete mode 100644 data/openssl/darwin.diff create mode 100644 data/openssl/iphoneos.diff create mode 100644 data/openssl/mbstring.diff delete mode 100644 data/openssl/openssl-0.9.8g.tar.gz create mode 100644 data/openssl/openssl-0.9.8h.tar.gz (limited to 'data') diff --git a/data/class-dump/_metadata/depiction b/data/class-dump/_metadata/depiction new file mode 100644 index 000000000..297dc11eb --- /dev/null +++ b/data/class-dump/_metadata/depiction @@ -0,0 +1 @@ +http://cydia.saurik.com/info/class-dump/ diff --git a/data/class-dump/_metadata/version b/data/class-dump/_metadata/version index 035894776..cf5412e84 100644 --- a/data/class-dump/_metadata/version +++ b/data/class-dump/_metadata/version @@ -1 +1 @@ -3.1.2-x +3.1.2-x-1.0.1 diff --git a/data/class-dump/class-dump-3.1.2-x-1.0.1.tar.bz2 b/data/class-dump/class-dump-3.1.2-x-1.0.1.tar.bz2 new file mode 100644 index 000000000..5f41527d4 Binary files /dev/null and b/data/class-dump/class-dump-3.1.2-x-1.0.1.tar.bz2 differ diff --git a/data/class-dump/class-dump-3.1.2-x.tar.bz2 b/data/class-dump/class-dump-3.1.2-x.tar.bz2 deleted file mode 100644 index be1a3ac7f..000000000 Binary files a/data/class-dump/class-dump-3.1.2-x.tar.bz2 and /dev/null differ diff --git a/data/class-dump/classname.diff b/data/class-dump/classname.diff deleted file mode 100644 index dea8b3c44..000000000 --- a/data/class-dump/classname.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru class-dump-3.1.2-x/src/CDMultiFileVisitor.m class-dump-3.1.2-x+iPhone/src/CDMultiFileVisitor.m ---- class-dump-3.1.2-x/src/CDMultiFileVisitor.m 2007-11-02 09:46:37.000000000 +0000 -+++ class-dump-3.1.2-x+iPhone/src/CDMultiFileVisitor.m 2008-08-19 01:32:55.000000000 +0000 -@@ -10,6 +10,7 @@ - #import "CDOCClass.h" - #import "CDOCProtocol.h" - #import "CDOCIvar.h" -+#import "CDOCCategory.h" - - @implementation CDMultiFileVisitor - diff --git a/data/class-dump/format.diff b/data/class-dump/format.diff deleted file mode 100644 index 0070f3fde..000000000 --- a/data/class-dump/format.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru class-dump-3.1.2/src/CDClassDump.m class-dump-3.1.2+iPhone/src/CDClassDump.m ---- class-dump-3.1.2/src/CDClassDump.m 2008-04-20 13:16:43.000000000 +0000 -+++ class-dump-3.1.2+iPhone/src/CDClassDump.m 2007-11-05 18:14:56.000000000 +0000 -@@ -366,7 +366,7 @@ - if (preferredArchName == nil) { - [self setPreferredArchName:[aMachOFile archName]]; - } else if ([[aMachOFile archName] isEqual:preferredArchName] == NO) { -- fprintf(stderr, "class-dump: Mach-O file (%s) does not contain required cpu type: %@.\n", -+ fprintf(stderr, "class-dump: Mach-O file (%s) does not contain required cpu type: %s.\n", - [aFilename fileSystemRepresentation], [preferredArchName UTF8String]); - [aMachOFile release]; - return NO; diff --git a/data/class-dump/null.diff b/data/class-dump/null.diff deleted file mode 100644 index 1d8883282..000000000 --- a/data/class-dump/null.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru class-dump-3.1.2-x/src/CDObjCSegmentProcessor-Private.m class-dump-3.1.2-x+iPhone/src/CDObjCSegmentProcessor-Private.m ---- class-dump-3.1.2-x/src/CDObjCSegmentProcessor-Private.m 2008-04-20 04:27:18.000000000 +0000 -+++ class-dump-3.1.2-x+iPhone/src/CDObjCSegmentProcessor-Private.m 2008-09-02 16:27:14.000000000 +0000 -@@ -467,7 +467,9 @@ - - // Search super class in Symtab first. We just need a super class name only so we don't need to get - // detail information about super -- NSString * superName = [NSString stringWithString:[[machOFile symbolTable] findSymbolByValue:objcClass.super_class]]; -+ NSString * superName = [[machOFile symbolTable] findSymbolByValue:objcClass.super_class]; -+ if (superName != nil) -+ superName = [NSString stringWithString:superName]; - // ptr = [machOFile pointerFromVMAddr:objcClass.super_class]; - if ( superName != nil ) { - if ( [superName hasPrefix:@"_OBJC_CLASS_$_"] ) -@@ -928,7 +930,9 @@ - return nil; - - // class - We just need name -- NSString * class_name = [NSString stringWithString:[[machOFile symbolTable] findSymbolByValue:objcCategory.class]]; -+ NSString * class_name = [[machOFile symbolTable] findSymbolByValue:objcCategory.class]; -+ if (class_name != nil) -+ class_name = [NSString stringWithString:class_name]; - if ( class_name != nil ) { - if ( [class_name hasPrefix:@"_OBJC_CLASS_$_"] ) - class_name = [class_name substringFromIndex:14]; diff --git a/data/curl/_metadata/version b/data/curl/_metadata/version index 1f4c47dc0..3821090fd 100644 --- a/data/curl/_metadata/version +++ b/data/curl/_metadata/version @@ -1 +1 @@ -7.17.1 +7.19.0 diff --git a/data/curl/curl-7.17.1.tar.gz b/data/curl/curl-7.17.1.tar.gz deleted file mode 100644 index a40636577..000000000 Binary files a/data/curl/curl-7.17.1.tar.gz and /dev/null differ diff --git a/data/curl/curl-7.19.0.tar.bz2 b/data/curl/curl-7.19.0.tar.bz2 new file mode 100644 index 000000000..4627828d1 Binary files /dev/null and b/data/curl/curl-7.19.0.tar.bz2 differ diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version index c58f8bc67..ce797a9db 100644 --- a/data/openssl/_metadata/version +++ b/data/openssl/_metadata/version @@ -1 +1 @@ -0.9.8g +0.9.8h diff --git a/data/openssl/darwin.diff b/data/openssl/darwin.diff deleted file mode 100644 index b80aceee4..000000000 --- a/data/openssl/darwin.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru openssl-0.9.8g/Configure openssl-0.9.8g+iPhone/Configure ---- openssl-0.9.8g/Configure 2007-09-16 12:24:17.000000000 +0000 -+++ openssl-0.9.8g+iPhone/Configure 2007-12-30 04:04:20.000000000 +0000 -@@ -501,6 +501,9 @@ - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o:::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-arm-gcc","arm-apple-darwin-gcc:-arch arm -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin-ranlib", -+"darwin8-arm-gcc","arm-apple-darwin8-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin8-ranlib", -+"darwin9-arm-gcc","arm-apple-darwin9-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin9-ranlib", - "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/data/openssl/iphoneos.diff b/data/openssl/iphoneos.diff new file mode 100644 index 000000000..2b027d18a --- /dev/null +++ b/data/openssl/iphoneos.diff @@ -0,0 +1,15 @@ +diff -ru openssl-0.9.8h/Configure openssl-0.9.8h+iPhone/Configure +--- openssl-0.9.8h/Configure 2008-05-01 23:11:30.000000000 +0000 ++++ openssl-0.9.8h+iPhone/Configure 2008-09-13 07:14:52.000000000 +0000 +@@ -515,6 +515,11 @@ + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + ++##### iPhoneOS ++"darwin-arm-gcc","arm-apple-darwin-gcc:-arch arm -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin-ranlib", ++"darwin8-arm-gcc","arm-apple-darwin8-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin8-ranlib", ++"darwin9-arm-gcc","arm-apple-darwin9-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin9-ranlib", ++ + ##### A/UX + "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", + diff --git a/data/openssl/mbstring.diff b/data/openssl/mbstring.diff new file mode 100644 index 000000000..0336b0357 --- /dev/null +++ b/data/openssl/mbstring.diff @@ -0,0 +1,12 @@ +diff -ru openssl-0.9.8h/crypto/x509/x509_att.c openssl-0.9.8h+iPhone/crypto/x509/x509_att.c +--- openssl-0.9.8h/crypto/x509/x509_att.c 2008-04-02 11:11:51.000000000 +0000 ++++ openssl-0.9.8h+iPhone/crypto/x509/x509_att.c 2008-09-13 07:11:14.000000000 +0000 +@@ -303,7 +303,7 @@ + } + if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err; + if(!(ttmp = ASN1_TYPE_new())) goto err; +- if (len == -1) ++ if ((len == -1) && !(attrtype & MBSTRING_FLAG)) + { + if (!ASN1_TYPE_set1(ttmp, attrtype, data)) + goto err; diff --git a/data/openssl/openssl-0.9.8g.tar.gz b/data/openssl/openssl-0.9.8g.tar.gz deleted file mode 100644 index 14ac17618..000000000 Binary files a/data/openssl/openssl-0.9.8g.tar.gz and /dev/null differ diff --git a/data/openssl/openssl-0.9.8h.tar.gz b/data/openssl/openssl-0.9.8h.tar.gz new file mode 100644 index 000000000..12c7fc02d Binary files /dev/null and b/data/openssl/openssl-0.9.8h.tar.gz differ -- cgit v1.2.3