[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/

["Florian Schmaus" <flow@gentoo.org>]

commit:     5ca790be25e7ecac2bcfe9abefc8adb850821a83
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Dec  9 08:30:18 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 10:18:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca790be

dev-java/fop: drop 2.9-r1 - CVE-2024-28168

Bug: https://bugs.gentoo.org/941239
Bug: https://bugs.gentoo.org/945127
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/fop/Manifest          |   3 -
 dev-java/fop/fop-2.9-r1.ebuild | 201 -----------------------------------------
 2 files changed, 204 deletions(-)

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index ab5e905bc3fb..22c0a4d70524 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,7 +1,4 @@
 DIST fop-2.10-jars.tar.xz 7696 BLAKE2B aa5db0a4ee8b96e54e7beccccc21bd4559f2f228476ab65a12935fbbd69924e23296c1dfcf6e717b6031b9e21efd3aeed4df130ba5f8717ae47a1b0628013d59 SHA512 7c9d14f71e94e6a706c845d71a95adcbf0c77934618d9ce070dfd677adf8d2f171ab6e16954db684dc1781f91719e194382a629274435ecef3d3fbf0e5c7bae3
 DIST fop-2.10-src.tar.gz 20903590 BLAKE2B 5217edbabc255b2e37c6198ea7cdfb1344db0726c7156f73bdc5ac452c4c233c5280d263e65656cde92ce6aa52c8ea94e346d9d14535ca802fc37fe1475ba255 SHA512 c5ae25be3e3a4da01195e108dec66743ab6017967220db1f4e4300f79594d8144de23876eeac07b2068db75a60e1b25d10ddad48533bd0cd6cb9e110b519fcf6
 DIST fop-2.10-src.tar.gz.asc 833 BLAKE2B 70b200af6f3611b3dcd6da9d8728b12ee9a7bd4882919965c641e822cdd21510669cc98ace5d8caaa42e05347ae0d9b07384365377bbd4c5ca0b1edc07e2ff80 SHA512 ae9628cf9ca84d9c2ac1bfddcb4aec786985d3fdca16c2541e45690c81695ec5361dc1641a30572fc2d95defa69cab61a1992ab0d16843344411acb77835a73c
-DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
-DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
-DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
 DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3

diff --git a/dev-java/fop/fop-2.9-r1.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
deleted file mode 100644
index 5ae577be4523..000000000000
--- a/dev-java/fop/fop-2.9-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="
-	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
-	https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-	verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
-	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
-"
-S="${WORKDIR}/fop-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ~ppc64"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
-
-BDEPEND="
-	dev-java/xalan:0
-	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
-"
-
-CP_DEPEND="
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/batik:1.16
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	dev-java/fontbox:0
-	dev-java/javax-servlet-api:2.2
-	dev-java/qdox:1.12
-	dev-java/sun-jai-bin:0
-	dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:2
-		dev-java/pdfbox:0
-		dev-java/xmlunit:1
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch"
-	"${FILESDIR}/fop-2.9-PDFToUnicodeCMapTestCase.patch"
-	"${FILESDIR}/fop-2.9-MissingLanguageWarningTestCase.patch"
-	"${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch"
-)
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	java-pkg_clean
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	# while ant could install multiple jar files we only need ant.jar
-	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)"
-
-	JAVA_JAR_FILENAME="fop-util.jar"
-	JAVA_SRC_DIR="fop-util/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
-	rm -r target || die
-
-	JAVA_JAR_FILENAME="fop-events.jar"
-	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
-	JAVA_SRC_DIR="fop-events/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
-	rm -r target || die
-
-	JAVA_JAR_FILENAME="fop-core.jar"
-	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
-	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
-	JAVA_SRC_DIR="fop-core/src/main/java"
-	# Code generation according to
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
-	pushd fop-core/src/main/codegen/fonts > /dev/null || die
-		local fonts=$(find . -name "Courier*.xml" \
-			-o -name "Helvetica*.xml" \
-			-o -name "Times*.xml" \
-			-o -name "Symbol.xml" \
-			-o -name "ZapfDingbats.xml"
-			)
-		for font in ${fonts}; do \
-			xalan -XSLTC \
-				-IN $font \
-				-XSL font-file.xsl \
-				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
-		done
-		xalan -XSLTC \
-			-IN encodings.xml \
-			-XSL code-point-mapping.xsl \
-			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
-	popd > /dev/null || die
-	java-pkg-simple_src_compile
-
-	# Update "fop-core.jar" with "event-mode.xml" files produced manually
-	# by running "mvn package".
-	# Upstream does this with maven-antrun-plugin:
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
-	mkdir event-model && pushd $_ > /dev/null || die
-		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
-	popd > /dev/null || die
-
-	jar -uf "fop-core.jar" -C event-model . || die
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
-	rm -r target || die
-
-	if use doc; then \
-		JAVA_SRC_DIR=(
-			"fop-util/src/main/java"
-			"fop-events/src/main/java"
-			"fop-core/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
-
-	einfo "Testing fop-events"
-	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
-	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
-	# This jar file was created manually from the output of "mvn test".
-	# Upstream does this with maven-antrun-plugin
-	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
-	mkdir generated-test || die
-	mv {target/test-classes,generated-test}/org || die
-	java-pkg-simple_src_test
-
-	einfo "Testing fop-core"
-	pushd fop-core/src/test/java > /dev/null || die
-		# Excluding one test, see https://bugs.gentoo.org/903880
-		local JAVA_TEST_RUN_ONLY=$(find * -type f \
-			-name "*TestCase.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-		local vm_version="$(java-config -g PROVIDES_VERSION)"
-		# these tests would fail with java.lang.NoSuchMethodError if compiled with jdk-1.8
-		if ver_test "${vm_version}" -eq "1.8"; then
-			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.render.pdf.PDFEncodingTestCase}
-			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.fonts.truetype.OTFToType1TestCase}
-#			org.apache.fop.render.pdf.PDFEncodingTestCase
-#			org.apache.fop.fonts.truetype.OTFToType1TestCase
-		fi
-	popd > /dev/null || die
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
-	# <workingDirectory>../fop</workingDirectory>
-	pushd fop > /dev/null || die
-		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
-		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
-		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
-		java-pkg-simple_src_test
-	popd > /dev/null || die
-}
-
-src_install() {
-	local module
-	for module in fop-util fop-events fop-core ; do
-		java-pkg_dojar "${module}.jar"
-		if use source; then
-			java-pkg_dosrc "${module}/src/main/java/*"
-		fi
-	done
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
-	einstalldocs
-}