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

(-)Mk/bsd.ruby.mk (-2 / +2 lines)
Lines 164-171 Link Here
164
#
164
#
165
# Ruby 2.4
165
# Ruby 2.4
166
#
166
#
167
RUBY_RELVERSION=	2.4.4
167
RUBY_RELVERSION=	2.4.5
168
RUBY_PORTREVISION=	4
168
RUBY_PORTREVISION=	0
169
RUBY_PORTEPOCH=		1
169
RUBY_PORTEPOCH=		1
170
RUBY_PATCHLEVEL=	0
170
RUBY_PATCHLEVEL=	0
171
RUBY24=			""	# PLIST_SUB helpers
171
RUBY24=			""	# PLIST_SUB helpers
(-)lang/ruby24/Makefile (-5 / +12 lines)
Lines 23-28 Link Here
23
LIB_DEPENDS=	libyaml.so:textproc/libyaml
23
LIB_DEPENDS=	libyaml.so:textproc/libyaml
24
RUN_DEPENDS=	libffi>=0:devel/libffi
24
RUN_DEPENDS=	libffi>=0:devel/libffi
25
25
26
USES=		autoreconf cpe ssl tar:xz
27
USE_LDCONFIG=	yes
28
26
CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
29
CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
27
		--disable-rpath \
30
		--disable-rpath \
28
		--enable-pthread \
31
		--enable-pthread \
