- dropped obsolete openssl patch

Changed files:
    ruby-openssl.patch -> 1.2
    ruby.spec -> 1.216

diff --git a/ruby-openssl.patch b/ruby-openssl.patch
deleted file mode 100644 (file)
index 2284223..0000000
--- a/ruby-openssl.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-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; i<num; i++) {                   \
--      t = (type *)sk_value(sk, i);            \
-+      t = sk_##type##_value(sk, i);           \
-       rb_ary_push(ary, ossl_##name##_new(t)); \
-     }                                         \
-     return ary;                                       \
-diff -Nura ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c
---- ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c      2008-07-22 17:34:23.000000000 +0200
-+++ ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c   2010-04-01 07:41:19.415105324 +0200
-@@ -572,12 +572,11 @@
-     return self;
- }
- 
--static STACK *
--pkcs7_get_certs_or_crls(VALUE self, int want_certs)
-+static STACK_OF(X509) *
-+pkcs7_get_certs(VALUE self)
- {
-     PKCS7 *pkcs7;
-     STACK_OF(X509) *certs;
--    STACK_OF(X509_CRL) *crls;
-     int i;
- 
-     GetPKCS7(self, pkcs7);
-@@ -585,17 +584,38 @@
-     switch(i){
-     case NID_pkcs7_signed:
-         certs = pkcs7->d.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) {

diff --git a/ruby.spec b/ruby.spec
index c23872e90a7a93d2e944f4d5f4a598fecf1cb640..662c5ccd0b31a0dc80ad50cc2237c46f13c4af81 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -31,7 +31,6 @@ Source4:      testrb.1
 Source5:       %{name}-mode-init.el
 Patch0:                %{name}-mkmf-shared.patch
 Patch1:                %{name}-lib64.patch
-#Patch2: %{name}-openssl.patch
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -203,7 +202,6 @@ Tryb Ruby i debugger dla Emacsa.
 %setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -387,12 +385,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rdoc.1*
 %{_mandir}/man1/ri.1*
 %{_mandir}/man1/testrb.1*
-%{ruby_archdir}/dl/callback.so
+%attr(755,root,root) %{ruby_archdir}/dl/callback.so
 %{_libdir}/ruby/gems/1.9/specifications/minitest.gemspec
 %{_libdir}/ruby/gems/1.9/specifications/rake.gemspec
 %{_libdir}/ruby/gems/1.9/specifications/rdoc.gemspec
 
-
 %files doc
 %defattr(644,root,root,755)
 %doc ruby-doc-bundle/*