View | Details | Raw Unified | Return to bug 232431
Collapse All | Expand All

(-)Mk/bsd.ruby.mk (-2 / +2 lines)
Lines 174-181 Link Here
174
#
174
#
175
# Ruby 2.5
175
# Ruby 2.5
176
#
176
#
177
RUBY_RELVERSION=	2.5.1
177
RUBY_RELVERSION=	2.5.3
178
RUBY_PORTREVISION=	5
178
RUBY_PORTREVISION=	0
179
RUBY_PORTEPOCH=		1
179
RUBY_PORTEPOCH=		1
180
RUBY_PATCHLEVEL=	0
180
RUBY_PATCHLEVEL=	0
181
RUBY25=			""	# PLIST_SUB helpers
181
RUBY25=			""	# PLIST_SUB helpers
(-)lang/ruby25/Makefile (-4 / +10 lines)
Lines 36-43 Link Here
36
GNU_CONFIGURE=	yes
36
GNU_CONFIGURE=	yes
37
# Keep this, else ruby will fail to load libraries dependent of libpthread.
37
# Keep this, else ruby will fail to load libraries dependent of libpthread.
38
LIBS+=		-lpthread -L${LOCALBASE}/lib
38
LIBS+=		-lpthread -L${LOCALBASE}/lib
39
USES=		autoreconf cpe ssl tar:xz
39
USE_LDCONFIG=	yes
40
USE_LDCONFIG=	yes
40
USES=		autoreconf cpe ssl tar:xz
41
WRKSRC=		${RUBY_WRKSRC}
41
WRKSRC=		${RUBY_WRKSRC}
42
42
43
RUBY_VER=		2.5
43
RUBY_VER=		2.5
Lines 110-116 Link Here
110
.endif
110
.endif
111
111
112
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
112
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
113
MLINKS=		${RUBY_NAME}.1 ruby.1
114
PLIST_SUB+=	IF_DEFAULT=""
113
PLIST_SUB+=	IF_DEFAULT=""
115
.else
114
.else
116
PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
115
PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
Lines 117-123 Link Here
117
PLIST_SUB+=	IF_DEFAULT="@comment "
116
PLIST_SUB+=	IF_DEFAULT="@comment "
118
.endif
117
.endif
119
118
120
INSTALLED_SCRIPTS=	irb erb rdoc ri ruby
119
INSTALLED_SCRIPTS=	erb irb rdoc ri ruby
120
INSTALLED_MANUALS=	erb irb ri ruby
121
121
122
EXTSAMPLES=	bigdecimal/sample/*.rb
122
EXTSAMPLES=	bigdecimal/sample/*.rb
123
123
Lines 167-179 Link Here
167
	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
167
	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
168
168
169
post-install:
169
post-install:
170
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
170
#
171
#
171
# Link just installed "ruby" to "ruby25", etc.
172
# Link just installed "ruby" to "ruby25", etc.
172
#
173
#
173
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
174
. for FILE in ${INSTALLED_SCRIPTS}
174
. for FILE in ${INSTALLED_SCRIPTS}
175
	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
175
	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
176
. endfor
176
. endfor
177
#
178
# Link "ruby.1.gz" to "ruby25.1.gz", etc.
179
#
180
. for FILE in ${INSTALLED_MANUALS}
181
	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/${FILE}.1.gz
182
. endfor
177
.endif
183
.endif
178
184
179
post-install-DEBUG-off:
185
post-install-DEBUG-off:
(-)lang/ruby25/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1522331706
1
TIMESTAMP = 1539879194
2
SHA256 (ruby/ruby-2.5.1.tar.xz) = 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d
2
SHA256 (ruby/ruby-2.5.3.tar.xz) = 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f
3
SIZE (ruby/ruby-2.5.1.tar.xz) = 11348108
3
SIZE (ruby/ruby-2.5.3.tar.xz) = 11453336
(-)lang/ruby25/files/patch-configure.ac (-6 / +6 lines)
Lines 1-6 Link Here
1
--- configure.ac.orig	2018-01-04 02:12:16.000000000 +0800
1
--- configure.ac.orig	2018-01-03 18:12:16 UTC
2
+++ configure.ac	2018-07-19 14:45:11.636321000 +0800
2
+++ configure.ac
3
@@ -2482,7 +2482,7 @@
3
@@ -2482,7 +2482,7 @@ AS_IF([test "$ac_cv_func_qsort_r" != no], [
4
   AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
4
   AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
5
     [AC_TRY_COMPILE([
5
     [AC_TRY_COMPILE([
6
 @%:@include <stdlib.h>
6
 @%:@include <stdlib.h>
Lines 9-15 Link Here
9
 	    int (*compar)(const void *, const void *, void *),
9
 	    int (*compar)(const void *, const void *, void *),
10
 	    void *arg);
10
 	    void *arg);
11
 ],[ ],
11
 ],[ ],
12
@@ -2492,7 +2492,7 @@
12
@@ -2492,7 +2492,7 @@ void qsort_r(void *base, size_t nmemb, size_t size,
13
   AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
13
   AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
14
     [AC_TRY_COMPILE([
14
     [AC_TRY_COMPILE([
15
 @%:@include <stdlib.h>
15
 @%:@include <stdlib.h>
Lines 18-24 Link Here
18
 	     void *arg, int (*compar)(void *, const void *, const void *));
18
 	     void *arg, int (*compar)(void *, const void *, const void *));
19
 ],[ ],
19
 ],[ ],
20
       [rb_cv_bsd_qsort_r=yes],
20
       [rb_cv_bsd_qsort_r=yes],
21
@@ -3245,7 +3245,7 @@
21
@@ -3245,7 +3245,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
22
 			: ${LDSHARED='$(CC) -shared'}
22
 			: ${LDSHARED='$(CC) -shared'}
23
 			AS_IF([test "$rb_cv_binary_elf" = yes], [
23
 			AS_IF([test "$rb_cv_binary_elf" = yes], [
24
 			    LDFLAGS="$LDFLAGS -rdynamic"
24
 			    LDFLAGS="$LDFLAGS -rdynamic"
Lines 27-33 Link Here
27
 			], [
27
 			], [
28
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
28
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
29
 			])
29
 			])
30
@@ -3724,6 +3723,7 @@
30
@@ -3724,6 +3724,7 @@ AS_CASE("$enable_shared", [yes], [
31
 	SOLIBS='$(LIBS)'
31
 	SOLIBS='$(LIBS)'
32
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
32
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
33
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
33
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
(-)lang/ruby25/files/patch-ext-openssl-extconf.rb (-28 lines)
Lines 1-28 Link Here
1
From 75de15ddcdab6efe7faf3ca1f6b5c6e5b6ba57cc Mon Sep 17 00:00:00 2001
2
From: Kazuki Yamaguchi <k@rhe.jp>
3
Date: Sat, 24 Mar 2018 01:44:37 +0900
4
Subject: [PATCH] extconf.rb: fix build with LibreSSL 2.7.0
5
6
Our compat implementation of accessor functions that were introduced in
7
OpenSSL 1.1.0 conflicts with those from LibreSSL 2.7.0. Use the
8
HAVE_OPAQUE_OPENSSL code path when LibreSSL 2.7 or newer is detected.
9
10
Fix suggested by Joel Sing.
11
12
Fixes: https://github.com/ruby/openssl/issues/192
13
14
--- ext/openssl/extconf.rb.orig
15
+++ ext/openssl/extconf.rb
16
@@ -157,8 +157,11 @@ def find_openssl_library
17
 have_func("SSL_is_server")
18
 
19
 # added in 1.1.0
20
+if !have_struct_member("SSL", "ctx", "openssl/ssl.h") ||
21
+    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h")
22
+  $defs.push("-DHAVE_OPAQUE_OPENSSL")
23
+end
24
 have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
25
-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL")
26
 have_func("BN_GENCB_new")
27
 have_func("BN_GENCB_free")
28
 have_func("BN_GENCB_get_arg")
(-)lang/ruby25/files/patch-lib_mkmf.rb (-2 / +2 lines)
Lines 1-6 Link Here
1
--- lib/mkmf.rb.orig	2015-12-16 09:25:48 UTC
1
--- lib/mkmf.rb.orig	2018-10-09 14:09:35 UTC
2
+++ lib/mkmf.rb
2
+++ lib/mkmf.rb
3
@@ -235,7 +235,7 @@ module MakeMakefile
3
@@ -234,7 +234,7 @@ module MakeMakefile
4
   end
4
   end
5
   $extmk ||= false
5
   $extmk ||= false
6
   if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
6
   if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
(-)lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb (-4 / +4 lines)
Lines 1-6 Link Here
1
--- ./lib/rdoc/generator/json_index.rb.orig	2017-11-12 19:37:25.144883000 -0500
1
--- lib/rdoc/generator/json_index.rb.orig	2017-11-27 10:45:24 UTC
2
+++ ./lib/rdoc/generator/json_index.rb	2017-11-12 19:37:44.551836000 -0500
2
+++ lib/rdoc/generator/json_index.rb
3
@@ -175,7 +175,7 @@
3
@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex
4
     debug_msg "Writing gzipped search index to %s" % outfile
4
     debug_msg "Writing gzipped search index to %s" % outfile
5
 
5
 
6
     Zlib::GzipWriter.open(outfile) do |gz|
6
     Zlib::GzipWriter.open(outfile) do |gz|
Lines 9-15 Link Here
9
       gz.orig_name = search_index_file.basename.to_s
9
       gz.orig_name = search_index_file.basename.to_s
10
       gz.write search_index
10
       gz.write search_index
11
       gz.close
11
       gz.close
12
@@ -193,7 +193,7 @@
12
@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex
13
         debug_msg "Writing gzipped file to %s" % outfile
13
         debug_msg "Writing gzipped file to %s" % outfile
14
 
14
 
15
         Zlib::GzipWriter.open(outfile) do |gz|
15
         Zlib::GzipWriter.open(outfile) do |gz|
(-)lang/ruby25/files/patch-tool_mkconfig.rb (-3 / +3 lines)
Lines 1-6 Link Here
1
--- tool/mkconfig.rb.orig	2015-12-09 20:53:21 UTC
1
--- tool/mkconfig.rb.orig	2017-05-02 12:45:07 UTC
2
+++ tool/mkconfig.rb
2
+++ tool/mkconfig.rb
3
@@ -168,8 +168,9 @@ def vars.expand(val, config = self)
3
@@ -157,8 +157,9 @@ def vars.expand(val, config = self)
4
   val.replace(newval) unless newval == val
4
   val.replace(newval) unless newval == val
5
   val
5
   val
6
 end
6
 end
Lines 11-14 Link Here
11
+rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}"
11
+rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}"
12
 relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
12
 relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
13
 puts %[\
13
 puts %[\
14
 # frozen-string-literal: false
14
 # encoding: ascii-8bit
(-)lang/ruby25/files/patch-tool_rbinstall.rb (-4 / +4 lines)
Lines 17-26 Link Here
17
     install pc, pkgconfigdir, :mode => $data_mode
17
     install pc, pkgconfigdir, :mode => $data_mode
18
   end
18
   end
19
 end
19
 end
20
@@ -699,136 +700,6 @@ end
20
@@ -698,136 +699,6 @@ class Gem::Installer
21
 end
21
 
22
 
22
 # :startdoc:
23
 # :startdoc:
23
 
24
-
24
-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
25
-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
25
-  install_default_gem('lib', srcdir)
26
-  install_default_gem('lib', srcdir)
26
-end
27
-end
Lines 150-156 Link Here
150
-    puts "skip installing bundled gems because of lacking zlib"
151
-    puts "skip installing bundled gems because of lacking zlib"
151
-  end
152
-  end
152
-end
153
-end
153
-
154
 
154
 parse_args()
155
 parse_args()
155
 
156
 
156
 include FileUtils
(-)lang/ruby25/pkg-plist (+5 lines)
Lines 876-884 Link Here
876
%%RUBY_LIBDIR%%/yaml/dbm.rb
876
%%RUBY_LIBDIR%%/yaml/dbm.rb
877
%%RUBY_LIBDIR%%/yaml/store.rb
877
%%RUBY_LIBDIR%%/yaml/store.rb
878
libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
878
libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
879
%%IF_DEFAULT%%man/man1/erb.1.gz
879
man/man1/erb%%RUBY_SUFFIX%%.1.gz
880
man/man1/erb%%RUBY_SUFFIX%%.1.gz
881
%%IF_DEFAULT%%man/man1/irb.1.gz
880
man/man1/irb%%RUBY_SUFFIX%%.1.gz
882
man/man1/irb%%RUBY_SUFFIX%%.1.gz
883
%%IF_DEFAULT%%man/man1/ri.1.gz
881
man/man1/ri%%RUBY_SUFFIX%%.1.gz
884
man/man1/ri%%RUBY_SUFFIX%%.1.gz
885
%%IF_DEFAULT%%man/man1/ruby.1.gz
882
man/man1/%%RUBY_NAME%%.1.gz
886
man/man1/%%RUBY_NAME%%.1.gz
883
%%DOCS%%%%RUBY_DOCDIR%%/COPYING
887
%%DOCS%%%%RUBY_DOCDIR%%/COPYING
884
%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
888
%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
Lines 4013-4018 Link Here
4013
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.map
4017
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.map
4014
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.md5
4018
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.md5
4015
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.png
4019
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d38/symbol_8h__dep__incl.png
4020
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d3c/structselect__set.html
4016
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d40/structcls__struct__12byte.html
4021
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d40/structcls__struct__12byte.html
4017
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d43/group__embed.html
4022
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d43/group__embed.html
4018
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d43/group__embed.map
4023
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d43/group__embed.map

Return to bug 232431