[pkgsrc/pkgsrc-2017Q4]: pkgsrc/lang/ruby23-base Pullup ticket #5706 - request...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0df0a0dfcbf1
branches:  pkgsrc-2017Q4
changeset: 373141:0df0a0dfcbf1
user:      spz <spz%pkgsrc.org@localhost>
date:      Fri Mar 02 20:35:49 2018 +0000

description:
Pullup ticket #5706 - requested by taca
lang/ruby23-base: security patch

Revisions pulled up:
- lang/ruby23-base/Makefile                                     1.12-1.13
- lang/ruby23-base/distinfo                                     1.12-1.15
- lang/ruby23-base/patches/patch-configure                      1.5-1.7

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Tue Jan 16 14:53:28 UTC 2018

   Modified Files:
        pkgsrc/lang/ruby22-base: distinfo
        pkgsrc/lang/ruby22-base/patches: patch-configure
        pkgsrc/lang/ruby23-base: distinfo
        pkgsrc/lang/ruby23-base/patches: patch-configure
        pkgsrc/lang/ruby24-base: distinfo
        pkgsrc/lang/ruby24-base/patches: patch-configure
        pkgsrc/lang/ruby25-base: distinfo
        pkgsrc/lang/ruby25-base/patches: patch-configure

   Log Message:
   ruby*-base: Don't add SSP flags, leave that to pkgsrc.


   To generate a diff of this commit:
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby23-base/distinfo
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby23-base/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Fri Jan 26 10:54:15 UTC 2018

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

   Log Message:
   ruby23-base: Don't add -std=iso9899:1999 to CPPFLAGS, invalid for C++.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby23-base/Makefile
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ruby23-base/distinfo
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby23-base/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Fri Jan 26 11:53:09 UTC 2018

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

   Log Message:
   ruby23-base: Change previous to set CFLAGS instead, ride revbump.


   To generate a diff of this commit:
   cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ruby23-base/distinfo
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby23-base/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon Feb 19 16:46:26 UTC 2018

   Modified Files:
        pkgsrc/lang/ruby23-base: Makefile distinfo

   Log Message:
   lang/ruby23-base: rubygem security fix

   Add an patch to fix security problem of rubygems.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ruby23-base/Makefile
   cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/ruby23-base/distinfo

diffstat:

 lang/ruby23-base/Makefile                |   7 ++++-
 lang/ruby23-base/distinfo                |   8 ++++-
 lang/ruby23-base/patches/patch-configure |  48 +++++++++++++++++++++++--------
 3 files changed, 47 insertions(+), 16 deletions(-)

diffs (177 lines):

diff -r 38ec79f47c7f -r 0df0a0dfcbf1 lang/ruby23-base/Makefile
--- a/lang/ruby23-base/Makefile Sat Feb 24 22:45:53 2018 +0000
+++ b/lang/ruby23-base/Makefile Fri Mar 02 20:35:49 2018 +0000
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2017/09/15 00:36:17 taca Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2018/03/02 20:35:49 spz Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
+PATCH_SITES=   https://bugs.ruby-lang.org/attachments/download/7029/
+PATCHFILES=    rubygems-276-for-ruby23.patch
+PATCH_DIST_STRIP=      -p0
+
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      ${RUBY_HOMEPAGE}
 COMMENT=       Ruby ${RUBY_VERSION} release minimum base package
diff -r 38ec79f47c7f -r 0df0a0dfcbf1 lang/ruby23-base/distinfo
--- a/lang/ruby23-base/distinfo Sat Feb 24 22:45:53 2018 +0000
+++ b/lang/ruby23-base/distinfo Fri Mar 02 20:35:49 2018 +0000
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.11 2017/12/15 03:19:29 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2018/03/02 20:35:49 spz Exp $
 
 SHA1 (ruby-2.3.6.tar.bz2) = 07c3b66d544dd22c22fbae3f16cfb3eeb88b7b1e
 RMD160 (ruby-2.3.6.tar.bz2) = 664e027a6f172212ac8ebff3aa9b99df4e99906b
 SHA512 (ruby-2.3.6.tar.bz2) = bc3c7a115745a38e44bd91eb5637b1e412011c471d9749db7960185ef75737b944dd0e524f22432809649952ca7d93f46d458990e9cd2b0db5ca8abf4bc8ea99
 Size (ruby-2.3.6.tar.bz2) = 14429114 bytes
