[pkgsrc/pkgsrc-2015Q1]: pkgsrc/lang Pullup ticket #4685 - requested by taca

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2015Q1]: pkgsrc/lang Pullup ticket #4685 - requested by taca
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:38:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b1fafe96d72
branches:  pkgsrc-2015Q1
changeset: 649196:1b1fafe96d72
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Apr 26 08:36:34 2015 +0000

description:
Pullup ticket #4685 - requested by taca
lang/ruby21-base: security update

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.140
- lang/ruby21-base/PLIST                                        1.6
- lang/ruby21-base/distinfo                                     1.14-1.15
- lang/ruby21-base/patches/patch-configure                      1.3
- lang/ruby21-base/patches/patch-lib_rdoc_text.rb               deleted
- lang/ruby21/Makefile                                          1.3

---
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Fri Apr  3 09:02:24 UTC 2015

   Modified Files:
        pkgsrc/lang/ruby21-base: distinfo
        pkgsrc/lang/ruby21-base/patches: patch-configure

   Log Message:
   Disable CPU detection on Darwin, the result for 32-bit (i486) is incompatible
   with pkgsrc MACHINE_ARCH (i386).  Fixes 32-bit build, no change for 64-bit.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Apr 19 16:19:00 UTC 2015

   Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby21-base: PLIST distinfo
   Removed Files:
        pkgsrc/lang/ruby21-base/patches: patch-lib_rdoc_text.rb

   Log Message:
   Update ruby21-base and ruby21 packages to 2.1.6.

   >From release announce:

   Ruby 2.1.6 has been released.

   This release includes a security fix for OpenSSL extension. Please view the
   topic below for more details.

       CVE-2015-1855: Ruby OpenSSL Hostname Verification

   And, many bug fixes are also included. See tickets and ChangeLog for details.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Apr 19 16:20:42 UTC 2015

   Modified Files:
        pkgsrc/lang/ruby21: Makefile

   Log Message:
   Reset PKGREVISION.

diffstat:

 lang/ruby/rubyversion.mk                        |   6 ++--
 lang/ruby21-base/PLIST                          |   9 ++++---
 lang/ruby21-base/distinfo                       |  11 ++++----
 lang/ruby21-base/patches/patch-configure        |  31 ++++++++++++++++--------
 lang/ruby21-base/patches/patch-lib_rdoc_text.rb |  20 ----------------
 lang/ruby21/Makefile                            |   3 +-
 6 files changed, 34 insertions(+), 46 deletions(-)

diffs (225 lines):

diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sun Apr 26 08:26:15 2015 +0000
+++ b/lang/ruby/rubyversion.mk  Sun Apr 26 08:36:34 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.138.2.1 2015/04/26 08:26:15 tron Exp $
+# $NetBSD: rubyversion.mk,v 1.138.2.2 2015/04/26 08:36:34 tron Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -229,14 +229,14 @@
 RUBY18_VERSION=                1.8.7
 RUBY193_VERSION=       1.9.3
 RUBY200_VERSION=       2.0.0
-RUBY21_VERSION=                2.1.5
+RUBY21_VERSION=                2.1.6
 RUBY22_VERSION=                2.2.1
 
 # patch
 RUBY18_PATCHLEVEL=     pl374
 RUBY193_PATCHLEVEL=    p551
 RUBY200_PATCHLEVEL=    p645
-#RUBY21_PATCHLEVEL=    p273
+#RUBY21_PATCHLEVEL=    p336
 #RUBY22_PATCHLEVEL=    p85
 
 # current API compatible version; used for version of shared library
diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby21-base/PLIST
--- a/lang/ruby21-base/PLIST    Sun Apr 26 08:26:15 2015 +0000
+++ b/lang/ruby21-base/PLIST    Sun Apr 26 08:36:34 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/01/02 07:32:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2015/04/26 08:36:34 tron Exp $
 bin/erb${RUBY_SUFFIX}
 bin/gem${RUBY_SUFFIX}
 bin/irb${RUBY_SUFFIX}
