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

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

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

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

Log Message:
Pullup ticket #5707 - requested by taca
lang/ruby24-base: security patch

Revisions pulled up:
- lang/ruby24-base/Makefile                                     1.6-1.7
- lang/ruby24-base/distinfo                                     1.6-1.8
- lang/ruby24-base/patches/patch-configure                      1.3-1.4

-------------------------------------------------------------------
   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.5 -r1.6 pkgsrc/lang/ruby24-base/distinfo
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby24-base/patches/patch-configure

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Fri Jan 26 13:22:58 UTC 2018

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

   Log Message:
   ruby24-base: Put -std= in CFLAGS not CPPFLAGS.  Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby24-base/Makefile
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby24-base/distinfo
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ruby24-base/patches/patch-configure

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

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

   Log Message:
   lang/ruby24-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.6 -r1.7 pkgsrc/lang/ruby24-base/Makefile
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ruby24-base/distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.6.1 pkgsrc/lang/ruby24-base/Makefile
cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/lang/ruby24-base/distinfo
cvs rdiff -u -r1.2 -r1.2.8.1 pkgsrc/lang/ruby24-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/ruby24-base/Makefile
diff -u pkgsrc/lang/ruby24-base/Makefile:1.5 pkgsrc/lang/ruby24-base/Makefile:1.5.6.1
--- pkgsrc/lang/ruby24-base/Makefile:1.5        Fri Sep 15 00:39:46 2017
+++ pkgsrc/lang/ruby24-base/Makefile    Fri Mar  2 20:36:36 2018
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2017/09/15 00:39:46 taca Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2018/03/02 20:36:36 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/7028/
+PATCHFILES=    rubygems-276-for-ruby24.patch
+PATCH_DIST_STRIP=      -p0
+
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      ${RUBY_HOMEPAGE}
 COMMENT=       Ruby ${RUBY_VERSION} release minimum base package

Index: pkgsrc/lang/ruby24-base/distinfo
diff -u pkgsrc/lang/ruby24-base/distinfo:1.5 pkgsrc/lang/ruby24-base/distinfo:1.5.2.1
--- pkgsrc/lang/ruby24-base/distinfo:1.5        Fri Dec 15 03:23:29 2017
+++ pkgsrc/lang/ruby24-base/distinfo    Fri Mar  2 20:36:36 2018
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.5 2017/12/15 03:23:29 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2018/03/02 20:36:36 spz Exp $
 
 SHA1 (ruby-2.4.3.tar.bz2) = 3ca96536320b915762d57fe1ee540df6810bf631
 RMD160 (ruby-2.4.3.tar.bz2) = f02b5ca6b577351c8852a99eecaa4d4a3dda026f
 SHA512 (ruby-2.4.3.tar.bz2) = fb4339e30c04d03b1422b6c32ede45902e072cd26325b36f3fc05c341d42eea6431d88718242dcc9ce24d9cad26f3d26772f2e806bd7d93f40be50268c318409
 Size (ruby-2.4.3.tar.bz2) = 12615068 bytes
-SHA1 (patch-configure) = 680a13e6405a8aab61eba078f6d88488b426885c
+SHA1 (rubygems-276-for-ruby24.patch) = ed8c182b8c5391dcb975089c43a90786b398d274
+RMD160 (rubygems-276-for-ruby24.patch) = 5a5697d9520418a48fff24148e4b1263d3a3cd63
+SHA512 (rubygems-276-for-ruby24.patch) = f94248f7208c63db1a7c89537d8b1c541a8cf003d697bccaf8238004c45e9293d0ac9ae42fc97ef72fa761b97d8da1d049a863c96707721b04c90256f960e669
+Size (rubygems-276-for-ruby24.patch) = 19937 bytes
+SHA1 (patch-configure) = a4013e4674be0060d2b0d43569b7695f6df7b4a7
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198

Index: pkgsrc/lang/ruby24-base/patches/patch-configure
diff -u pkgsrc/lang/ruby24-base/patches/patch-configure:1.2 pkgsrc/lang/ruby24-base/patches/patch-configure:1.2.8.1
--- pkgsrc/lang/ruby24-base/patches/patch-configure:1.2 Tue Jun 27 15:25:19 2017
+++ pkgsrc/lang/ruby24-base/patches/patch-configure     Fri Mar  2 20:36:36 2018
@@ -1,10 +1,12 @@
-$NetBSD: patch-configure,v 1.2 2017/06/27 15:25:19 jperkin Exp $
+$NetBSD: patch-configure,v 1.2.8.1 2018/03/02 20:36:36 spz Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
+* Handle SSP in pkgsrc.
+* Put -std= in CFLAGS not CPPFLAGS.
 
---- configure.orig     2017-03-22 05:56:10.000000000 +0000
+--- configure.orig     2017-12-14 14:36:11.000000000 +0000
 +++ configure
 @@ -5727,7 +5727,7 @@ esac
  else
@@ -15,7 +17,15 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
  
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
-@@ -9234,7 +9234,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -8112,6 +8112,7 @@ esac
+       stack_protector=no
+      ;; #(
+   *) :
++      stack_protector=no
+      ;;
+ esac
+     if test -z "${stack_protector+set}"; then
+@@ -9325,7 +9326,7 @@ rm -f core conftest.err conftest.$ac_obj
                  # is often also needed in CPPFLAGS, because some feature
                  # definitions vary depending on such standards options.
                  case "${ansi_options}" in #(
@@ -24,7 +34,19 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
  
                    # RUBY_APPEND_OPTIONS(CPPFLAGS)
        for rb_opt in ${ansi_options}; do
-@@ -9464,6 +9464,10 @@ esac
+@@ -9333,9 +9334,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
+                  ;; #(
+@@ -9555,6 +9556,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no
                 ;; #(
@@ -35,7 +57,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -19697,6 +19701,8 @@ else
+@@ -19808,6 +19813,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -44,7 +66,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -24383,7 +24389,9 @@ esac ;; #(
+@@ -24490,7 +24497,9 @@ esac ;; #(
    interix*) :
        : ${LDSHARED='$(CC) -shared'}
                        XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -54,7 +76,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
                        rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -25571,7 +25579,7 @@ esac
+@@ -25617,7 +25626,7 @@ esac
    freebsd*|dragonfly*) :
  
        SOLIBS='$(LIBS)'
@@ -63,7 +85,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
        if test "$rb_cv_binary_elf" != "yes" ; then
            LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
            LIBRUBY_ALIASES=''
-@@ -25660,7 +25668,12 @@ esac
+@@ -25706,7 +25715,12 @@ esac
         ;; #(
    interix*) :
  
@@ -77,7 +99,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
         ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -25828,7 +25841,7 @@ if test "$enable_rpath" = yes; then
+@@ -25874,7 +25888,7 @@ if test "$enable_rpath" = yes; then
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -86,7 +108,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -26324,11 +26337,7 @@ if test "$install_doc" != no; then
+@@ -26370,11 +26384,7 @@ if test "$install_doc" != no; then
      else
        RDOCTARGET="nodoc"
      fi
@@ -99,7 +121,7 @@ $NetBSD: patch-configure,v 1.2 2017/06/2
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -28372,19 +28383,7 @@ which seems to be undefined.  Please mak
+@@ -28404,19 +28414,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {