summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2013-02-06 15:48:30 +0000
committertaca <taca@pkgsrc.org>2013-02-06 15:48:30 +0000
commita7d1bc22adc16a7a2d8392c01394b1b658af3684 (patch)
treed2893b29de7ee4ae0424f8b790af97d914d5639b
parent16f9671f82ad6b0b65c0269cf35e4d721f9fa130 (diff)
downloadpkgsrc-a7d1bc22adc16a7a2d8392c01394b1b658af3684.tar.gz
Update ruby193 pacakges to 1.9.3p385.
This release includes a security fix about bundled RDoc. Full changes are too may to write here, please refer ChangeLog.
-rw-r--r--lang/ruby/rubyversion.mk4
-rw-r--r--lang/ruby193-base/Makefile3
-rw-r--r--lang/ruby193-base/PLIST8
-rw-r--r--lang/ruby193-base/distinfo10
-rw-r--r--lang/ruby193-base/patches/patch-configure93
5 files changed, 59 insertions, 59 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 77f51959a71..05518f26408 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.93 2013/01/31 15:56:13 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.94 2013/02/06 15:48:30 taca Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -206,7 +206,7 @@ RUBY193_VERSION= 1.9.3
# patch
RUBY18_PATCHLEVEL= pl371
-RUBY193_PATCHLEVEL= p374
+RUBY193_PATCHLEVEL= p385
# current API compatible version; used for version of shared library
RUBY18_API_VERSION= 1.8.7
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 650949fedf3..77b6905b8e4 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2013/02/02 08:11:53 taca Exp $
+# $NetBSD: Makefile,v 1.23 2013/02/06 15:48:31 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION= 1
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
diff --git a/lang/ruby193-base/PLIST b/lang/ruby193-base/PLIST
index edd39d020aa..1281be5a227 100644
--- a/lang/ruby193-base/PLIST
+++ b/lang/ruby193-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/01/31 15:56:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/02/06 15:48:31 taca Exp $
bin/erb${RUBY_VER}
bin/gem${RUBY_VER}
bin/irb${RUBY_VER}
@@ -770,14 +770,14 @@ ${RUBY_ARCHLIB}/syck.${RUBY_DLEXT}
${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT}
${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
${GEM_HOME}/gems/rake-0.9.2.2/bin/rake${RUBY_VER}
-${GEM_HOME}/gems/rdoc-3.9.4/bin/rdoc${RUBY_VER}
-${GEM_HOME}/gems/rdoc-3.9.4/bin/ri${RUBY_VER}
+${GEM_HOME}/gems/rdoc-3.9.5/bin/rdoc${RUBY_VER}
+${GEM_HOME}/gems/rdoc-3.9.5/bin/ri${RUBY_VER}
${GEM_HOME}/specifications/bigdecimal-1.1.0.gemspec
${GEM_HOME}/specifications/io-console-0.3.gemspec
${GEM_HOME}/specifications/json-1.5.4.gemspec
${GEM_HOME}/specifications/minitest-2.5.1.gemspec
${GEM_HOME}/specifications/rake-0.9.2.2.gemspec
-${GEM_HOME}/specifications/rdoc-3.9.4.gemspec
+${GEM_HOME}/specifications/rdoc-3.9.5.gemspec
man/man1/erb${RUBY_VER}.1
man/man1/irb${RUBY_VER}.1
man/man1/rake${RUBY_VER}.1
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index eadaee0cd20..5b5495b94ef 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2013/02/02 08:11:53 taca Exp $
+$NetBSD: distinfo,v 1.16 2013/02/06 15:48:31 taca Exp $
-SHA1 (ruby-1.9.3-p374.tar.bz2) = fde7f6d286fcb27135d29963f04f5d0e066195f7
-RMD160 (ruby-1.9.3-p374.tar.bz2) = bb3beabef451d958a27a743aa138ce6704d5cab1
-Size (ruby-1.9.3-p374.tar.bz2) = 10017658 bytes
-SHA1 (patch-configure) = 01575dd71bb555cde7241a13c588a01a6bd65c3d
+SHA1 (ruby-1.9.3-p385.tar.bz2) = 54e8d08103e915e2b07dcfcea88ab7fc42d40b0a
+RMD160 (ruby-1.9.3-p385.tar.bz2) = b2fbe56de1295659aa54c0a2d9f77a1212f62a02
+Size (ruby-1.9.3-p385.tar.bz2) = 10021486 bytes
+SHA1 (patch-configure) = e72a5414a9e706962692e645173c5b47ddb41932
SHA1 (patch-configure.in) = 0996411e3125a298c770f4eead0edbc530a0a584
SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index d22c6955d28..b6758e4607f 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,73 +1,74 @@
-$NetBSD: patch-configure,v 1.5 2013/01/31 15:56:14 taca Exp $
+$NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
* Adding Interix and MirBSD support.
* Ignore doxygen.
---- configure.orig 2013-01-17 04:57:31.000000000 +0000
+--- configure.orig 2013-02-06 13:17:31.000000000 +0000
+++ configure
-@@ -20419,6 +20419,9 @@ _ACEOF
- ;;
- superux*) ac_cv_func_setitimer=no
- ;;
-+ interix*) LIBS="-lm $LIBS"
+@@ -10722,6 +10722,10 @@ esac
+ superux*) :
+ ac_cv_func_setitimer=no
+ ;; #(
++ interix*) :
++ LIBS="-lm $LIBS"
+ ac_cv_func_getpgrp_void=yes
+ ;;
- *) LIBS="-lm $LIBS" ;;
+ *) :
+ LIBS="-lm $LIBS" ;;
esac
-
-@@ -37835,7 +37838,7 @@ done
- root) : ;;
- c_r) MAINLIBS="-pthread $MAINLIBS" ;;
- *) case "$target_os" in
-- openbsd*) LIBS="-pthread $LIBS" ;;
-+ openbsd*|mirbsd*) LIBS="-pthread $LIBS" ;;
- *) LIBS="-l$pthread_lib $LIBS" ;;
- esac
- ;;
-@@ -38856,8 +38859,12 @@ esac
- fi
- rb_cv_dlopen=yes ;;
- interix*) : ${LDSHARED='$(CC) -shared'}
+@@ -15784,7 +15788,7 @@ done
+ MAINLIBS="-pthread $MAINLIBS" ;; #(
+ *) :
+ case "$target_os" in #(
+- openbsd*) :
++ openbsd*|mirbsd*) :
+ LIBS="-pthread $LIBS" ;; #(
+ *) :
+ LIBS="-l$pthread_lib $LIBS" ;;
+@@ -16233,8 +16237,12 @@ esac ;; #(
+ rb_cv_dlopen=yes ;; #(
+ interix*) :
+ : ${LDSHARED='$(CC) -shared'}
+ LDFLAGS="$LDFLAGS -Wl,-E"
XLDFLAGS="$XLDFLAGS -Wl,-E"
+ # use special random-slot linkage in 0x[56]XXXXXXX
LIBPATHFLAG=" -L%1\$-s"
+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
+ RPATHFLAG=' -Wl,-R%1$-s'
- rb_cv_dlopen=yes ;;
- freebsd*|dragonfly*)
- : ${LDSHARED='$(CC) -shared'}
-@@ -38868,7 +38875,7 @@ esac
+ rb_cv_dlopen=yes ;; #(
+ freebsd*|dragonfly*) :
+
+@@ -16246,7 +16254,7 @@ esac ;; #(
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
- rb_cv_dlopen=yes ;;
-- openbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
-+ openbsd*|mirbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+ rb_cv_dlopen=yes ;; #(
+- openbsd*) :
++ openbsd*|mirbsd*) :
+ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
- fi
-@@ -39463,7 +39470,7 @@ _ACEOF
- ;;
- freebsd*|dragonfly*)
+@@ -16775,7 +16783,7 @@ _ACEOF
+ freebsd*|dragonfly*) :
+
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -39479,7 +39486,7 @@ _ACEOF
+@@ -16792,7 +16800,7 @@ _ACEOF
LIBRUBY_ALIASES=""
fi
- ;;
-- openbsd*)
-+ openbsd*|mirbsd*)
+ ;; #(
+- openbsd*) :
++ openbsd*|mirbsd*) :
+
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- ;;
-@@ -39531,7 +39538,12 @@ esac
- LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
- ;;
- interix*)
+@@ -16853,7 +16861,12 @@ esac
+ ;; #(
+ interix*) :
+
- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+ SOLIBS='$(LIBS)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -75,10 +76,10 @@ $NetBSD: patch-configure,v 1.5 2013/01/31 15:56:14 taca Exp $
+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
- ;;
- esac
-
-@@ -39593,11 +39605,7 @@ if test "$install_doc" != no; then
+ ;; #(
+ *) :
+ ;;
+@@ -16916,11 +16929,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi