From owner-svn-ports-head@FreeBSD.ORG Wed Apr 1 23:26:13 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0B0AFA4; Wed, 1 Apr 2015 23:26:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2A5FC60; Wed, 1 Apr 2015 23:26:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t31NQDvx073543; Wed, 1 Apr 2015 23:26:13 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t31NQBKi073530; Wed, 1 Apr 2015 23:26:11 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504012326.t31NQBKi073530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Apr 2015 23:26:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382973 - in head: Mk lang/ruby20 lang/ruby20/files lang/ruby21 lang/ruby21/files lang/ruby22 lang/ruby22/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2015 23:26:14 -0000 Author: bdrewery Date: Wed Apr 1 23:26:10 2015 New Revision: 382973 URL: https://svnweb.freebsd.org/changeset/ports/382973 Log: - Fix runtime with OpenSSL after the removal of SSLv2 in head. - Make the main LOCALBASE/bin files into symlinks to the actual version to make it simpler to tell which version is default. Added: head/lang/ruby20/files/patch-ext_openssl_extconf.rb (contents, props changed) head/lang/ruby21/files/patch-ext_openssl_extconf.rb (contents, props changed) head/lang/ruby22/files/patch-ext_openssl_extconf.rb (contents, props changed) Modified: head/Mk/bsd.ruby.mk head/lang/ruby20/Makefile head/lang/ruby21/Makefile head/lang/ruby22/Makefile Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Wed Apr 1 23:24:50 2015 (r382972) +++ head/Mk/bsd.ruby.mk Wed Apr 1 23:26:10 2015 (r382973) @@ -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 Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Wed Apr 1 23:24:50 2015 (r382972) +++ head/lang/ruby20/Makefile Wed Apr 1 23:26:10 2015 (r382973) @@ -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 Added: head/lang/ruby20/files/patch-ext_openssl_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby20/files/patch-ext_openssl_extconf.rb Wed Apr 1 23:26:10 2015 (r382973) @@ -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") Modified: head/lang/ruby21/Makefile ============================================================================== --- head/lang/ruby21/Makefile Wed Apr 1 23:24:50 2015 (r382972) +++ head/lang/ruby21/Makefile Wed Apr 1 23:26:10 2015 (r382973) @@ -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 Added: head/lang/ruby21/files/patch-ext_openssl_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby21/files/patch-ext_openssl_extconf.rb Wed Apr 1 23:26:10 2015 (r382973) @@ -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") Modified: head/lang/ruby22/Makefile ============================================================================== --- head/lang/ruby22/Makefile Wed Apr 1 23:24:50 2015 (r382972) +++ head/lang/ruby22/Makefile Wed Apr 1 23:26:10 2015 (r382973) @@ -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 Added: head/lang/ruby22/files/patch-ext_openssl_extconf.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby22/files/patch-ext_openssl_extconf.rb Wed Apr 1 23:26:10 2015 (r382973) @@ -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")