CVS commit: pkgsrc/lang/ruby22-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 25 15:56:58 UTC 2018

Modified Files:
        pkgsrc/lang/ruby22-base: Makefile distinfo
Added Files:
        pkgsrc/lang/ruby22-base/patches: patch-marshal.c

Log Message:
ruby22-base: Apply upstream patch to fix GCC 7 issue.

Bump PKGREVISION, package previously built but marshal operations during gem
installs would fail.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/ruby22-base/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/ruby22-base/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ruby22-base/patches/patch-marshal.c

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.23 pkgsrc/lang/ruby22-base/Makefile:1.24
--- pkgsrc/lang/ruby22-base/Makefile:1.23       Thu Mar 29 03:11:58 2018
+++ pkgsrc/lang/ruby22-base/Makefile    Fri May 25 15:56:58 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2018/03/29 03:11:58 taca Exp $
+# $NetBSD: Makefile,v 1.24 2018/05/25 15:56:58 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby22-base/distinfo
diff -u pkgsrc/lang/ruby22-base/distinfo:1.24 pkgsrc/lang/ruby22-base/distinfo:1.25
--- pkgsrc/lang/ruby22-base/distinfo:1.24       Thu Mar 29 03:11:58 2018
+++ pkgsrc/lang/ruby22-base/distinfo    Fri May 25 15:56:58 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2018/03/29 03:11:58 taca Exp $
+$NetBSD: distinfo,v 1.25 2018/05/25 15:56:58 jperkin Exp $
 
 SHA1 (ruby-2.2.10.tar.bz2) = 72ee1dcfd96199d2c3092b77db7a7f439c0abd08
 RMD160 (ruby-2.2.10.tar.bz2) = b766f369db78f002c6bdf4d54592af6dbc7d0295
@@ -26,5 +26,6 @@ SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418
 SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
 SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885
 SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c
+SHA1 (patch-marshal.c) = 57d75821a42b651aca886ade4996266c8304f37d
 SHA1 (patch-test_rubygems_test__gem.rb) = 01a36c32e49d518cc68bea5e76c7640451223b61
 SHA1 (patch-tool_rbinstall.rb) = 2bb27173a0e08de94391d56ef2b366a71ee2dc50

Added files:

Index: pkgsrc/lang/ruby22-base/patches/patch-marshal.c
diff -u /dev/null pkgsrc/lang/ruby22-base/patches/patch-marshal.c:1.1
--- /dev/null   Fri May 25 15:56:58 2018
+++ pkgsrc/lang/ruby22-base/patches/patch-marshal.c     Fri May 25 15:56:58 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-marshal.c,v 1.1 2018/05/25 15:56:58 jperkin Exp $
+
+Upstream GCC 7 patch, https://github.com/ruby/ruby/commit/7c1b30a
+
+--- marshal.c.orig     2016-12-27 10:11:49.000000000 +0000
++++ marshal.c
+@@ -1000,7 +1000,7 @@ marshal_dump(int argc, VALUE *argv)
+     VALUE obj, port, a1, a2;
+     int limit = -1;
+     struct dump_arg *arg;
+-    VALUE wrapper; /* used to avoid memory leak in case of exception */
++    volatile VALUE wrapper; /* used to avoid memory leak in case of exception */
+ 
+     port = Qnil;
+     rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
+@@ -2022,7 +2022,7 @@ marshal_load(int argc, VALUE *argv)
+     VALUE port, proc;
+     int major, minor, infection = 0;
+     VALUE v;
+-    VALUE wrapper; /* used to avoid memory leak in case of exception */
++    volatile VALUE wrapper; /* used to avoid memory leak in case of exception */
+     struct load_arg *arg;
+ 
+     rb_scan_args(argc, argv, "11", &port, &proc);