From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../files/disable_wide_getaddrinfo_check.patch | 16 +++ recipes/ruby/files/extmk_run.patch | 15 ++ recipes/ruby/files/openssl.patch | 156 +++++++++++++++++++++ recipes/ruby/ruby-native_1.8.5.bb | 2 + recipes/ruby/ruby.inc | 26 ++++ recipes/ruby/ruby_1.8.5.bb | 8 ++ 6 files changed, 223 insertions(+) create mode 100644 recipes/ruby/files/disable_wide_getaddrinfo_check.patch create mode 100644 recipes/ruby/files/extmk_run.patch create mode 100644 recipes/ruby/files/openssl.patch create mode 100644 recipes/ruby/ruby-native_1.8.5.bb create mode 100644 recipes/ruby/ruby.inc create mode 100644 recipes/ruby/ruby_1.8.5.bb (limited to 'recipes/ruby') diff --git a/recipes/ruby/files/disable_wide_getaddrinfo_check.patch b/recipes/ruby/files/disable_wide_getaddrinfo_check.patch new file mode 100644 index 0000000000..82137896b9 --- /dev/null +++ b/recipes/ruby/files/disable_wide_getaddrinfo_check.patch @@ -0,0 +1,16 @@ +--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 ++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 +@@ -0,0 +1,13 @@ ++--- ruby-1.8.5/ext/socket/extconf.rb.orig 2006-12-30 15:12:31.000000000 +1100 +++++ ruby-1.8.5/ext/socket/extconf.rb 2006-12-30 15:16:24.000000000 +1100 ++@@ -216,6 +216,10 @@ ++ } ++ EOF ++ end +++# Ignore the actual result of the above test and assume that +++# everything is OK. +++getaddr_info_ok = true +++ ++ if ipv6 and not getaddr_info_ok ++ abort <md_ctx, &in->md_ctx) +- || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx) +- || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx)) +- return 0; +- return 1; ++ EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx); ++ EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx); ++ EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx); + } + #endif /* HAVE_HMAC_CTX_COPY */ + #endif /* NO_HMAC */ +diff -u ruby-1.8.5.orig/ext/openssl/openssl_missing.h ruby-1.8.5/ext/openssl/openssl_missing.h +--- ruby-1.8.5.orig/ext/openssl/openssl_missing.h 2008-08-04 06:43:34.000000000 +0200 ++++ ruby-1.8.5/ext/openssl/openssl_missing.h 2008-08-04 06:44:17.000000000 +0200 +@@ -60,14 +60,33 @@ + (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri) + #endif + ++#if !defined(HAVE_EVP_MD_CTX_INIT) + void HMAC_CTX_init(HMAC_CTX *ctx); +-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); ++#endif ++ ++#if !defined(HAVE_HMAC_CTX_COPY) ++void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); ++#endif ++ ++#if !defined(HAVE_HMAC_CTX_CLEANUP) + void HMAC_CTX_cleanup(HMAC_CTX *ctx); ++#endif + ++#if !defined(HAVE_EVP_MD_CTX_CREATE) + EVP_MD_CTX *EVP_MD_CTX_create(void); ++#endif ++ ++#if !defined(HAVE_EVP_MD_CTX_INIT) + void EVP_MD_CTX_init(EVP_MD_CTX *ctx); ++#endif ++ ++#if !defined(HAVE_EVP_MD_CTX_CLEANUP) + int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); ++#endif ++ ++#if !defined(HAVE_EVP_MD_CTX_DESTROY) + void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); ++#endif + + #if !defined(HAVE_EVP_CIPHER_CTX_COPY) + int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in); +@@ -111,19 +130,54 @@ + #define OPENSSL_cleanse(p, l) memset(p, 0, l) + #endif + ++#if !defined(HAVE_X509_STORE_SET_EX_DATA) + void *X509_STORE_get_ex_data(X509_STORE *str, int idx); + int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); ++#endif ++ ++#if !defined(HAVE_X509_CRL_SET_VERSION) + int X509_CRL_set_version(X509_CRL *x, long version); ++#endif ++ ++#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME) + int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name); ++#endif ++ ++#if !defined(HAVE_X509_CRL_SORT) + int X509_CRL_sort(X509_CRL *c); ++#endif ++ ++#if !defined(HAVE_X509_CRL_ADD0_REVOKED) + int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev); ++#endif ++ ++#if !defined(HAVE_BN_MOD_SQR) + int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); ++#endif ++ ++#if !defined(HAVE_BN_MOD_ADD) + int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); ++#endif ++ ++#if !defined(HAVE_BN_MOD_SUB) + int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); ++#endif ++ ++#if !defined(HAVE_BN_RAND_RANGE) + int BN_rand_range(BIGNUM *r, BIGNUM *range); ++#endif ++ ++#if !defined(HAVE_BN_PSEUDO_RAND_RANGE) + int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range); ++#endif ++ ++#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE) + char *CONF_get1_default_config_file(void); ++#endif ++ ++#if !defined(HAVE_PEM_DEF_CALLBACK) + int PEM_def_callback(char *buf, int num, int w, void *key); ++#endif + + #if defined(__cplusplus) + } +diff -u ruby-1.8.5.orig/ext/openssl/ossl_hmac.c ruby-1.8.5/ext/openssl/ossl_hmac.c +--- ruby-1.8.5.orig/ext/openssl/ossl_hmac.c 2007-03-12 05:12:32.000000000 +0100 ++++ ruby-1.8.5/ext/openssl/ossl_hmac.c 2008-05-19 05:00:52.000000000 +0200 +@@ -81,12 +87,15 @@ + GetHMAC(self, ctx1); + SafeGetHMAC(other, ctx2); + +- if (!HMAC_CTX_copy(ctx1, ctx2)) { +- ossl_raise(eHMACError, NULL); +- } ++ HMAC_CTX_copy(ctx1, ctx2); + return self; + } + ++/* ++ * call-seq: ++ * hmac.update(string) -> self ++ * ++ */ + static VALUE + ossl_hmac_update(VALUE self, VALUE data) + { +@@ -104,9 +113,7 @@ + { + HMAC_CTX final; + +- if (!HMAC_CTX_copy(&final, ctx)) { +- ossl_raise(eHMACError, NULL); +- } ++ HMAC_CTX_copy(&final, ctx); + if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) { + HMAC_CTX_cleanup(&final); + OSSL_Debug("Allocating %d mem", HMAC_size(&final)); diff --git a/recipes/ruby/ruby-native_1.8.5.bb b/recipes/ruby/ruby-native_1.8.5.bb new file mode 100644 index 0000000000..e4d2a3361e --- /dev/null +++ b/recipes/ruby/ruby-native_1.8.5.bb @@ -0,0 +1,2 @@ +require ruby.inc +inherit native diff --git a/recipes/ruby/ruby.inc b/recipes/ruby/ruby.inc new file mode 100644 index 0000000000..978bf4b229 --- /dev/null +++ b/recipes/ruby/ruby.inc @@ -0,0 +1,26 @@ +DESCRIPTION = "Ruby is an interpreted scripting language \ +for quick and easy object-oriented programming." +SECTION = "devel/ruby" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ + file://extmk_run.patch;patch=1 \ + file://openssl.patch;patch=1 \ + file://disable_wide_getaddrinfo_check.patch;patch=1" + +S = "${WORKDIR}/ruby-${PV}" + +inherit autotools + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { + sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk + rm -rf ${S}/ruby/ +} diff --git a/recipes/ruby/ruby_1.8.5.bb b/recipes/ruby/ruby_1.8.5.bb new file mode 100644 index 0000000000..6260614772 --- /dev/null +++ b/recipes/ruby/ruby_1.8.5.bb @@ -0,0 +1,8 @@ +require ruby.inc +DEPENDS = "ruby-native zlib openssl" + +PR = "r1" + +FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \ + ${libdir}/ruby/1.8/*/*/.debug" + -- cgit v1.2.3