CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/ruby22-base

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Fri Mar  2 20:37:47 UTC 2018

Modified Files:
        pkgsrc/lang/ruby22-base [pkgsrc-2017Q4]: Makefile distinfo
        pkgsrc/lang/ruby22-base/patches [pkgsrc-2017Q4]: patch-configure

Log Message:
Pullup ticket #5708 - requested by taca
lang/ruby22-base: security patch

Revisions pulled up:
- lang/ruby22-base/Makefile                                     1.20
- lang/ruby22-base/distinfo                                     1.22-1.23
- lang/ruby22-base/patches/patch-configure                      1.6

-------------------------------------------------------------------
   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.21 -r1.22 pkgsrc/lang/ruby22-base/distinfo
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby22-base/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon Feb 19 16:47:53 UTC 2018

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

   Log Message:
   lang/ruby22-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.19 -r1.20 pkgsrc/lang/ruby22-base/Makefile
   cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/ruby22-base/distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.6.1 pkgsrc/lang/ruby22-base/Makefile
cvs rdiff -u -r1.21 -r1.21.2.1 pkgsrc/lang/ruby22-base/distinfo
cvs rdiff -u -r1.5 -r1.5.6.1 pkgsrc/lang/ruby22-base/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby22-base/Makefile
diff -u pkgsrc/lang/ruby22-base/Makefile:1.19 pkgsrc/lang/ruby22-base/Makefile:1.19.6.1
--- pkgsrc/lang/ruby22-base/Makefile:1.19       Fri Sep 15 00:33:58 2017
+++ pkgsrc/lang/ruby22-base/Makefile    Fri Mar  2 20:37:47 2018
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2017/09/15 00:33:58 taca Exp $
+# $NetBSD: Makefile,v 1.19.6.1 2018/03/02 20:37:47 spz Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
+PATCH_SITES=   https://bugs.ruby-lang.org/attachments/download/7030/
+PATCHFILES=    rubygems-276-for-ruby22.patch
+PATCH_DIST_STRIP=      -p0
+
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      ${RUBY_HOMEPAGE}
 COMMENT=       Ruby ${RUBY_VERSION} release minimum base package

Index: pkgsrc/lang/ruby22-base/distinfo
diff -u pkgsrc/lang/ruby22-base/distinfo:1.21 pkgsrc/lang/ruby22-base/distinfo:1.21.2.1
--- pkgsrc/lang/ruby22-base/distinfo:1.21       Fri Dec 15 03:26:03 2017
+++ pkgsrc/lang/ruby22-base/distinfo    Fri Mar  2 20:37:47 2018
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.21 2017/12/15 03:26:03 taca Exp $
+$NetBSD: distinfo,v 1.21.2.1 2018/03/02 20:37:47 spz Exp $
 
 SHA1 (ruby-2.2.9.tar.bz2) = 773ba9b51bde612866f656c4531f59660e2b0087
 RMD160 (ruby-2.2.9.tar.bz2) = 0973ec6a23ec909af7dec7c7152ca0a4e79fe959
 SHA512 (ruby-2.2.9.tar.bz2) = 2a8c8770fda20a22b79c9115b6f468f8e7ea1092c84a5089af7a3122163e5ad298b493e6637e4d93ba02d899d8a619c94064dda8ac98cf3b93f64f45d5401085
 Size (ruby-2.2.9.tar.bz2) = 13371232 bytes
-SHA1 (patch-configure) = fda86ab23ec6291f3a51001793686904d4433b38
+SHA1 (rubygems-276-for-ruby22.patch) = a705fc2290c062aebc907fddb0f83e2589356371
+RMD160 (rubygems-276-for-ruby22.patch) = 6d694ea1f5e1bf70143a4ad6924547302db262ec
+SHA512 (rubygems-276-for-ruby22.patch) = dfe12d7d2744cc6034cecd330258943bc6ae2bfd363375e2250b913c242c49b204de561e3aa6c55cd827fbe6e487d4f4038f72ec73fcc68c954d7d844743fa4d
+Size (rubygems-276-for-ruby22.patch) = 15888 bytes
+SHA1 (patch-configure) = c3050191a117febacf65d0c798bf5a171fb19f05
 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
 SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
 SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d