@@ -712,6 +712,7 @@
 ${RUBY_LIB}/rubygems/spec_fetcher.rb
 ${RUBY_LIB}/rubygems/specification.rb
 ${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
+${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
 ${RUBY_LIB}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
 ${RUBY_LIB}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
 ${RUBY_LIB}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
@@ -922,15 +923,15 @@
 ${GEM_HOME}/gems/rake-10.1.0/bin/rake
 ${GEM_HOME}/gems/rdoc-4.1.0/bin/rdoc
 ${GEM_HOME}/gems/rdoc-4.1.0/bin/ri
-${GEM_HOME}/gems/test-unit-2.1.5.0/bin/testrb
+${GEM_HOME}/gems/test-unit-2.1.6.0/bin/testrb
 ${GEM_HOME}/specifications/default/bigdecimal-1.2.4.gemspec
-${GEM_HOME}/specifications/default/io-console-0.4.2.gemspec
+${GEM_HOME}/specifications/default/io-console-0.4.3.gemspec
 ${GEM_HOME}/specifications/default/json-1.8.1.gemspec
 ${GEM_HOME}/specifications/default/minitest-4.7.5.gemspec
 ${GEM_HOME}/specifications/default/psych-2.0.5.gemspec
 ${GEM_HOME}/specifications/default/rake-10.1.0.gemspec
 ${GEM_HOME}/specifications/default/rdoc-4.1.0.gemspec
-${GEM_HOME}/specifications/default/test-unit-2.1.5.0.gemspec
+${GEM_HOME}/specifications/default/test-unit-2.1.6.0.gemspec
 man/man1/erb${RUBY_SUFFIX}.1
 man/man1/irb${RUBY_SUFFIX}.1
 man/man1/rake${RUBY_SUFFIX}.1
diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby21-base/distinfo
--- a/lang/ruby21-base/distinfo Sun Apr 26 08:26:15 2015 +0000
+++ b/lang/ruby21-base/distinfo Sun Apr 26 08:36:34 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2015/03/08 15:08:33 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2015/04/26 08:36:34 tron Exp $
 
-SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5
-RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda
-Size (ruby-2.1.5.tar.bz2) = 11994454 bytes
-SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a
+SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4
+RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43
+Size (ruby-2.1.6.tar.bz2) = 12011651 bytes
+SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5
 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
 SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
@@ -16,7 +16,6 @@
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
 SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
-SHA1 (patch-lib_rdoc_text.rb) = 71be8fa7620483e43ddf00001f44bc6c5ccb75ee
 SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
 SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970
diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby21-base/patches/patch-configure
--- a/lang/ruby21-base/patches/patch-configure  Sun Apr 26 08:26:15 2015 +0000
+++ b/lang/ruby21-base/patches/patch-configure  Sun Apr 26 08:36:34 2015 +0000
@@ -1,11 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
+$NetBSD: patch-configure,v 1.2.8.1 2015/04/26 08:36:34 tron Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig     2014-05-08 15:52:19.000000000 +0000
+--- configure.orig     2014-11-13 13:38:30.000000000 +0000
 +++ configure
-@@ -8571,6 +8571,10 @@ esac
+@@ -5271,7 +5271,7 @@ esac
+ else
+     if test x"$target_alias" = x; then
+       case "$target_os" in #(
+-  darwin*) :
++  notdarwin*) :
+ 
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ $as_echo_n "checking for real target cpu... " >&6; }
+@@ -8631,6 +8631,10 @@ esac
                ac_cv_func_isinf=yes
                ac_cv_func_isnan=yes
                 ;; #(
@@ -16,7 +25,7 @@
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -16204,6 +16208,8 @@ else
+@@ -16323,6 +16327,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -25,7 +34,7 @@
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -20007,7 +20013,9 @@ esac ;; #(
+@@ -20040,7 +20046,9 @@ esac ;; #(
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -35,7 +44,7 @@
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -21008,7 +21016,7 @@ esac
+@@ -21041,7 +21049,7 @@ esac
    freebsd*|dragonfly*) :
  
        SOLIBS='$(LIBS)'
@@ -44,7 +53,7 @@
        if test "$rb_cv_binary_elf" != "yes" ; then
            LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
            LIBRUBY_ALIASES=''
-@@ -21087,7 +21095,12 @@ esac
+@@ -21120,7 +21128,12 @@ esac
         ;; #(
    interix*) :
  
@@ -58,7 +67,7 @@
         ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -21245,7 +21258,7 @@ esac
+@@ -21278,7 +21291,7 @@ esac
  esac
  if test "$enable_rpath" = yes; then
      test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
@@ -67,7 +76,7 @@
      test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
      LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-@@ -21421,11 +21434,7 @@ if test "$install_doc" != no; then
+@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then
      else
        RDOCTARGET="nodoc"
      fi
@@ -80,7 +89,7 @@
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -22010,7 +22019,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
+@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
  elif test -z "${ruby_version}"; then
      as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
  else
@@ -89,7 +98,7 @@
  fi
  
  
-@@ -23516,17 +23525,7 @@ which seems to be undefined.  Please mak
+@@ -23686,17 +23695,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {
diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby21-base/patches/patch-lib_rdoc_text.rb
--- a/lang/ruby21-base/patches/patch-lib_rdoc_text.rb   Sun Apr 26 08:26:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-lib_rdoc_text.rb,v 1.1 2015/03/08 15:08:33 taca Exp $
-
-* Get rid of infitite loop with '\r' only in text (from changest r49223).
-
---- lib/rdoc/text.rb.orig      2013-09-18 23:33:36.000000000 +0000
-+++ lib/rdoc/text.rb
-@@ -68,11 +68,11 @@ module RDoc::Text
-     expanded = []
- 
-     text.each_line do |line|
--      line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
-+      nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
-         r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
-         r.force_encoding text.encoding if Object.const_defined? :Encoding
-         r
--      end until line !~ /\t/
-+      end
- 
-       expanded << line
-     end
diff -r 431db38b66da -r 1b1fafe96d72 lang/ruby21/Makefile
--- a/lang/ruby21/Makefile      Sun Apr 26 08:26:15 2015 +0000
+++ b/lang/ruby21/Makefile      Sun Apr 26 08:36:34 2015 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2015/03/08 16:23:02 taca Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2015/04/26 08:36:34 tron Exp $
 #
 
 DISTNAME=      # empty
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION_FULL}
-PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  # empty
 DISTFILES=     # empty
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/nspr Update to 4.9.3.2 (really 4.9.2)
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/cppcheck to 1.60.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/nspr Update to 4.9.3.2 (really 4.9.2)
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/cppcheck to 1.60.1
Indexes:
Home | Main Index | Thread Index | Old Index