Attachment 228469 Details for Bug 258108 – Patch ruby-gems 3.0.2 -> 3.2.26

[patch] Patch ruby-gems 3.0.2 -> 3.2.26

rubygems-patch-2021100501 (text/plain), 8.19 KB, created by mikeg on 2021-10-05 22:56:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mikeg

Created: 2021-10-05 22:56:41 UTC

Size: 8.19 KB

patch

obsolete

>diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
>index 8f6eceea3a04..278c7421e29d 100644
>--- a/devel/ruby-gems/Makefile
>+++ b/devel/ruby-gems/Makefile
>@@ -1,11 +1,11 @@
> # Created by: Alexander Novitsky <alecn2002@yandex.ru>
> 
> PORTNAME=	gems
>-PORTVERSION=	3.0.8
>+PORTVERSION=	3.2.26
> CATEGORIES=	devel ruby
> MASTER_SITES=	https://rubygems.org/rubygems/
> PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
>-DISTNAME=	rubygems-${PORTVERSION}
>+DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
> DIST_SUBDIR=	ruby
> 
> MAINTAINER=	ruby@FreeBSD.org
>@@ -19,24 +19,37 @@ LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
> USES=		cpe tar:tgz
> USE_RUBY=	yes
> 
>-GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
>-GEMS_ENV=	DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
> NO_ARCH=	yes
> NO_BUILD=	yes
> RUBY_SETUP=	setup.rb
>-RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} --no-regenerate-binstubs
> 
>-CACHE_DIR=	${GEMS_BASE_DIR}/cache
>-DOC_DIR=	${GEMS_BASE_DIR}/doc
>-EXT_DIR=	${GEMS_BASE_DIR}/extensions
>-GEMS_DIR=	${GEMS_BASE_DIR}/gems
>-SPEC_DIR=	${GEMS_BASE_DIR}/specifications
>+GEMS_BASE_DIR=		lib/ruby/gems
>+GEMS_BASE_DIR_P=	${GEMS_BASE_DIR}
>+GEMS_VER_DIR=		${GEMS_BASE_DIR}/${RUBY_VER}
>+GEMS_VER_DIR_P=		${GEMS_BASE_DIR_P}/%%RUBY_VER%%
>+GEMS_DOC_BASE_DIR=	${GEMS_VER_DIR}/doc
>+GEMS_DOC_BASE_DIR_P=	${GEMS_VER_DIR_P}/doc
>+GEMS_DOC_DIR=		${GEMS_DOC_BASE_DIR}/${DISTNAME}
>+GEMS_DOC_DIR_P=		${GEMS_DOC_BASE_DIR_P}/%%DISTNAME%%
>+GEMS_ENV=		DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
>+RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} --no-regenerate-binstubs --no-regenerate-plugins
>+RUBY_VER_SHORT=		${RUBY_VER:S/.//}
> 
>-PLIST_SUB=	CACHE_DIR="${CACHE_DIR}" \
>+GEMS_DIR=		${GEMS_VER_DIR}/gems
>+DOC_DIR=		${GEMS_VER_DIR}/doc
>+CACHE_DIR=		${GEMS_VER_DIR}/cache
>+SPEC_DIR=		${GEMS_VER_DIR}/specifications
>+EXT_DIR=		${GEMS_VER_DIR}/extensions
>+PLUGINS_DIR=		${GEMS_VER_DIR}/plugins
>+
>+PLIST_SUB=	DISTNAME="${DISTNAME}" \
>+		RUBY_VER_SHORT="${RUBY_VER_SHORT}" \
>+		GEMS_DIR="${GEMS_DIR}" \
> 		DOC_DIR="${DOC_DIR}" \
>+		CACHE_DIR="${CACHE_DIR}" \
>+		SPEC_DIR="${SPEC_DIR}" \
> 		EXT_DIR="${EXT_DIR}" \
>-		GEMS_DIR="${GEMS_DIR}" \
>-		SPEC_DIR="${SPEC_DIR}"
>+		PLUGINS_DIR="${PLUGINS_DIR}"
> 
> CPE_VENDOR=	rubygems
> CPE_PRODUCT=	rubygems
>@@ -45,19 +58,22 @@ OPTIONS_DEFINE=	DOCS
> 
> DOCS_VARS_OFF=	RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc"
> 
>-do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}
>+ do-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}/build_info
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${SPEC_DIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}
> 	cd ${WRKSRC}/ && ${SETENV} ${GEMS_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
>-	${LN} -sf gem${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/gem
>-
>+	${MV} ${STAGEDIR}${PREFIX}/bin/gem ${STAGEDIR}${PREFIX}/bin/gem${RUBY_VER_SHORT}
>+	${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem
>+
>+#
> # Find all RDOC and RI files
>-post-install-DOCS-on:
>-	cd ${STAGEDIR}${PREFIX}/ && ${FIND} -ds ${DOC_DIR}/ ! -type d >> ${TMPPLIST}
>+#
>+ post-install-DOCS-on:
>+	cd ${STAGEDIR}${PREFIX}/ && ${FIND} -ds ${GEMS_DOC_DIR}/ ! -type d >> ${TMPPLIST}
> 
> .include <bsd.port.mk>
>diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
>index b39eec5b0356..6d133abd58c2 100644
>--- a/devel/ruby-gems/distinfo
>+++ b/devel/ruby-gems/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1602602939
>-SHA256 (ruby/rubygems-3.0.8.tgz) = d9d3fa3f6fed192f408e551617f64cc615024edc70828b45edf88b0591987263
>-SIZE (ruby/rubygems-3.0.8.tgz) = 888058
>+TIMESTAMP = 1630101573
>+SHA256 (ruby/rubygems-3.2.26.tgz) = f706ba94e5a7b9af3305b9502918238e24d53d8a764d6d27ed73af816eeed5ef
>+SIZE (ruby/rubygems-3.2.26.tgz) = 1235987
>diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist
>index 3e04be24e353..fcae759bfae0 100644
>--- a/devel/ruby-gems/pkg-plist
>+++ b/devel/ruby-gems/pkg-plist
>@@ -1,5 +1,5 @@
> bin/gem
>-bin/gem%%RUBY_SUFFIX%%
>+bin/gem%%RUBY_VER_SHORT%%
> %%RUBY_SITELIBDIR%%/rubygems.rb
> %%RUBY_SITELIBDIR%%/rubygems/available_set.rb
> %%RUBY_SITELIBDIR%%/rubygems/basic_specification.rb
>@@ -46,6 +46,7 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb
> %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_require.rb
> %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_warn.rb
>+%%RUBY_SITELIBDIR%%/rubygems/core_ext/tcpsocket_init.rb
> %%RUBY_SITELIBDIR%%/rubygems/defaults.rb
> %%RUBY_SITELIBDIR%%/rubygems/dependency.rb
> %%RUBY_SITELIBDIR%%/rubygems/dependency_installer.rb
>@@ -68,10 +69,11 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/install_message.rb
> %%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb
> %%RUBY_SITELIBDIR%%/rubygems/installer.rb
>-%%RUBY_SITELIBDIR%%/rubygems/installer_test_case.rb
>+%%RUBY_SITELIBDIR%%/rubygems/installer_uninstaller_utils.rb
> %%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
> %%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb
> %%RUBY_SITELIBDIR%%/rubygems/name_tuple.rb
>+%%RUBY_SITELIBDIR%%/rubygems/openssl.rb
> %%RUBY_SITELIBDIR%%/rubygems/package.rb
> %%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb
> %%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb
>@@ -81,13 +83,13 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
> %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb
> %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb
>-%%RUBY_SITELIBDIR%%/rubygems/package/tar_test_case.rb
> %%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb
> %%RUBY_SITELIBDIR%%/rubygems/package_task.rb
> %%RUBY_SITELIBDIR%%/rubygems/path_support.rb
> %%RUBY_SITELIBDIR%%/rubygems/platform.rb
> %%RUBY_SITELIBDIR%%/rubygems/psych_additions.rb
> %%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb
>+%%RUBY_SITELIBDIR%%/rubygems/query_utils.rb
> %%RUBY_SITELIBDIR%%/rubygems/rdoc.rb
> %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
> %%RUBY_SITELIBDIR%%/rubygems/request.rb
>@@ -103,6 +105,7 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/resolver.rb
> %%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb
> %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb
>+%%RUBY_SITELIBDIR%%/rubygems/resolver/api_set/gem_parser.rb
> %%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb
> %%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb
> %%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb
>@@ -164,21 +167,18 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb
> %%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb
> %%RUBY_SITELIBDIR%%/rubygems/source_list.rb
>-%%RUBY_SITELIBDIR%%/rubygems/source_local.rb
>-%%RUBY_SITELIBDIR%%/rubygems/source_specific_file.rb
> %%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
> %%RUBY_SITELIBDIR%%/rubygems/specification.rb
> %%RUBY_SITELIBDIR%%/rubygems/specification_policy.rb
>-%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
>-%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
>-%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
>+%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/.document
>+%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
>+%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
> %%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
>-%%RUBY_SITELIBDIR%%/rubygems/syck_hack.rb
>-%%RUBY_SITELIBDIR%%/rubygems/test_case.rb
>-%%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb
> %%RUBY_SITELIBDIR%%/rubygems/text.rb
> %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
> %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
>+%%RUBY_SITELIBDIR%%/rubygems/uri_parser.rb
>+%%RUBY_SITELIBDIR%%/rubygems/uri_parsing.rb
> %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
> %%RUBY_SITELIBDIR%%/rubygems/util.rb
> %%RUBY_SITELIBDIR%%/rubygems/util/licenses.rb
>@@ -186,10 +186,10 @@ bin/gem%%RUBY_SUFFIX%%
> %%RUBY_SITELIBDIR%%/rubygems/validator.rb
> %%RUBY_SITELIBDIR%%/rubygems/version.rb
> %%RUBY_SITELIBDIR%%/rubygems/version_option.rb
>-%%RUBY_SITELIBDIR%%/ubygems.rb
> @dir lib/ruby/gems/%%RUBY_VER%%/build_info
> @dir %%CACHE_DIR%%
> @dir %%DOC_DIR%%
> @dir %%EXT_DIR%%
> @dir %%GEMS_DIR%%
>+@dir %%PLUGINS_DIR%%
> @dir %%SPEC_DIR%%

Actions: View | Diff

Attachments on bug 258108: 227498 | 228469 | 228480 | 228666 | 228667 | 228695 | 229025 | 229026 | 229073 | 229114 | 229210 | 229958 | 229977 | 230305 | 231355 | 231387 | 231896 | 231942