Index: pkgsrc/lang/ruby22-base/patches/patch-configure
diff -u pkgsrc/lang/ruby22-base/patches/patch-configure:1.5 pkgsrc/lang/ruby22-base/patches/patch-configure:1.5.6.1
--- pkgsrc/lang/ruby22-base/patches/patch-configure:1.5 Thu Jul  6 16:35:05 2017
+++ pkgsrc/lang/ruby22-base/patches/patch-configure     Fri Mar  2 20:37:47 2018
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure,v 1.5 2017/07/06 16:35:05 taca Exp $
+$NetBSD: patch-configure,v 1.5.6.1 2018/03/02 20:37:47 spz Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
+* Handle SSP in pkgsrc.
 
---- configure.orig     2017-03-28 07:53:45.000000000 +0000
+--- configure.orig     2017-12-14 16:00:13.000000000 +0000
 +++ configure
 @@ -5581,7 +5581,7 @@ esac
  else
@@ -23,7 +24,15 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
  
  case $RUBY_PATCHLEVEL in #(
    -*) :
-@@ -8909,6 +8910,10 @@ esac
+@@ -7796,6 +7797,7 @@ esac
+       stack_protector=no
+      ;; #(
+   *) :
++      stack_protector=no
+      ;;
+ esac
+     if test -z "${stack_protector+set}"; then
+@@ -8909,6 +8911,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no
                 ;; #(
@@ -34,7 +43,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -17004,6 +17009,8 @@ else
+@@ -17004,6 +17010,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -43,7 +52,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -21293,7 +21300,9 @@ esac ;; #(
+@@ -21293,7 +21301,9 @@ esac ;; #(
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -53,7 +62,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -22503,7 +22512,17 @@ esac
+@@ -22503,7 +22513,17 @@ esac
         ;; #(
    linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) :
  
@@ -72,7 +81,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
        LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
        if test "$load_relative" = yes; then
            libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
-@@ -22514,7 +22533,7 @@ esac
+@@ -22514,7 +22534,7 @@ esac
    freebsd*|dragonfly*) :
  
        SOLIBS='$(LIBS)'
@@ -81,7 +90,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
        if test "$rb_cv_binary_elf" != "yes" ; then
            LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
            LIBRUBY_ALIASES=''
-@@ -22524,7 +22543,17 @@ esac
+@@ -22524,7 +22544,17 @@ esac
  
        SOLIBS='$(LIBS)'
        LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
@@ -100,7 +109,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
        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
-@@ -22556,7 +22585,17 @@ esac
+@@ -22556,7 +22586,17 @@ esac
         ;; #(
    aix*) :
  
@@ -119,7 +128,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
        LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
        SOLIBS='-lm -lc'
         ;; #(
-@@ -22565,7 +22604,7 @@ esac
+@@ -22565,7 +22605,7 @@ esac
        case "$target_cpu" in #(
    powerpc*) :
  
@@ -128,7 +137,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
             ;; #(
    *) :
       ;;
-@@ -22593,7 +22632,12 @@ esac
+@@ -22593,7 +22633,12 @@ esac
         ;; #(
    interix*) :
  
@@ -142,7 +151,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
         ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -22766,7 +22810,7 @@ if test "$enable_rpath" = yes; then
+@@ -22766,7 +22811,7 @@ if test "$enable_rpath" = yes; then
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -151,7 +160,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -23085,11 +23129,7 @@ if test "$install_doc" != no; then
+@@ -23085,11 +23130,7 @@ if test "$install_doc" != no; then
      else
        RDOCTARGET="nodoc"
      fi
@@ -164,7 +173,7 @@ $NetBSD: patch-configure,v 1.5 2017/07/0
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -25195,17 +25235,7 @@ which seems to be undefined.  Please mak
+@@ -25195,17 +25236,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {