Accepting request 1207476 from Java:packages

1.18 needed by bsc#1231428, CVE-2024-28168

OBS-URL: https://build.opensuse.org/request/show/1207476
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-batik?expand=0&rev=33

0001-Fix-imageio-codec-lookup.patch

@@ -1,25 +0,0 @@
-From 02e469f660450b37300984ad7ac258dfa0111baa Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 27 Nov 2015 15:35:57 +0100
-Subject: [PATCH] Fix imageio codec lookup
-
----
- .../java/org/apache/batik/transcoder/image/PNGTranscoder.java   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
-index c25804e..7ea8c26 100644
---- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
-+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
-@@ -116,7 +116,7 @@ public class PNGTranscoder extends ImageTranscoder {
-                 "org.apache.batik.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter");
-         if (adapter == null) {
-             adapter = getWriteAdapter(
--                "org.apache.batik.transcoder.image.PNGTranscoderImageIOWriteAdapter");
-+                "org.apache.batik.ext.awt.image.codec.imageio.PNGTranscoderImageIOWriteAdapter");
-         }
-         if (adapter == null) {
-             throw new TranscoderException(
--- 
-2.17.0
-

xmlgraphics-batik.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sat Oct 12 16:20:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 1.18
+  * Needed by xmlgraphics-fop 2.10
+  * Changes
+    + BATIK-1225: PNG transcoder references nonexistent class
+    + BATIK-1285: Set offset to 0 if missing in stop tag
+    + BATIK-1318: Validate throws NPE
+    + BATIK-1355: Missing arabic characters
+    + BATIK-1361: Animated rotate tranform ignores y-origin at
+      exactly 270 degrees
+    + BATIK-1362: Set an automatic module name
+    + BATIK-1363: Ignore inkscape properties
+    + BATIK-1364: Switch to spotbugs
+    + FOP-3135: Allow source and target resolution configuration
+- Removed patch:
+  * 0001-Fix-imageio-codec-lookup.patch
+    + fixed upstream
+
+-------------------------------------------------------------------
+Thu Sep 19 11:26:34 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Specify a reproducible build.id
+- Clean the spec file and modernize it a bit
+
 -------------------------------------------------------------------
 Fri Mar  1 19:02:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

xmlgraphics-batik.spec

@@ -21,7 +21,7 @@
 %define _buildshell /bin/bash
 %global classpath xmlgraphics-batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
 Name:           xmlgraphics-batik
-Version:        1.17
+Version:        1.18
 Release:        0
 Summary:        Scalable Vector Graphics for Java
 License:        Apache-2.0
@@ -31,7 +31,6 @@ Source0:        http://archive.apache.org/dist/xmlgraphics/batik/source/batik-sr
 Source1:        batik-build.tar.xz
 Source7:        %{name}.security.policy
 Patch0:         %{name}-nolinksinjavadoc.patch
-Patch1:         0001-Fix-imageio-codec-lookup.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
@@ -165,7 +164,6 @@ find -name '*.class' -delete
 find -name '*.jar' -delete
 
 %patch -P 0 -p1
-%patch -P 1 -p1
 
 cp -p %{SOURCE7} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
 cp -p %{SOURCE7} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
@@ -196,25 +194,26 @@ rm -rf batik-script/src/main/java/org/apache/batik/script/jpython
 build-jar-repository -s lib js xml-apis xml-commons-apis-ext xmlgraphics-commons
 
 %build
-export CLASSPATH=
-export OPT_JAR_LIST=:
-%{ant} \
-    -f build-batik.xml -Dtest.skip=true \
-	package
-%{ant} \
+ant \
+    -f build-batik.xml \
+    -Dtest.skip=true \
+    package
+ant \
+    -Dbuild.id="%{version} ($(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ))" \
+    -Ddev=true \
     all-jar jars javadoc
 
 %install
 
 # jars
-mkdir -p %{buildroot}%{_javadir}/%{name}
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
 
 for dir in batik-%{version} batik-%{version}/lib batik-%{version}/extensions; do
   pushd ${dir}
     for jar in batik-*.jar; do
       basename=`basename ${jar} .jar`
       name=`echo ${basename} | sed -e 's/batik-//' | sed -e 's/-%{version}//' `
-      cp -p ${jar} %{buildroot}%{_javadir}/%{name}/${name}.jar
+      install -pm 0644 ${jar} %{buildroot}%{_javadir}/%{name}/${name}.jar
     done
   popd
 done
@@ -227,13 +226,7 @@ mv %{buildroot}%{_javadir}/%{name}/all.jar %{buildroot}%{_javadir}/%{name}-all.j
 ln -s %{name}-all.jar %{buildroot}%{_javadir}/batik-all.jar
 
 #pom
-mkdir -p %{buildroot}%{_mavenpomdir}/%{name}
-
-%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom
-%add_maven_depmap %{name}/parent.pom
-
-%{mvn_install_pom} batik-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-all.pom
-%add_maven_depmap %{name}-all.pom %{name}-all.jar
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 
 for i in anim awt-util bridge codec constants dom ext extension gvt i18n parser script shared-resources svg-dom svgbrowser svggen svgrasterizer swing transcoder util gui-util xml;
 do
@@ -241,27 +234,21 @@ do
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
 done
 
-cp -p batik-css/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/css.pom
-%add_maven_depmap %{name}/css.pom %{name}/css.jar -f css
-
-cp -p batik-svgpp/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/svgpp.pom
-%add_maven_depmap %{name}/svgpp.pom %{name}/svgpp.jar -f svgpp
-
-cp -p batik-ttf2svg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/ttf2svg.pom
-%add_maven_depmap %{name}/ttf2svg.pom %{name}/ttf2svg.jar -f ttf2svg
-
-cp -p batik-slideshow/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/slideshow.pom
-%add_maven_depmap %{name}/slideshow.pom %{name}/slideshow.jar -f slideshow
+for i in css svgpp ttf2svg slideshow;
+do
+  %{mvn_install_pom} batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
+done
 
 for i in squiggle squiggle-ext;
 do
-  cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %{mvn_install_pom} batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f squiggle
 done
 
 for i in rasterizer rasterizer-ext;
 do
-  cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+  %{mvn_install_pom} batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
   %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f rasterizer
 done
 
@@ -273,18 +260,18 @@ done
 %jpackage_script org.apache.batik.apps.slideshow.Main '' '' %{classpath} %{name}-slideshow true
 
 # demo
-mkdir -p %{buildroot}%{_datadir}/%{name}
+install -dm 0755 %{buildroot}%{_datadir}/%{name}
 cp -pr contrib samples test-resources \
   %{buildroot}%{_datadir}/%{name}
 %fdupes -s %{buildroot}%{_datadir}/%{name}
 ln -s %{name} %{buildroot}%{_datadir}/batik
 
 # policy
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-cp -p %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/rasterizer.policy
+install -dm 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -pm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/rasterizer.policy
 
 # javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr batik-%{version}/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
@@ -292,6 +279,7 @@ cp -pr batik-%{version}/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %license LICENSE NOTICE
 %doc KEYS MAINTAIN README
 %{_javadir}/batik-all.jar
+%{_javadir}/%{name}-all.jar
 
 %files css -f .mfiles-css