-SHA1 (patch-configure) = dbe68752f6458052ff89cb403a194eb3bd668f33
+SHA1 (rubygems-276-for-ruby23.patch) = 859334e0313e522826b28c4878611f34c46b7526
+RMD160 (rubygems-276-for-ruby23.patch) = c4d7718b7e4845811bf54917ca185ac49c75d6b3
+SHA512 (rubygems-276-for-ruby23.patch) = b2b363bec953aa4cfd17bd501753a621b829d5052780f33c6d74d813f128f703a4dd59db53ac59860aed6f741fd1a77b1ef173523f0f8b49b91282e5c8181961
+Size (rubygems-276-for-ruby23.patch) = 19953 bytes
+SHA1 (patch-configure) = 3737bf52082288b02e7382d71a322f4822c5abe4
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e
diff -r 38ec79f47c7f -r 0df0a0dfcbf1 lang/ruby23-base/patches/patch-configure
--- a/lang/ruby23-base/patches/patch-configure  Sat Feb 24 22:45:53 2018 +0000
+++ b/lang/ruby23-base/patches/patch-configure  Fri Mar 02 20:35:49 2018 +0000
@@ -1,10 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2017/09/15 00:36:17 taca Exp $
+$NetBSD: patch-configure,v 1.4.6.1 2018/03/02 20:35:49 spz Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
+* Handle SSP in pkgsrc.
+* Don't add -std=iso9899:1999 to CPPFLAGS, invalid for C++.
 
---- configure.orig     2017-09-14 12:09:29.000000000 +0000
+--- configure.orig     2017-12-14 14:57:48.000000000 +0000
 +++ configure
 @@ -5678,7 +5678,7 @@ esac
  else
@@ -24,7 +26,27 @@
  case $RUBY_PATCHLEVEL in #(
    -*) :
      particular_werror_flags=yes ;; #(
-@@ -9319,6 +9321,10 @@ esac
+@@ -8024,6 +8026,7 @@ esac
+       stack_protector=no
+      ;; #(
+   *) :
++      stack_protector=no
+      ;;
+ esac
+     if test -z "${stack_protector+set}"; then
+@@ -9113,9 +9116,9 @@ rm -f core conftest.err conftest.$ac_obj
+   *" ${rb_opt} "*) :
+      ;; #(
+   '  ') :
+-     CPPFLAGS="${rb_opt}" ;; #(
++     CFLAGS="${rb_opt}" ;; #(
+   *) :
+-     CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
++     CFLAGS="$CFLAGS ${rb_opt}" ;;
+ esac
+       done
+                  ;; #(
+@@ -9319,6 +9322,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no
                 ;; #(
@@ -35,7 +57,7 @@
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -18065,6 +18071,8 @@ else
+@@ -18067,6 +18074,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -44,7 +66,7 @@
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -22561,7 +22569,9 @@ esac ;; #(
+@@ -22563,7 +22572,9 @@ esac ;; #(
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -54,7 +76,7 @@
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -23667,7 +23677,17 @@ esac
+@@ -23669,7 +23680,17 @@ esac
         ;; #(
    linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*) :
  
@@ -73,7 +95,7 @@
        LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
        if test "$load_relative" = yes; then
            libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
-@@ -23678,7 +23698,7 @@ esac
+@@ -23680,7 +23701,7 @@ esac
    freebsd*|dragonfly*) :
  
        SOLIBS='$(LIBS)'
@@ -82,7 +104,7 @@
        if test "$rb_cv_binary_elf" != "yes" ; then
            LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
            LIBRUBY_ALIASES=''
-@@ -23688,7 +23708,17 @@ esac
+@@ -23690,7 +23711,17 @@ esac
  
        SOLIBS='$(LIBS)'
        LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -101,7 +123,7 @@
        if test "$rb_cv_binary_elf" = yes; then # ELF platforms
           LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
        else    # a.out platforms
-@@ -23720,7 +23750,17 @@ esac
+@@ -23722,7 +23753,17 @@ esac
         ;; #(
    aix*) :
  
@@ -120,7 +142,7 @@
        LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
        SOLIBS='-lm -lc'
         ;; #(
-@@ -23747,7 +23787,12 @@ esac
+@@ -23749,7 +23790,12 @@ esac
         ;; #(
    interix*) :
  
@@ -134,7 +156,7 @@
         ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -23915,7 +23960,7 @@ if test "$enable_rpath" = yes; then
+@@ -23917,7 +23963,7 @@ if test "$enable_rpath" = yes; then
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -143,7 +165,7 @@
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -24306,11 +24351,7 @@ if test "$install_doc" != no; then
+@@ -24308,11 +24354,7 @@ if test "$install_doc" != no; then
      else
        RDOCTARGET="nodoc"
      fi
@@ -156,7 +178,7 @@
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -26329,17 +26370,7 @@ which seems to be undefined.  Please mak
+@@ -26331,17 +26373,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {