commit: cf871a0fe233f9f9815ddb95a2dfcfe51d956d41 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Dec 25 09:52:25 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Dec 30 19:40:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf871a0f
dev-java/protobuf-java: drop 4.27.2 - CVE-2024-7254 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39900 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/protobuf-java/Manifest | 1 - dev-java/protobuf-java/protobuf-java-4.27.2.ebuild | 161 --------------------- 2 files changed, 162 deletions(-) diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 302f3af14e21..3303f6dde642 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,4 +1,3 @@ -DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643 diff --git a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild deleted file mode 100644 index 679d42cc7238..000000000000 --- a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.google.protobuf:protobuf-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev"; -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 4.27.2 from the 27.2 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -MY_PV4="${PV#4.}" -MY_PV="${MY_PV4/_rc/-rc}" -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/protobuf-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="java/core/src/main/resources" -JAVA_SRC_DIR="java/core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_SRC_DIR="java/core/src/test/java" - -run-protoc() { - if use system-protoc; then - protoc $1 - else - "${BUILD_DIR}"/protoc $1 - fi -} - -src_prepare() { - # If the corrsponding version of system-protoc is not available we build protoc locally - if use system-protoc; then - default # apply patches - else - cmake_src_prepare - fi - java-pkg-2_src_prepare - - # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if use system-protoc; then - : - else - cmake_src_configure - fi -} - -src_compile() { - if use system-protoc; then - : - else - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/pom.xml#L63-L71 - jar cvf testdata.jar \ - -C src google/protobuf/testdata/golden_message_oneof_implemented \ - -C src google/protobuf/testdata/golden_packed_fields_message || die - - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - # google/protobuf/java_features.proto: File not found. - cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - # java/core/src/test/java/editions_unittest/TestDelimited.java:2867: - # error: package editions_unittest.MessageImport does not exist - rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -}
