pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2008Q1]: pkgsrc Pullup ticket #2436 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/6d86ccaa01e7
branches: pkgsrc-2008Q1
changeset: 540438:6d86ccaa01e7
user: tron <tron%pkgsrc.org@localhost>
date: Sat Jun 28 11:54:07 2008 +0000
description:
Pullup ticket #2436 - requested by taca
Security update for ruby packages
Apply patches to update Ruby to version 1.8.6 patchlevel 230 to fix
the security vulnerability reported in CVE-2008-2726.
diffstat:
devel/ruby-curses/distinfo | 8 +-
devel/ruby-readline/distinfo | 9 +--
lang/ruby/rubyversion.mk | 4 +-
lang/ruby18-base/distinfo | 17 ++++--
lang/ruby18-base/patches/patch-aa | 14 ++--
lang/ruby18-base/patches/patch-ab | 22 ++++++--
lang/ruby18-base/patches/patch-ad | 6 +-
lang/ruby18-base/patches/patch-de | 27 +++++++++++
lang/ruby18-base/patches/patch-df | 94 +++++++++++++++++++++++++++++++++++++++
lang/ruby18-base/patches/patch-dg | 26 ++++++++++
x11/ruby-tk/distinfo | 8 +-
11 files changed, 196 insertions(+), 39 deletions(-)
diffs (truncated from 357 to 300 lines):
diff -r 0574bab4e154 -r 6d86ccaa01e7 devel/ruby-curses/distinfo
--- a/devel/ruby-curses/distinfo Thu Jun 26 19:45:34 2008 +0000
+++ b/devel/ruby-curses/distinfo Sat Jun 28 11:54:07 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2008/03/13 21:55:48 jlam Exp $
+$NetBSD: distinfo,v 1.13.2.1 2008/06/28 11:54:07 tron Exp $
-SHA1 (ruby-1.8.6-p114.tar.bz2) = 9929782935ebb77d040593a010b8d65b03ce6e23
-RMD160 (ruby-1.8.6-p114.tar.bz2) = 332d6e98ef79ad8175ce699ed5293407763f769f
-Size (ruby-1.8.6-p114.tar.bz2) = 3920921 bytes
+SHA1 (ruby-1.8.6-p230.tar.bz2) = c630222fd6b4272db84f54e68879f81e2014cd51
+RMD160 (ruby-1.8.6-p230.tar.bz2) = cdf3ea33c3fd2258c685aea634aca7e9624036ec
+Size (ruby-1.8.6-p230.tar.bz2) = 3948498 bytes
SHA1 (patch-aa) = 5e5dcea99e02716e42a428a2d01769c5709f0f45
diff -r 0574bab4e154 -r 6d86ccaa01e7 devel/ruby-readline/distinfo
--- a/devel/ruby-readline/distinfo Thu Jun 26 19:45:34 2008 +0000
+++ b/devel/ruby-readline/distinfo Sat Jun 28 11:54:07 2008 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2008/03/09 13:31:18 taca Exp $
+$NetBSD: distinfo,v 1.20.2.1 2008/06/28 11:54:07 tron Exp $
-SHA1 (ruby-1.8.6-p114.tar.bz2) = 9929782935ebb77d040593a010b8d65b03ce6e23
-RMD160 (ruby-1.8.6-p114.tar.bz2) = 332d6e98ef79ad8175ce699ed5293407763f769f
-Size (ruby-1.8.6-p114.tar.bz2) = 3920921 bytes
-SHA1 (patch-aa) = 3fa6c4454e05e75b3fb82b53736ef7ba5f54529f
+SHA1 (ruby-1.8.6-p230.tar.bz2) = c630222fd6b4272db84f54e68879f81e2014cd51
+RMD160 (ruby-1.8.6-p230.tar.bz2) = cdf3ea33c3fd2258c685aea634aca7e9624036ec
+Size (ruby-1.8.6-p230.tar.bz2) = 3948498 bytes
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu Jun 26 19:45:34 2008 +0000
+++ b/lang/ruby/rubyversion.mk Sat Jun 28 11:54:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.39 2008/03/21 15:07:28 jlam Exp $
+# $NetBSD: rubyversion.mk,v 1.39.2.1 2008/06/28 11:54:07 tron Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -10,7 +10,7 @@
RUBY18_VERSION= 1.8.6
# patch
-RUBY18_PATCHLEVEL= 114
+RUBY18_PATCHLEVEL= 230
# RUBY_VERSION_DEFAULT defines default version for Ruby related
# packages and user can define in mk.conf. (1.6 or 1.8)
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/distinfo
--- a/lang/ruby18-base/distinfo Thu Jun 26 19:45:34 2008 +0000
+++ b/lang/ruby18-base/distinfo Sat Jun 28 11:54:07 2008 +0000
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.26 2008/03/09 13:31:18 taca Exp $
+$NetBSD: distinfo,v 1.26.2.1 2008/06/28 11:54:07 tron Exp $
-SHA1 (ruby-1.8.6-p114.tar.bz2) = 9929782935ebb77d040593a010b8d65b03ce6e23
-RMD160 (ruby-1.8.6-p114.tar.bz2) = 332d6e98ef79ad8175ce699ed5293407763f769f
-Size (ruby-1.8.6-p114.tar.bz2) = 3920921 bytes
-SHA1 (patch-aa) = eb218253249d7fc8fe32c5d1ad00f355714861f9
-SHA1 (patch-ab) = 973e36950d5b497c7283b928153e9f0ae9fe023e
+SHA1 (ruby-1.8.6-p230.tar.bz2) = c630222fd6b4272db84f54e68879f81e2014cd51
+RMD160 (ruby-1.8.6-p230.tar.bz2) = cdf3ea33c3fd2258c685aea634aca7e9624036ec
+Size (ruby-1.8.6-p230.tar.bz2) = 3948498 bytes
+SHA1 (patch-aa) = 8e9f456ef2180ef31208a82a89e25173046c8f71
+SHA1 (patch-ab) = 32384a64f5ddaa66501ab8cb74ca19870120ee26
SHA1 (patch-ac) = eb4dd068729ba2a2c7d4d659f6bcdb1410227f3b
-SHA1 (patch-ad) = f58380acbde2cd346b622b1a547a2840c61cee1f
+SHA1 (patch-ad) = 0fb90a6280afca04d881bb94963ceb7542c6212d
+SHA1 (patch-de) = 716dadc9042f81fe16a183fe03b2a63ec2598212
+SHA1 (patch-df) = 0ea1f97ad998361172f78d5cb0e1d0a5f1501b24
+SHA1 (patch-dg) = e79566ded3c82e63357966e961d7dcdfb84a03cf
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/patches/patch-aa
--- a/lang/ruby18-base/patches/patch-aa Thu Jun 26 19:45:34 2008 +0000
+++ b/lang/ruby18-base/patches/patch-aa Sat Jun 28 11:54:07 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2007/09/24 21:58:28 taca Exp $
+$NetBSD: patch-aa,v 1.10.6.1 2008/06/28 11:54:07 tron Exp $
---- configure.in.orig 2007-09-07 16:38:51.000000000 +0900
+--- configure.in.orig 2008-06-17 22:19:21.000000000 +0900
+++ configure.in
-@@ -421,6 +421,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
+@@ -423,6 +423,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
;;
bsdi*) LIBS="-lm $LIBS"
ac_cv_sizeof_rlim_t=8;;
@@ -12,7 +12,7 @@
freebsd*) LIBS="-lm $LIBS"
AC_CACHE_CHECK([whether -lxpg4 has to be linked],
rb_cv_lib_xpg4_needed,
-@@ -1026,6 +1029,13 @@ if test "$with_dln_a_out" != yes; then
+@@ -1066,6 +1069,13 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@@ -25,8 +25,8 @@
+ rb_cv_dlopen=yes ;;
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
- LIBPATHFLAG=" -L'%1\$-s'"
-@@ -1376,6 +1386,14 @@ if test "$enable_shared" = 'yes'; then
+ LIBPATHFLAG=" -L%1\$-s"
+@@ -1416,6 +1426,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@@ -41,7 +41,7 @@
interix*)
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
-@@ -1385,6 +1403,7 @@ if test "$enable_shared" = 'yes'; then
+@@ -1425,6 +1443,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/patches/patch-ab
--- a/lang/ruby18-base/patches/patch-ab Thu Jun 26 19:45:34 2008 +0000
+++ b/lang/ruby18-base/patches/patch-ab Sat Jun 28 11:54:07 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2007/09/24 21:58:28 taca Exp $
+$NetBSD: patch-ab,v 1.10.6.1 2008/06/28 11:54:07 tron Exp $
---- configure.orig 2007-09-23 15:19:34.000000000 +0900
+--- configure.orig 2008-06-20 18:31:19.000000000 +0900
+++ configure
-@@ -10351,6 +10351,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
+@@ -10353,6 +10353,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
;;
bsdi*) LIBS="-lm $LIBS"
ac_cv_sizeof_rlim_t=8;;
@@ -12,7 +12,7 @@
freebsd*) LIBS="-lm $LIBS"
{ echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; }
-@@ -15953,6 +15956,13 @@ echo $ECHO_N "checking whether OS depend
+@@ -16423,6 +16426,13 @@ echo $ECHO_N "checking whether OS depend
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@@ -25,8 +25,8 @@
+ rb_cv_dlopen=yes ;;
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
- LIBPATHFLAG=" -L'%1\$-s'"
-@@ -16708,6 +16718,14 @@ if test "$enable_shared" = 'yes'; then
+ LIBPATHFLAG=" -L%1\$-s"
+@@ -17177,6 +17187,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@@ -41,7 +41,7 @@
interix*)
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
-@@ -16717,6 +16735,7 @@ if test "$enable_shared" = 'yes'; then
+@@ -17186,6 +17204,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
@@ -49,3 +49,11 @@
fi
LDFLAGS="-L. $LDFLAGS"
+@@ -17529,6 +17548,7 @@ else
+ tr -d '\015' < confdefs.h > config.h
+ fi
+ tr -d '\015' < largefile.h > confdefs.h
++rm -f largefile.h
+
+ ac_config_files="$ac_config_files $FIRSTMAKEFILE"
+
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/patches/patch-ad
--- a/lang/ruby18-base/patches/patch-ad Thu Jun 26 19:45:34 2008 +0000
+++ b/lang/ruby18-base/patches/patch-ad Sat Jun 28 11:54:07 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2007/10/02 15:59:23 taca Exp $
+$NetBSD: patch-ad,v 1.7.6.1 2008/06/28 11:54:07 tron Exp $
---- eval.c.orig 2007-09-23 09:01:50.000000000 +0900
+--- eval.c.orig 2008-06-16 15:43:48.000000000 +0900
+++ eval.c
-@@ -11944,7 +11944,9 @@ rb_thread_start_0(fn, arg, th)
+@@ -11962,7 +11962,9 @@ rb_thread_start_0(fn, arg, th)
#ifdef _THREAD_SAFE
pthread_create(&time_thread, 0, thread_timer, 0);
time_thread_alive_p = 1;
diff -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/patches/patch-de
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/patches/patch-de Sat Jun 28 11:54:07 2008 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-de,v 1.2.2.2 2008/06/28 11:59:46 tron Exp $
+
+--- ext/openssl/openssl_missing.c.orig 2007-02-13 08:01:19.000000000 +0900
++++ ext/openssl/openssl_missing.c
+@@ -22,17 +22,15 @@
+ #include "openssl_missing.h"
+
+ #if !defined(HAVE_HMAC_CTX_COPY)
+-int
++void
+ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
+ {
+- if (!out || !in) return 0;
++ if (!out || !in) return;
+ memcpy(out, in, sizeof(HMAC_CTX));
+
+- if (!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))
+- 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 -r 0574bab4e154 -r 6d86ccaa01e7 lang/ruby18-base/patches/patch-df
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/patches/patch-df Sat Jun 28 11:54:07 2008 +0000
@@ -0,0 +1,94 @@
+$NetBSD: patch-df,v 1.2.2.2 2008/06/28 11:59:46 tron Exp $
+
+--- ext/openssl/openssl_missing.h.orig 2007-02-13 08:01:19.000000000 +0900
++++ ext/openssl/openssl_missing.h
+@@ -56,14 +56,33 @@ extern "C" {
+ (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);
+@@ -107,19 +126,54 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *
+ #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)
Home |
Main Index |
Thread Index |
Old Index