mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

- Fix runtime with OpenSSL after the removal of SSLv2 in head.

Browse Source 
- Make the main LOCALBASE/bin files into symlinks to the actual version to
  make it simpler to tell which version is default.
This commit is contained in:
Bryan Drewery 2015-04-01 23:26:10 +00:00
parent 31c8b17347
commit e710b8dad9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=382973
7 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.ruby.mk
View File

@ -172,7 +172,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
# Ruby 2.0
#
RUBY_RELVERSION= 2.0.0
RUBY_PORTREVISION= 0
RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 643
RUBY20= "" # PLIST_SUB helpers
@ -182,7 +182,7 @@ RUBY20= "" # PLIST_SUB helpers
# Ruby 2.1
#
RUBY_RELVERSION= 2.1.5
RUBY_PORTREVISION= 3
RUBY_PORTREVISION= 4
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
RUBY21= "" # PLIST_SUB helpers
@ -192,7 +192,7 @@ RUBY21= "" # PLIST_SUB helpers
# Ruby 2.2
#
RUBY_RELVERSION= 2.2.1
RUBY_PORTREVISION= 0
RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
RUBY22= "" # PLIST_SUB helpers

2
lang/ruby20/Makefile
View File

@ -212,7 +212,7 @@ post-install:
#
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
. for FILE in ${INSTALLED_SCRIPTS}
${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
. endfor
.endif

15
lang/ruby20/files/patch-ext_openssl_extconf.rb Normal file
View File

@ -0,0 +1,15 @@
--- ext/openssl/extconf.rb.orig 2015-04-01 22:28:09 UTC
+++ ext/openssl/extconf.rb
@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id")
have_func("SSL_SESSION_cmp")
have_func("OPENSSL_cleanse")
-have_func("SSLv2_method")
-have_func("SSLv2_server_method")
-have_func("SSLv2_client_method")
+have_func("SSLv23_method")
+have_func("SSLv23_server_method")
+have_func("SSLv23_client_method")
have_func("TLSv1_1_method")
have_func("TLSv1_1_server_method")
have_func("TLSv1_1_client_method")

2
lang/ruby21/Makefile
View File

@ -207,7 +207,7 @@ post-install:
#
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
. for FILE in ${INSTALLED_SCRIPTS}
${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
. endfor
.endif

15
lang/ruby21/files/patch-ext_openssl_extconf.rb Normal file
View File

@ -0,0 +1,15 @@
--- ext/openssl/extconf.rb.orig 2015-04-01 22:28:09 UTC
+++ ext/openssl/extconf.rb
@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id")
have_func("SSL_SESSION_cmp")
have_func("OPENSSL_cleanse")
-have_func("SSLv2_method")
-have_func("SSLv2_server_method")
-have_func("SSLv2_client_method")
+have_func("SSLv23_method")
+have_func("SSLv23_server_method")
+have_func("SSLv23_client_method")
have_func("TLSv1_1_method")
have_func("TLSv1_1_server_method")
have_func("TLSv1_1_client_method")

2
lang/ruby22/Makefile
View File

@ -207,7 +207,7 @@ post-install:
#
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
. for FILE in ${INSTALLED_SCRIPTS}
${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
. endfor
.endif

15
lang/ruby22/files/patch-ext_openssl_extconf.rb Normal file
View File

@ -0,0 +1,15 @@
--- ext/openssl/extconf.rb.orig 2015-04-01 22:28:09 UTC
+++ ext/openssl/extconf.rb
@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id")
have_func("SSL_SESSION_cmp")
have_func("OPENSSL_cleanse")
-have_func("SSLv2_method")
-have_func("SSLv2_server_method")
-have_func("SSLv2_client_method")
+have_func("SSLv23_method")
+have_func("SSLv23_server_method")
+have_func("SSLv23_client_method")
have_func("TLSv1_1_method")
have_func("TLSv1_1_server_method")
have_func("TLSv1_1_client_method")