pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Update ruby193-base to 1.9.3p286.
details: https://anonhg.NetBSD.org/pkgsrc/rev/70d4df2bbd73
branches: trunk
changeset: 609884:70d4df2bbd73
user: taca <taca%pkgsrc.org@localhost>
date: Fri Oct 12 14:51:31 2012 +0000
description:
Update ruby193-base to 1.9.3p286.
Ruby 1.9.3-p286 is released.
This release includes some security fixes, and other many bug fixes.
* $SAFE escaping vulnerability about Exception#to_s / NameError#to_s
(CVE-2012-4464, CVE-2012-4466)
* Unintentional file creation caused by inserting a illegal NUL character
* other many bug fixes.
See ticktes and ChangeLog for details.
Changelog: http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_286/ChangeLog
tickets: https://bugs.ruby-lang.org/projects/ruby-193/issues?set_filter=1&status_id=5
diffstat:
lang/ruby/rubyversion.mk | 4 +-
lang/ruby193-base/Makefile | 15 ++++-----
lang/ruby193-base/PLIST | 5 +--
lang/ruby193-base/distinfo | 14 ++++-----
lang/ruby193-base/patches/patch-configure | 40 +++++++--------------------
lang/ruby193-base/patches/patch-configure.in | 31 +++++++--------------
lang/ruby193-base/patches/patch-error.c | 36 -------------------------
lang/ruby193-base/patches/patch-lib_mkmf.rb | 18 ------------
8 files changed, 38 insertions(+), 125 deletions(-)
diffs (truncated from 372 to 300 lines):
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby/rubyversion.mk Fri Oct 12 14:51:31 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.89 2012/10/03 23:48:00 cheusov Exp $
+# $NetBSD: rubyversion.mk,v 1.90 2012/10/12 14:51:31 taca Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -206,7 +206,7 @@
# patch
RUBY18_PATCHLEVEL= pl370
-RUBY193_PATCHLEVEL= p194
+RUBY193_PATCHLEVEL= p286
# current API compatible version; used for version of shared library
RUBY18_API_VERSION= 1.8.7
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby193-base/Makefile
--- a/lang/ruby193-base/Makefile Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby193-base/Makefile Fri Oct 12 14:51:31 2012 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 16:20:35 taca Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/12 14:51:31 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION= 3
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
-DIST_SUBDIR= ruby193-base-201202170
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
@@ -72,11 +70,12 @@
.include "../../lang/ruby/rubyversion.mk"
.if !empty(RUBY_SUFFIX)
-CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX}
-CONFIGURE_ARGS+= --with-soname=${RUBY_NAME}
-CONFIGURE_ARGS+= --with-sitedir=${PREFIX}/${RUBY_SITELIB_BASE}
-CONFIGURE_ARGS+= --with-vendordir=${PREFIX}/${RUBY_VENDORLIB_BASE}
-CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VERSION}
+CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX}
+CONFIGURE_ARGS+= --with-soname=${RUBY_NAME}
+CONFIGURE_ARGS+= --with-sitedir=${PREFIX}/${RUBY_SITELIB_BASE}
+CONFIGURE_ARGS+= --with-vendordir=${PREFIX}/${RUBY_VENDORLIB_BASE}
+CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VERSION}
+CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
.endif
#
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby193-base/PLIST
--- a/lang/ruby193-base/PLIST Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby193-base/PLIST Fri Oct 12 14:51:31 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/04/22 08:17:16 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/12 14:51:31 taca Exp $
bin/erb${RUBY_VER}
bin/gem${RUBY_VER}
bin/irb${RUBY_VER}
@@ -564,9 +564,6 @@
${RUBY_LIB}/rubygems/source_index.rb
${RUBY_LIB}/rubygems/spec_fetcher.rb
${RUBY_LIB}/rubygems/specification.rb
-${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
-${RUBY_LIB}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
-${RUBY_LIB}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
${RUBY_LIB}/rubygems/ssl_certs/ca-bundle.pem
${RUBY_LIB}/rubygems/syck_hack.rb
${RUBY_LIB}/rubygems/test_case.rb
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby193-base/distinfo
--- a/lang/ruby193-base/distinfo Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby193-base/distinfo Fri Oct 12 14:51:31 2012 +0000
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.10 2012/10/06 16:27:53 taca Exp $
+$NetBSD: distinfo,v 1.11 2012/10/12 14:51:31 taca Exp $
-SHA1 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = afb497dc10ea3d83ecbe3ccd9ed45fba1457721c
-RMD160 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = bca45d750cfd8523e838903c8693749652960d60
-Size (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = 9841223 bytes
-SHA1 (patch-configure) = 3ab88504dda0c244b6c58dc42778d9a63f1e4d23
-SHA1 (patch-configure.in) = f743324dda92bd4c490a7214f4822b4cc9a4c5dc
+SHA1 (ruby-1.9.3-p286.tar.bz2) = 095c783c88965c6e72b1f3484c50c60207b60bfa
+RMD160 (ruby-1.9.3-p286.tar.bz2) = 5ca0dbc1f2d046954f0ce20af76a01ece78cd3f2
+Size (ruby-1.9.3-p286.tar.bz2) = 9961862 bytes
+SHA1 (patch-configure) = 7bb0cfd69781bf1a66378fe3b2f8a40a1235cc15
+SHA1 (patch-configure.in) = 0c6cb3a7ebe50111fd0a506b18e3a45a516ec751
SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
-SHA1 (patch-error.c) = c825fc775fa28acfd9f965d2d801389e3ea42922
-SHA1 (patch-lib_mkmf.rb) = a4547a4bcbf1f533e264578c455ef1c7e6c9aa74
SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6
SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby193-base/patches/patch-configure
--- a/lang/ruby193-base/patches/patch-configure Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby193-base/patches/patch-configure Fri Oct 12 14:51:31 2012 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.3 2012/07/25 14:26:57 bsiegert Exp $
+$NetBSD: patch-configure,v 1.4 2012/10/12 14:51:31 taca Exp $
* Adding Interix and MirBSD support.
* Ignore doxygen.
---- configure.orig Fri Apr 20 01:32:41 2012
+--- configure.orig 2012-10-12 09:23:46.000000000 +0000
+++ configure
-@@ -10605,6 +10605,9 @@ esac
+@@ -10654,6 +10654,9 @@ esac
superux*) :
ac_cv_func_setitimer=no
;; #(
@@ -15,7 +15,7 @@
*) :
LIBS="-lm $LIBS" ;;
esac
-@@ -11923,6 +11926,9 @@ fi
+@@ -11980,6 +11983,9 @@ fi
ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
#include <time.h>
#endif
@@ -25,7 +25,7 @@
"
if test "x$ac_cv_type_struct_timespec" = xyes; then :
-@@ -15731,7 +15737,7 @@ done
+@@ -15790,7 +15796,7 @@ done
MAINLIBS="-pthread $MAINLIBS" ;; #(
*) :
case "$target_os" in #(
@@ -34,7 +34,7 @@
LIBS="-pthread $LIBS" ;; #(
*) :
LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16180,8 +16186,12 @@ esac ;; #(
+@@ -16239,8 +16245,12 @@ esac ;; #(
rb_cv_dlopen=yes ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
@@ -47,7 +47,7 @@
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -16193,7 +16203,7 @@ esac ;; #(
+@@ -16252,7 +16262,7 @@ esac ;; #(
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;; #(
@@ -56,7 +56,7 @@
: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16707,7 +16717,7 @@ case "$enable_shared" in #(
+@@ -16781,7 +16791,7 @@ _ACEOF
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
@@ -65,7 +65,7 @@
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -16724,7 +16734,7 @@ case "$enable_shared" in #(
+@@ -16798,7 +16808,7 @@ _ACEOF
LIBRUBY_ALIASES=""
fi
;; #(
@@ -74,7 +74,7 @@
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16785,7 +16795,12 @@ esac
+@@ -16859,7 +16869,12 @@ esac
;; #(
interix*) :
@@ -88,7 +88,7 @@
;; #(
*) :
;;
-@@ -16848,11 +16863,7 @@ if test "$install_doc" != no; then
+@@ -16922,11 +16937,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -101,21 +101,3 @@
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
-@@ -17752,7 +17763,7 @@ ac_config_files="$ac_config_files $FIRST
- ac_config_files="$ac_config_files Makefile"
-
-
--ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"
-+ruby_pc="${RUBY_BASE_NAME}-${RUBY_PROGRAM_VERSION}.pc"
-
- exec=exec
-
-@@ -18409,6 +18420,8 @@ do
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ : Avoid regenerating within pkgsrc
-+ exit 0
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
diff -r 007f09c21343 -r 70d4df2bbd73 lang/ruby193-base/patches/patch-configure.in
--- a/lang/ruby193-base/patches/patch-configure.in Fri Oct 12 14:36:29 2012 +0000
+++ b/lang/ruby193-base/patches/patch-configure.in Fri Oct 12 14:51:31 2012 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.in,v 1.3 2012/07/25 14:26:57 bsiegert Exp $
+$NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $
* Adding Interix and MirBSD support.
* Ignore doxygen.
---- configure.in.orig Wed Apr 18 14:08:40 2012
+--- configure.in.orig 2012-10-12 07:24:42.000000000 +0000
+++ configure.in
-@@ -1119,6 +1119,8 @@ main()
+@@ -1120,6 +1120,8 @@ main()
],
[superux*], [ ac_cv_func_setitimer=no
],
@@ -14,7 +14,7 @@
[ LIBS="-lm $LIBS"])
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
-@@ -1185,6 +1187,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
+@@ -1186,6 +1188,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
@%:@include <time.h>
@@ -24,7 +24,7 @@
@%:@endif])
AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@@ -1834,7 +1839,7 @@ if test x"$enable_pthread" = xyes; then
+@@ -1835,7 +1840,7 @@ if test x"$enable_pthread" = xyes; then
[root], [],
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
[AS_CASE(["$target_os"],
@@ -33,7 +33,7 @@
[LIBS="-l$pthread_lib $LIBS"])])
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-@@ -2065,7 +2070,9 @@ if test "$with_dln_a_out" != yes; then
+@@ -2066,7 +2071,9 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes],
[interix*], [ : ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -43,7 +43,7 @@
rb_cv_dlopen=yes],
[freebsd*|dragonfly*], [
: ${LDSHARED='$(CC) -shared'}
-@@ -2076,7 +2083,7 @@ if test "$with_dln_a_out" != yes; then
+@@ -2077,7 +2084,7 @@ if test "$with_dln_a_out" != yes; then
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes],
@@ -52,7 +52,7 @@
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
-@@ -2368,7 +2375,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2376,7 +2383,7 @@ AS_CASE("$enable_shared", [yes], [
],
[freebsd*|dragonfly*], [
SOLIBS='$(LIBS)'
@@ -61,7 +61,7 @@
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -2384,7 +2391,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2392,7 +2399,7 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES=""
fi
],
@@ -70,7 +70,7 @@
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
],
-@@ -2434,7 +2441,12 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2442,7 +2449,12 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
],
[interix*], [
@@ -84,7 +84,7 @@
])
], [
LIBRUBYARG_SHARED=
-@@ -2479,11 +2491,7 @@ if test "$install_doc" != no; then
+@@ -2487,11 +2499,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
@@ -97,12 +97,3 @@
else
RDOCTARGET="nodoc"
Home |
Main Index |
Thread Index |
Old Index