X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail-yw0-f54.google.com (mail-yw0-f54.google.com [209.85.213.54]) by lists.alpinelinux.org (Postfix) with ESMTP id 54ACA1EBFEF for ; Mon, 15 Nov 2010 17:28:49 +0000 (UTC) Received: by ywa8 with SMTP id 8so2689478ywa.13 for ; Mon, 15 Nov 2010 09:28:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=wk+Yt54z/y9KxplufaqVGhwU1lYhYylqK0uNSUDMZLM=; b=n267pDgF/znVS5xLkvI6nuTDEOE9kD8WyvH4XAEMxZNf7HDtgC63NNmmRiSLGh6+Bv NMwQpH/PaHExGdacPMAJ+1200NgsotyFuEqmuSnOISEtradksY2sJ8lauj/aOKSobua6 4AfVET8wcc+Z6mLo2s72izwaAd3siSwCHD81E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=I54gRulq9vuCiwPODJht3reNx9GpcenVYAPpN/d1yc+AsPqFWJ0Lz+J8Ufr8vJ5cCA pBEp9R4dPTIVrwy6LuPphp1iMlm47qvN2dFkT8a6XPniY7dW4/zvozR52erAK26OgUW/ roqQjs0FbqS+43N30vXwW1bNM/BaKdBwELc/U= Received: by 10.150.197.4 with SMTP id u4mr9868526ybf.123.1289842128824; Mon, 15 Nov 2010 09:28:48 -0800 (PST) Received: from localhost.localdomain (209.250.132.162.tor.pathcom.com [209.250.132.162]) by mx.google.com with ESMTPS id p38sm3069994ybk.4.2010.11.15.09.28.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Nov 2010 09:28:47 -0800 (PST) From: Jeff Bilyk To: alpine-devel@lists.alpinelinux.org Cc: Jeff Bilyk Subject: [alpine-devel] [PATCH] main/ruby: pkgbump to 1.8.7_p299 Date: Mon, 15 Nov 2010 11:28:30 +0000 Message-Id: <1289820510-7187-1-git-send-email-jbilyk@gmail.com> X-Mailer: git-send-email 1.7.3.2 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Bumped package to 1.8.7_p299 --- main/ruby/APKBUILD | 13 +-- main/ruby/ruby-openssl-1.0.0.patch | 167 ------------------------------------ 2 files changed, 5 insertions(+), 175 deletions(-) delete mode 100644 main/ruby/ruby-openssl-1.0.0.patch diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index a66b11e..4d91a60 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=ruby -pkgver=1.8.7_p174 -_pkgver=1.8.7-p174 -pkgrel=7 +pkgver=1.8.7_p299 +_pkgver=1.8.7-p299 +pkgrel=0 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/en/" license="Ruby" depends= makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev" subpackages="$pkgname-doc $pkgname-dev" -source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2 - ruby-openssl-1.0.0.patch" +source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2" # # maybe its a good idea to split dep libs to seperate pkg's. # @@ -19,7 +18,6 @@ source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2 _builddir="$srcdir/$pkgname-${_pkgver}" prepare() { cd "$_builddir" - patch -p0 -i "$srcdir"/ruby-openssl-1.0.0.patch } build() { @@ -54,5 +52,4 @@ package() { } -md5sums="88c45aaf627b4404e5e4273cb03ba2ee ruby-1.8.7-p174.tar.bz2 -3361f559a6b338b792ff4946a41708dd ruby-openssl-1.0.0.patch" +md5sums="244439a87d75ab24170a9c2b451ce351 ruby-1.8.7-p299.tar.bz2" diff --git a/main/ruby/ruby-openssl-1.0.0.patch b/main/ruby/ruby-openssl-1.0.0.patch deleted file mode 100644 index 1ebded9..0000000 --- a/main/ruby/ruby-openssl-1.0.0.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -up ext/openssl/ossl.c.ossl10 ext/openssl/ossl.c ---- ext/openssl/ossl.c.ossl10 2007-02-13 00:01:19.000000000 +0100 -+++ ext/openssl/ossl.c 2009-08-26 12:29:41.000000000 +0200 -@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) - - #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_##name##_sk2ary(STACK *sk) \ - 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 @@ ossl_##name##_sk2ary(STACK *sk) \ - 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 -@@ -581,7 +601,7 @@ ossl_pkcs7_set_certificates(VALUE self, - 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_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self); - -@@ -591,7 +611,7 @@ ossl_pkcs7_set_certificates(VALUE self, - 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 -@@ -621,7 +641,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar - 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_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self); - -@@ -631,7 +651,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar - 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 -up ext/openssl/ossl_ssl.c.ossl10 ext/openssl/ossl_ssl.c ---- ext/openssl/ossl_ssl.c.ossl10 2007-03-12 05:12:32.000000000 +0100 -+++ ext/openssl/ossl_ssl.c 2009-08-26 12:08:48.000000000 +0200 -@@ -89,12 +89,18 @@ static char *ossl_sslctx_attrs[] = { - static char *ossl_ssl_attr_readers[] = { "io", "context", }; - static char *ossl_ssl_attrs[] = { "sync_close", }; - -+#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), -@@ -407,7 +413,7 @@ ossl_sslctx_setup(VALUE self) - } - - 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; -@@ -805,7 +811,7 @@ static VALUE - 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) { \ No newline at end of file -- 1.7.3.2 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---