From nobody Mon Aug 07 23:40:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKXr65qscz4pm0H; Mon, 7 Aug 2023 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKXr63GzBz4XW8; Mon, 7 Aug 2023 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LpCINkQNg0OteRCyQM1244qVTIDMmz3SDA5SETnh4Y=; b=gNeZmHxfSiQrvvgcVHPHn23z2jyY7kF4L3KwdfBuoOwNXpf1tCV13ZLML5I7MAla7X9zpC JmDErx3kyzHBwwrWJ7yHfVmNdnHhzAwUMVeGikqZmR9RcZjQzy/bpEG7OoFd1SstGagXwZ GtHcRxWJZLAZCXtjLO1plgdNX34986kT9kbwO4Isj4Am7BP6BkHB7DHgnmyAwKzrdgykrz PbfC3Ff+J+KHBVCRR0BZaizLo49TQ5eGv+yUthy3tEqDIIWZThn4Xadtfbj6KjTuzsT7Eo LmzjzQUpsV+xxPAY9sTGd+8w6xhO60iPqGtspbhyovYYGqcbBoCpk9JRf3CH1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LpCINkQNg0OteRCyQM1244qVTIDMmz3SDA5SETnh4Y=; b=pYOnxTkYsVrJIg/aX2GQRiGrN8u89pC3kefCarS5vFOE0i9dEzWlkZDcqDwvH1kfJTP3P6 MoSkSpYqTv/wHGXllRt2nrTywuA0elfnEeYbun7/yxc6hewa+kV0hml/ADEa9TeTPoshO0 LuXmr6r4ovVHT5Ep/mZfoCO4r9T5AbvR+coSmhCzUIyH06lpa+kLLcAkvKbfbWT7Q7XzTi RChtDesA5voKa3Sbhb5ulYjnQSyIOJekvwc7ZuMjmDMFcX48cJayKFzBYu74RA3+5xfS4V 7nvPEEN8wvO2Vlrz/Bk0/6dCkhWsggmNHkIZ6WEbZcgBnjomBbSo0CPFfI1cLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691451638; a=rsa-sha256; cv=none; b=fm1UcLy+0bNeyN6dv8Ot3z95FpO+9AbzN5ElcbAKLXGtYzRq6n4YPOUiBEpAySEJBFoCCP pBEUa3aQQvSYf/atNrVuEsTYTb5Kew7pKLgvC2/wv7+YEHK30j7Zqf+JeLCuMfCIm5gFjx IrNreLK7dA9w3hY99q+cPRv2+CAMMW5IuE0awdCCvbC2JrXhP1i2fsX8E1hHDYWBziql/p yTOKo2DsJn2KIc5rv+c65ucPNRdXz+DB8Grz2pUNdUisCNeElR9EojjQR2NaqvUhEs95KG Ky07rj/lQ5SQhbFUiVbAxPB+nnrkkuUOcNQeRwJcPPrqU/9S11vmPj6iGOHm4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKXr62NCSz1BMJ; Mon, 7 Aug 2023 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377NecQ8052170; Mon, 7 Aug 2023 23:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Necwm052169; Mon, 7 Aug 2023 23:40:38 GMT (envelope-from git) Date: Mon, 7 Aug 2023 23:40:38 GMT Message-Id: <202308072340.377Necwm052169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9b1f7bf184f8 - main - lang/ruby30: Optionize OPENSSL module builds List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b1f7bf184f8bf29ca0da06d5afb392af4eefe8e Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1f7bf184f8bf29ca0da06d5afb392af4eefe8e commit 9b1f7bf184f8bf29ca0da06d5afb392af4eefe8e Author: Muhammad Moinur Rahman AuthorDate: 2023-08-07 18:41:45 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-07 22:00:18 +0000 lang/ruby30: Optionize OPENSSL module builds - ruby 3.0 do not have official OpenSSL 3 support although some other vendors are merging patches from 3.1. Untill there is something solid optionize OPENSSL to build openssl modules only on 12 and 13 while turning off for 14. - Utilize USES=localbase - Considering no upstream support for OpenSSL on ruby 3.0 reduce the EXPIRATION_DATE to 2024-03-30(Last day of official support) as there is no point in carrying this over to the next quarterly. Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- lang/ruby30/Makefile | 21 +++++++++++++-------- lang/ruby30/pkg-plist | 28 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index b4910dd85f9e..0fdc6bfcc2e5 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -17,16 +17,14 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL LICENSE_FILE_RUBY= ${WRKSRC}/COPYING DEPRECATED= Please migrate to newer versions. Ruby 3.0 will reach its EoL on March 30, 2024 -EXPIRATION_DATE=2024-04-30 +EXPIRATION_DATE=2024-03-30 # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ruby:none ssl tar:xz -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Do not build openssl module +USES= autoreconf cpe localbase ruby:none tar:xz CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -37,26 +35,28 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --with-sitedir="${PREFIX}/lib/ruby/site_ruby" \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= -CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. -LIBS+= -lpthread -L${LOCALBASE}/lib +LIBS+= -lpthread USE_LDCONFIG= yes WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.0 -OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC -OPTIONS_DEFAULT= RDOC LIBEDIT +OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPENSSL +OPTIONS_DEFAULT= RDOC LIBEDIT OPENSSL OPTIONS_SINGLE= EDIT OPTIONS_SINGLE_EDIT= LIBEDIT READLINE OPTIONS_SUB= yes +OPTIONS_EXCLUDE_FreeBSD_14= OPENSSL + CAPIDOCS_DESC= Build and install C API documents GMP_DESC= Use GMP to accelerate Bignum operations RDOC_DESC= Build and install Rdoc indexes EDIT_DESC= Which line editing lib to use LIBEDIT_DESC= Use libedit READLINE_DESC= Use libreadline + CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.13,2:devel/doxygen \ dot:graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi @@ -64,6 +64,7 @@ GMP_CONFIGURE_WITH= gmp GMP_LIB_DEPENDS= libgmp.so:math/gmp LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LOCALBASE} LIBEDIT_USES= libedit +OPENSSL_USES= ssl RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE} READLINE_USES= readline @@ -113,6 +114,10 @@ PKGNAMESUFFIX= ${RUBY_SUFFIX} PLIST_SUB+= IF_DEFAULT="@comment " .endif +.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} +OPTIONS_EXCLUDE= OPENSSL +.endif + INSTALLED_SCRIPTS= ruby INSTALLED_MANUALS= ruby diff --git a/lang/ruby30/pkg-plist b/lang/ruby30/pkg-plist index a2d40ba6c097..6cc84a998900 100644 --- a/lang/ruby30/pkg-plist +++ b/lang/ruby30/pkg-plist @@ -271,7 +271,7 @@ lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/monitor.so %%RUBY_ARCHLIBDIR%%/nkf.so %%RUBY_ARCHLIBDIR%%/objspace.so -%%RUBY_ARCHLIBDIR%%/openssl.so +%%OPENSSL%%%%RUBY_ARCHLIBDIR%%/openssl.so %%RUBY_ARCHLIBDIR%%/pathname.so %%RUBY_ARCHLIBDIR%%/psych.so %%RUBY_ARCHLIBDIR%%/pty.so @@ -472,19 +472,19 @@ lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/observer.rb %%RUBY_LIBDIR%%/open-uri.rb %%RUBY_LIBDIR%%/open3.rb -%%RUBY_LIBDIR%%/openssl.rb -%%RUBY_LIBDIR%%/openssl/bn.rb -%%RUBY_LIBDIR%%/openssl/buffering.rb -%%RUBY_LIBDIR%%/openssl/cipher.rb -%%RUBY_LIBDIR%%/openssl/config.rb -%%RUBY_LIBDIR%%/openssl/digest.rb -%%RUBY_LIBDIR%%/openssl/hmac.rb -%%RUBY_LIBDIR%%/openssl/marshal.rb -%%RUBY_LIBDIR%%/openssl/pkcs5.rb -%%RUBY_LIBDIR%%/openssl/pkey.rb -%%RUBY_LIBDIR%%/openssl/ssl.rb -%%RUBY_LIBDIR%%/openssl/version.rb -%%RUBY_LIBDIR%%/openssl/x509.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/bn.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/buffering.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/cipher.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/config.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/digest.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/hmac.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/marshal.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/pkcs5.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/pkey.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/ssl.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/version.rb +%%OPENSSL%%%%RUBY_LIBDIR%%/openssl/x509.rb %%RUBY_LIBDIR%%/optionparser.rb %%RUBY_LIBDIR%%/optparse.rb %%RUBY_LIBDIR%%/optparse/ac.rb