From c8e8511b535f3c8e9c8ac0688231d3812295c23f Mon Sep 17 00:00:00 2001 From: sibel Date: Sun, 2 May 2010 08:38:48 +0200 Subject: Maj de ruby#1.9.1-p378 --- extra/ruby/.footprint | 18 ++++- extra/ruby/.md5sum | 3 +- extra/ruby/Pkgfile | 6 +- extra/ruby/openssl-1.0.patch | 176 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 198 insertions(+), 5 deletions(-) create mode 100644 extra/ruby/openssl-1.0.patch diff --git a/extra/ruby/.footprint b/extra/ruby/.footprint index d3218fbde..23810f5db 100644 --- a/extra/ruby/.footprint +++ b/extra/ruby/.footprint @@ -1337,6 +1337,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/Bignum/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%2f-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%3c%3c-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%3c%3d%3e-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%3d%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%3e%3e-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Bignum/%5b%5d-i.yaml @@ -1508,8 +1509,10 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/CSV/Table/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/parse_headers-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/parse_line-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/puts-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/raw_encoding-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/read-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/read-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/read_io-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/read_to_char-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/readline-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/CSV/readlines-c.yaml @@ -2541,6 +2544,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/Fixnum/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3c%3d%3e-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3c%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3c-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3d%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3e%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Fixnum/%3e%3e-i.yaml @@ -2596,6 +2600,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/Float/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3c%3d%3e-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3c%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3c-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3d%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3e%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Float/%3e-i.yaml @@ -3002,7 +3007,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Fork/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Fork/execute-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Help/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Help/cdesc-Help.yaml --rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Help/execute-c.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/Help/execute-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/IrbCommand/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/IrbCommand/cdesc-IrbCommand.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/ExtendCommand/IrbCommand/execute-i.yaml @@ -3073,9 +3078,9 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/History/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/History/size-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/cdesc-HistorySavingAbility.yaml --rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/create_finalizer-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/extended-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/load_history-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/HistorySavingAbility/save_history-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/InputCompletor/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/InputCompletor/cdesc-InputCompletor.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/InputCompletor/select_message-c.yaml @@ -3234,6 +3239,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/IRB/WorkSpace/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/initialize_tracer-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/irb-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/irb_abort-c.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/irb_at_exit-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/irb_exit-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/load_modules-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/IRB/parse_opts-c.yaml @@ -9336,6 +9342,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/RubyLex/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/identify_number-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/identify_quotation-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/identify_string-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/identify_string_dvar-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/initialize_input-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/lex-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/RubyLex/lex_init-i.yaml @@ -9690,6 +9697,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/String/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%2b-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%3c%3c-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%3c%3d%3e-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%3d%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%3d%7e-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/String/%5b%5d%3d-i.yaml @@ -9957,6 +9965,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/Struct/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/Struct/yaml_tag_class_name-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Struct/yaml_tag_read_class-c.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/Symbol/ +-rw-r--r-- root/root usr/share/ri/1.9.1/system/Symbol/%3d%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Symbol/%3d%3d-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Symbol/all_symbols-c.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/Symbol/cdesc-Symbol.yaml @@ -10485,6 +10494,7 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/ drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/AccessLogError/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/AccessLogError/cdesc-AccessLogError.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/cdesc-AccessLog.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/escape-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/format-i.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/AccessLog/setup_params-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/BasicLog/ @@ -10807,6 +10817,10 @@ drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/ServerError/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/ServerError/cdesc-ServerError.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/cdesc-Status.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/code-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/new-c.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/reason_phrase-i.yaml +-rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Status/to_i-i.yaml drwxr-xr-x root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Success/ -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/Success/cdesc-Success.yaml -rw-r--r-- root/root usr/share/ri/1.9.1/system/WEBrick/HTTPStatus/cdesc-HTTPStatus.yaml diff --git a/extra/ruby/.md5sum b/extra/ruby/.md5sum index 77846d8c0..9cb5940e1 100644 --- a/extra/ruby/.md5sum +++ b/extra/ruby/.md5sum @@ -1 +1,2 @@ -515bfd965814e718c0943abf3dde5494 ruby-1.9.1-p243.tar.gz +e22ebf0dbe836f5344682bc5da83dcb5 openssl-1.0.patch +9fc5941bda150ac0a33b299e1e53654c ruby-1.9.1-p378.tar.gz diff --git a/extra/ruby/Pkgfile b/extra/ruby/Pkgfile index 3745c358a..20b0fa80d 100644 --- a/extra/ruby/Pkgfile +++ b/extra/ruby/Pkgfile @@ -6,12 +6,14 @@ name=ruby version=1.9.1 -_version=1.9.1-p243 +_version=1.9.1-p378 release=1 -source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/$name-$_version.tar.gz) +source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/$name-$_version.tar.gz \ + openssl-1.0.patch) build() { cd $name-$_version + patch -p1 -i $SRC/openssl-1.0.patch ./configure --prefix=/usr \ --enable-shared \ --enable-pthread diff --git a/extra/ruby/openssl-1.0.patch b/extra/ruby/openssl-1.0.patch new file mode 100644 index 000000000..22842231d --- /dev/null +++ b/extra/ruby/openssl-1.0.patch @@ -0,0 +1,176 @@ +diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl.c ruby-1.9.1-p378/ext/openssl/ossl.c +--- ruby-1.9.1-p378.orig/ext/openssl/ossl.c 2009-01-15 16:39:30.000000000 +0100 ++++ ruby-1.9.1-p378/ext/openssl/ossl.c 2010-04-01 07:41:19.397603813 +0200 +@@ -92,7 +92,7 @@ + + #define OSSL_IMPL_SK2ARY(name, type) \ + VALUE \ +-ossl_##name##_sk2ary(STACK *sk) \ ++ossl_##name##_sk2ary(STACK_OF(type) *sk) \ + { \ + type *t; \ + int i, num; \ +@@ -102,7 +102,7 @@ + OSSL_Debug("empty sk!"); \ + return Qnil; \ + } \ +- num = sk_num(sk); \ ++ num = sk_##type##_num(sk); \ + if (num < 0) { \ + OSSL_Debug("items in sk < -1???"); \ + return rb_ary_new(); \ +@@ -110,7 +110,7 @@ + ary = rb_ary_new2(num); \ + \ + for (i=0; id.sign->cert; +- crls = pkcs7->d.sign->crl; + break; + case NID_pkcs7_signedAndEnveloped: + certs = pkcs7->d.signed_and_enveloped->cert; ++ break; ++ default: ++ certs = NULL; ++ } ++ ++ return certs; ++} ++ ++static STACK_OF(X509_CRL) * ++pkcs7_get_crls(VALUE self) ++{ ++ PKCS7 *pkcs7; ++ STACK_OF(X509_CRL) *crls; ++ int i; ++ ++ GetPKCS7(self, pkcs7); ++ i = OBJ_obj2nid(pkcs7->type); ++ switch(i){ ++ case NID_pkcs7_signed: ++ crls = pkcs7->d.sign->crl; ++ break; ++ case NID_pkcs7_signedAndEnveloped: + crls = pkcs7->d.signed_and_enveloped->crl; + break; + default: +- certs = crls = NULL; ++ crls = NULL; + } + +- return want_certs ? certs : crls; ++ return crls; + } + + static VALUE +@@ -610,7 +630,7 @@ + STACK_OF(X509) *certs; + X509 *cert; + +- certs = pkcs7_get_certs_or_crls(self, 1); ++ certs = pkcs7_get_certs(self); + while((cert = sk_X509_pop(certs))) X509_free(cert); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); + +@@ -620,7 +640,7 @@ + static VALUE + ossl_pkcs7_get_certificates(VALUE self) + { +- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); ++ return ossl_x509_sk2ary(pkcs7_get_certs(self)); + } + + static VALUE +@@ -650,7 +670,7 @@ + STACK_OF(X509_CRL) *crls; + X509_CRL *crl; + +- crls = pkcs7_get_certs_or_crls(self, 0); ++ crls = pkcs7_get_crls(self); + while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); + +@@ -660,7 +680,7 @@ + static VALUE + ossl_pkcs7_get_crls(VALUE self) + { +- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); ++ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); + } + + static VALUE +diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c ruby-1.9.1-p378/ext/openssl/ossl_ssl.c +--- ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c 2009-04-19 15:32:18.000000000 +0200 ++++ ruby-1.9.1-p378/ext/openssl/ossl_ssl.c 2010-04-01 07:41:19.450937427 +0200 +@@ -88,12 +88,18 @@ + + ID ID_callback_state; + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define OSSL_MORE_CONST const ++#define STACK _STACK ++#else ++#define OSSL_MORE_CONST ++#endif + /* + * SSLContext class + */ + struct { + const char *name; +- SSL_METHOD *(*func)(void); ++ OSSL_MORE_CONST SSL_METHOD *(*func)(void); + } ossl_ssl_method_tab[] = { + #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } + OSSL_SSL_METHOD_ENTRY(TLSv1), +@@ -142,7 +148,7 @@ + static VALUE + ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method) + { +- SSL_METHOD *method = NULL; ++ OSSL_MORE_CONST SSL_METHOD *method = NULL; + const char *s; + int i; + +@@ -585,7 +591,7 @@ + } + + static VALUE +-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher) ++ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher) + { + VALUE ary; + int bits, alg_bits; +@@ -1213,7 +1219,7 @@ + ossl_ssl_get_cipher(VALUE self) + { + SSL *ssl; +- SSL_CIPHER *cipher; ++ OSSL_MORE_CONST SSL_CIPHER *cipher; + + Data_Get_Struct(self, SSL, ssl); + if (!ssl) { -- cgit v1.2.3-54-g00ecf