Lines 36-43 Link Here
36
GNU_CONFIGURE=	yes
39
GNU_CONFIGURE=	yes
37
# Keep this, else ruby will fail to load libraries dependent of libpthread.
40
# Keep this, else ruby will fail to load libraries dependent of libpthread.
38
LIBS+=		-lpthread -L${LOCALBASE}/lib
41
LIBS+=		-lpthread -L${LOCALBASE}/lib
39
USE_LDCONFIG=	yes
40
USES=		autoreconf cpe ssl tar:xz
41
WRKSRC=		${RUBY_WRKSRC}
42
WRKSRC=		${RUBY_WRKSRC}
42
43
43
RUBY_VER=		2.4
44
RUBY_VER=		2.4
Lines 110-116 Link Here
110
.endif
111
.endif
111
112
112
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
113
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
113
MLINKS=		${RUBY_NAME}.1 ruby.1
114
PLIST_SUB+=	IF_DEFAULT=""
114
PLIST_SUB+=	IF_DEFAULT=""
115
.else
115
.else
116
PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
116
PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
Lines 117-123 Link Here
117
PLIST_SUB+=	IF_DEFAULT="@comment "
117
PLIST_SUB+=	IF_DEFAULT="@comment "
118
.endif
118
.endif
119
119
120
INSTALLED_SCRIPTS=	irb erb rdoc ri ruby
120
INSTALLED_SCRIPTS=	erb irb rdoc ri ruby
121
INSTALLED_MANUALS=	erb irb ri ruby
121
122
122
EXTSAMPLES=	bigdecimal/sample/*.rb
123
EXTSAMPLES=	bigdecimal/sample/*.rb
123
124
Lines 167-179 Link Here
167
	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
168
	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
168
169
169
post-install:
170
post-install:
171
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
170
#
172
#
171
# Link just installed "ruby" to "ruby24", etc.
173
# Link just installed "ruby" to "ruby24", etc.
172
#
174
#
173
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
174
. for FILE in ${INSTALLED_SCRIPTS}
175
. for FILE in ${INSTALLED_SCRIPTS}
175
	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
176
	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
176
. endfor
177
. endfor
178
#
179
# Link "ruby.1.gz" to "ruby24.1.gz", etc.
180
#
181
. for FILE in ${INSTALLED_MANUALS}
182
	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/${FILE}.1.gz
183
. endfor
177
.endif
184
.endif
178
185
179
post-install-DEBUG-off:
186
post-install-DEBUG-off:
(-)lang/ruby24/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1522331781
1
TIMESTAMP = 1539919595
2
SHA256 (ruby/ruby-2.4.4.tar.xz) = 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0
2
SHA256 (ruby/ruby-2.4.5.tar.xz) = 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb
3
SIZE (ruby/ruby-2.4.4.tar.xz) = 10049304
3
SIZE (ruby/ruby-2.4.5.tar.xz) = 10064712
(-)lang/ruby24/files/patch-configure.in (-6 / +6 lines)
Lines 1-6 Link Here
1
--- configure.in.orig	2018-03-02 20:59:11.000000000 +0800
1
--- configure.in.orig	2018-10-17 08:30:28 UTC
2
+++ configure.in	2018-07-19 14:22:04.753721000 +0800
2
+++ configure.in
3
@@ -2573,7 +2573,7 @@
3
@@ -2573,7 +2573,7 @@ if test "$ac_cv_func_qsort_r" != no; then
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
@@ -2583,7 +2583,7 @@
12
@@ -2583,7 +2583,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
@@ -3423,7 +3423,7 @@
21
@@ -3423,7 +3423,7 @@ if test "$with_dln_a_out" != yes; then
22
 			: ${LDSHARED='$(CC) -shared'}
22
 			: ${LDSHARED='$(CC) -shared'}
23
 			if test "$rb_cv_binary_elf" = yes; then
23
 			if test "$rb_cv_binary_elf" = yes; then
24
 			    LDFLAGS="$LDFLAGS -rdynamic"
24
 			    LDFLAGS="$LDFLAGS -rdynamic"
Lines 27-33 Link Here
27
 			else
27
 			else
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
 			fi
29
 			fi
30
@@ -3896,6 +3895,7 @@
30
@@ -3896,6 +3896,7 @@ AS_CASE("$enable_shared", [yes], [
31
     [freebsd*|dragonfly*], [
31
     [freebsd*|dragonfly*], [
32
 	SOLIBS='$(LIBS)'
32
 	SOLIBS='$(LIBS)'
33
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
33
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
(-)lang/ruby24/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/ruby24/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	2016-09-07 22:23:38 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/ruby24/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	2016-11-17 07:19:49 UTC
2
+++ tool/mkconfig.rb
2
+++ tool/mkconfig.rb
3
@@ -168,8 +168,9 @@ def vars.expand(val, config = self)
3
@@ -159,8 +159,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/ruby24/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
@@ -694,110 +695,6 @@ end
20
@@ -693,110 +694,6 @@ class Gem::Installer
21
 end
21
 
22
 
22
 # :startdoc:
23
 # :startdoc:
23
 
24
-
24
-install?(:ext, :comm, :gem) do
25
-install?(:ext, :comm, :gem) do
25
-  gem_dir = Gem.default_dir
26
-  gem_dir = Gem.default_dir
26
-  directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
27
-  directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
Lines 124-130 Link Here
124
-    puts "skip installing bundle gems because of lacking zlib"
125
-    puts "skip installing bundle gems because of lacking zlib"
125
-  end
126
-  end
126
-end
127
-end
127
-
128
 
128
 parse_args()
129
 parse_args()
129
 
130
 
130
 include FileUtils
(-)lang/ruby24/pkg-plist (+6 lines)
Lines 879-887 Link Here
879
%%RUBY_LIBDIR%%/yaml/dbm.rb
879
%%RUBY_LIBDIR%%/yaml/dbm.rb
880
%%RUBY_LIBDIR%%/yaml/store.rb
880
%%RUBY_LIBDIR%%/yaml/store.rb
881
libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
881
libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
882
%%IF_DEFAULT%%man/man1/erb.1.gz
882
man/man1/erb%%RUBY_SUFFIX%%.1.gz
883
man/man1/erb%%RUBY_SUFFIX%%.1.gz
884
%%IF_DEFAULT%%man/man1/irb.1.gz
883
man/man1/irb%%RUBY_SUFFIX%%.1.gz
885
man/man1/irb%%RUBY_SUFFIX%%.1.gz
886
%%IF_DEFAULT%%man/man1/ri.1.gz
884
man/man1/ri%%RUBY_SUFFIX%%.1.gz
887
man/man1/ri%%RUBY_SUFFIX%%.1.gz
888
%%IF_DEFAULT%%man/man1/ruby.1.gz
885
man/man1/%%RUBY_NAME%%.1.gz
889
man/man1/%%RUBY_NAME%%.1.gz
886
%%DOCS%%%%RUBY_DOCDIR%%/COPYING
890
%%DOCS%%%%RUBY_DOCDIR%%/COPYING
887
%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
891
%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
Lines 4088-4093 Link Here
4088
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d31/struct_dbls.html
4092
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d31/struct_dbls.html
4089
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d32/dir_8c.html
4093
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d32/dir_8c.html
4090
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d32/dir_8c_source.html
4094
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d32/dir_8c_source.html
4095
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d3c/structselect__set.html
4091
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.map
4096
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.map
4092
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.md5
4097
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.md5
4093
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.png
4098
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/de/d35/ruby__atomic_8h__dep__incl.png
Lines 7628-7633 Link Here
7628
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/initialize-i.ri
7633
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/initialize-i.ri
7629
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/mkdir_p_safe-i.ri
7634
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/mkdir_p_safe-i.ri
7630
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/new-c.ri
7635
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/new-c.ri
7636
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/normalize_path-i.ri
7631
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/read_checksums-i.ri
7637
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/read_checksums-i.ri
7632
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/realpath-i.ri
7638
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/realpath-i.ri
7633
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/security_policy-i.ri
7639
%%RDOC%%%%RUBY_RIDIR%%/Gem/Package/security_policy-i.ri

Return to bug 232435