From 8381728a67e29343708be2a6bcd5bdb3f4a2bc34 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Fri, 23 May 2025 05:40:01 +0000 Subject: [PATCH 1/7] Upgrade: xz-java version to the 1.10 --- .../xz-java/xz-java-source-version.patch | 11 - .../xz-java/xz-java.signatures.json | 2 +- SPECS-EXTENDED/xz-java/xz-java.spec | 208 ++++++++++++++---- 3 files changed, 168 insertions(+), 53 deletions(-) delete mode 100644 SPECS-EXTENDED/xz-java/xz-java-source-version.patch diff --git a/SPECS-EXTENDED/xz-java/xz-java-source-version.patch b/SPECS-EXTENDED/xz-java/xz-java-source-version.patch deleted file mode 100644 index 2989f6eb311..00000000000 --- a/SPECS-EXTENDED/xz-java/xz-java-source-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xz-java-1.8.orig/build.properties 2016-11-26 22:39:44.000000000 +0100 -+++ xz-java-1.8/build.properties 2018-01-13 13:35:46.432055600 +0100 -@@ -17,7 +17,7 @@ - # The source code is Java 5 compatible but the oldest -source/-target pair - # that OpenJDK 9 supports is 1.6 (Java 6). Edit this if you are using - # OpenJDK 9 or later. --sourcever = 1.5 -+sourcever = 1.8 - - src_dir = src - build_dir = build diff --git a/SPECS-EXTENDED/xz-java/xz-java.signatures.json b/SPECS-EXTENDED/xz-java/xz-java.signatures.json index 048dedd3d25..dc1a314ec76 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.signatures.json +++ b/SPECS-EXTENDED/xz-java/xz-java.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "xz-java-1.8.zip": "86be97adf59d19c000c5bac8c77f2fa2f84fa082d608c7ad2d07a007dce76160" + "xz-java-1.10.zip": "c02a52da42f432fd5e9c8f30f8e0a9be775961d25740ec098b3f46b4d45f7fe5" } } diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index c74b4ade1de..94bf3119d45 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -1,7 +1,10 @@ +Vendor: Microsoft Corporation +Distribution: Azure Linux + # # spec file for package xz-java # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2013 Peter Conrad # # All modifications and additions to the file contributed by third parties @@ -16,25 +19,25 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Summary: Pure Java implementation of XZ compression + Name: xz-java -Version: 1.8 -Release: 5%{?dist} -License: Public Domain +Version: 1.10 +Release: 1%{?dist} +Summary: Pure Java implementation of XZ compression +License: 0BSD Group: Development/Libraries/Java -Vendor: Microsoft Corporation -Distribution: Azure Linux -URL: http://tukaani.org/xz/java.html -Source: http://tukaani.org/xz/xz-java-%{version}.zip -Patch0: xz-java-source-version.patch +URL: https://tukaani.org/xz/java.html +Source: https://tukaani.org/xz/xz-java-%{version}.zip BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local-bootstrap +BuildRequires: javapackages-local-bootstrap >= 6 BuildRequires: unzip + +Obsoletes: java-xz < %{version} +Provides: java-xz = %{version} + BuildArch: noarch -Provides: java-xz -Obsoletes: java-xz %description This is an implementation of XZ data compression in pure Java. @@ -50,78 +53,201 @@ This package contains the API documentation of xz-java. %prep %setup -q -c -n %{name} -%patch 0 -p1 %build sed -i 's/linkoffline="[^"]*"//;/extdoc_/d' build.xml ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 clean jar doc maven %install -# jar +# Install JAR install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 build/maven/xz-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -pm 0644 build/jar/xz.jar %{buildroot}%{_javadir}/%{name}.jar (cd %{buildroot}%{_javadir} && ln -s %{name}.jar xz.jar) -# pom + install -dm 0755 %{buildroot}%{_mavenpomdir} install -pm 0644 build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar -# javadoc + +# Install Javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} + +# Install license files +install -Dm 0644 COPYING %{buildroot}%{_licensedir}/%{name}/COPYING + %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license COPYING -%doc NEWS README THANKS + +%doc AUTHORS.md NEWS.md README.md THANKS.md REUSE.toml +%{_javadir}/xz-java.jar %{_javadir}/xz.jar %files javadoc %{_javadocdir}/%{name} + %changelog -* Mon Mar 28 2022 Cameron Baird - 1.8-5 -- Move to SPECS +* Tue May 20 2025 Durga Jagadeesh Palli - 1.10-1 +- Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag). - License verified -* Thu Oct 14 2021 Pawel Winogrodzki - 1.8-4 -- Converting the 'Release' tag to the '[number].[distribution]' format. +------------------------------------------------------------------- +Fri Aug 2 15:55:10 UTC 2024 - Anton Shvetz + +- Update to version 1.10 + * Licensing change: From version 1.10 onwards, XZ for Java is + under the BSD Zero Clause License (0BSD). 1.9 and older are in + the public domain and obviously remain so; the change only + affects the new releases. + 0BSD is an extremely permissive license which doesn't require + retaining or reproducing copyright or license notices when + distributing the code, thus in practice there is extremely + little difference to public domain. + * Mark copyright and license information in the source package so + that it is compliant to the REUSE Specification version 3.2. + * Improve LZMAInputStream.enableRelaxedEndCondition(): + + Error detection is slightly better. + + The input position will always be at the end of the stream + after successful decompression. + * Support .lzma files that have both a known uncompressed size + and the end marker. Such files are uncommon but valid. The same + issue was fixed in XZ Utils 5.2.6 in 2022. + * Add ARM64 and RISC-V BCJ filters. + * Speed optimizations: + + Delta filter + + LZMA/LZMA2 decoder + + LZMA/LZMA2 encoder (partially Java >= 9 only) + + CRC64 (Java >= 9 only) + * Changes that affect API/ABI compatibility: + + Change XZOutputStream constructors to not call the method + public void updateFilters(FilterOptions[] filterOptions). + + In SeekableXZInputStream, change the method public void + seekToBlock(int blockNumber) to not call the method public + long getBlockPos(int blockNumber). + + Make the filter options classes final: + ~ ARM64Options + ~ ARMOptions + ~ ARMThumbOptions + ~ DeltaOptions + ~ IA64Options + ~ LZMA2Options + ~ PowerPCOptions + ~ RISCVOptions + ~ SPARCOptions + ~ X86Options + * Add new system properties: + + org.tukaani.xz.ArrayCache sets the default ArrayCache: Dummy + (default) or Basic. See the documentation of ArrayCache and + BasicArrayCache. + + org.tukaani.xz.MatchLengthFinder (Java >= 9 only) sets the + byte array comparison method used for finding match lengths + in LZMA/LZMA2 encoder: UnalignedLongLE (default on x86-64 and + ARM64) or Basic (default on other systems). The former could + be worth testing on other 64-bit little endian systems that + support fast unaligned memory access. + * Build system (Apache Ant): + + Building the documentation no longer downloads element-list + or package-list file; the build is now fully offline. Such + files aren't needed with OpenJDK >= 16 whose javadoc can + auto-link to platform documentation on docs.oracle.com. With + older OpenJDK versions, links to platform documentation + aren't generated anymore. + + Don't require editing of build.properties to build with + OpenJDK 8. Now it's enough to use ant -Djava8only=true. Older + OpenJDK versions are no longer supported because the main + source tree uses Java 8 features. + + Support reproducible builds. See the notes in README.md. + + Add a new Ant target pom that only creates xz.pom. + + Change ant dist to use git archive to create a .zip file. + * Convert the plain text documentation in the source tree to + Markdown (CommonMark). + * The binaries of 1.10 in the Maven Central require Java 8 and + contain optimized classes for Java >= 9 as multi-release JAR. + They were built with OpenJDK 21.0.4 on GNU/Linux using the + following command: + SOURCE_DATE_EPOCH=1722262226 TZ=UTC0 ant maven + +------------------------------------------------------------------- +Thu Sep 21 06:43:05 UTC 2023 - Fridrich Strba + +- Build with java source/target levels 8 + +------------------------------------------------------------------- +Mon Dec 12 19:32:21 UTC 2022 - Anton Shvetz -* Thu Nov 12 2020 Joe Schmitt - 1.8-3.7 -- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag). -- Use javapackages-local-bootstrap to avoid build cycle. +- Update to version 1.9 + * Release notes at /usr/share/doc/packages/xz-java/NEWS +- Remove obsolete patch: + * xz-java-source-version.patch + +------------------------------------------------------------------- +Wed Feb 13 12:27:36 UTC 2019 - Klaus Kämpf -* Wed Feb 13 2019 Klaus Kämpf - add provides/obsoletes for xz-java (boo#1125298) -* Sat Jan 26 2019 Jan Engelhardt + +------------------------------------------------------------------- +Sat Jan 26 12:01:16 UTC 2019 - Jan Engelhardt + - Trim future goals from description. -* Wed Jan 9 2019 Fridrich Strba + +------------------------------------------------------------------- +Wed Jan 9 08:43:32 UTC 2019 - Fridrich Strba + - Modified patch: * java-3d_source_version.patch -> xz-java-source-version.patch + change name to correspond to reality -* Sat Oct 27 2018 Fridrich Strba + +------------------------------------------------------------------- +Sat Oct 27 19:12:19 UTC 2018 - Fridrich Strba + - renamed package to xz-java -* Tue Oct 23 2018 Fridrich Strba + +------------------------------------------------------------------- +Tue Oct 23 19:26:13 UTC 2018 - Fridrich Strba + - Update to 1.8 - Modified patch: * java-3d_source_version.patch - - Rediff to changed context -* Mon Oct 22 2018 Fridrich Strba + - Rediff to changed context + +------------------------------------------------------------------- +Mon Oct 22 12:45:47 UTC 2018 - Fridrich Strba + - Generate the maven pom files and install them -* Sat May 3 2014 ecsos@opensuse.org + +------------------------------------------------------------------- +Sat May 3 00:05:11 UTC 2014 - ecsos@opensuse.org + - update to 1.5 -* Mon Nov 11 2013 robertherb@arcor.de.de + +------------------------------------------------------------------- +Mon Nov 11 15:52:00 UTC 2013 - robertherb@arcor.de.de - Update to 1.4 - renamed package to java-xz -* Sat Aug 31 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Sat Aug 31 15:52:00 UTC 2013 - conrad@quisquis.de - Fixed Source header -* Sat Aug 31 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Sat Aug 31 10:24:00 UTC 2013 - conrad@quisquis.de - Upgrade to 1.3 -* Fri Apr 5 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Fri Apr 5 17:15:00 UTC 2013 - conrad@quisquis.de - Fixed fedora build deps - Fixed license string -* Thu Mar 28 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Thu Mar 28 13:51:00 UTC 2013 - conrad@quisquis.de - Disabled external links in javadoc -* Thu Mar 28 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Thu Mar 28 13:28:00 UTC 2013 - conrad@quisquis.de - Disabled download_files service - upstream server hangs -* Thu Mar 28 2013 conrad@quisquis.de + +------------------------------------------------------------------- +Thu Mar 28 13:01:00 UTC 2013 - conrad@quisquis.de - Initial project creation From 30da8be1450f38a37ed84638dd1a591d239ff4b4 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Fri, 23 May 2025 05:53:55 +0000 Subject: [PATCH 2/7] add the cgmanifest entry --- cgmanifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index 5250d2e4b6a..23689fe101e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -31109,8 +31109,8 @@ "type": "other", "other": { "name": "xz-java", - "version": "1.8", - "downloadUrl": "http://tukaani.org/xz/xz-java-1.8.zip" + "version": "1.10", + "downloadUrl": "https://tukaani.org/xz/xz-java-1.10.zip" } } }, From 31dc3bda9ae00f2c2381d45c23f891309a4dcf5f Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 26 May 2025 05:05:33 +0000 Subject: [PATCH 3/7] xz-java: fix the license error --- SPECS-EXTENDED/xz-java/xz-java.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index 94bf3119d45..8b05a928b06 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -59,35 +59,27 @@ sed -i 's/linkoffline="[^"]*"//;/extdoc_/d' build.xml ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 clean jar doc maven %install -# Install JAR +# jar install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 build/jar/xz.jar %{buildroot}%{_javadir}/%{name}.jar +install -pm 0644 build/maven/xz-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar (cd %{buildroot}%{_javadir} && ln -s %{name}.jar xz.jar) - +# pom install -dm 0755 %{buildroot}%{_mavenpomdir} install -pm 0644 build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar - -# Install Javadoc +# javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} - -# Install license files -install -Dm 0644 COPYING %{buildroot}%{_licensedir}/%{name}/COPYING - %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license COPYING - %doc AUTHORS.md NEWS.md README.md THANKS.md REUSE.toml -%{_javadir}/xz-java.jar %{_javadir}/xz.jar %files javadoc %{_javadocdir}/%{name} - %changelog * Tue May 20 2025 Durga Jagadeesh Palli - 1.10-1 - Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag). From 1744e7d9666bf35b833b201c078c7cf17a73596f Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 26 May 2025 07:42:43 +0000 Subject: [PATCH 4/7] xz-java: fix the license error by providing path --- SPECS-EXTENDED/xz-java/xz-java.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index 8b05a928b06..f13883a06bb 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -78,6 +78,8 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} %{_javadir}/xz.jar %files javadoc +%license %{_javadocdir}/%{name}/legal/LICENSE +%license %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO %{_javadocdir}/%{name} %changelog From 736a5a62f4eaa0478cb4484ad3cc6b3562cca8a3 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 26 May 2025 08:21:25 +0000 Subject: [PATCH 5/7] xz-java: fix the license error by cleaning the old license file --- SPECS-EXTENDED/xz-java/xz-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index f13883a06bb..c5d771a5b84 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -70,16 +70,19 @@ install -pm 0644 build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{nam # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} + +# remove duplicated license files from javadoc +rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/LICENSE +rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/ADDITIONAL_LICENSE_INFO + %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license COPYING -%doc AUTHORS.md NEWS.md README.md THANKS.md REUSE.toml +%doc NEWS.md README.md THANKS.md %{_javadir}/xz.jar %files javadoc -%license %{_javadocdir}/%{name}/legal/LICENSE -%license %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO %{_javadocdir}/%{name} %changelog From e225d11bbe9d526592cae19bb7d84003af20a9cc Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 26 May 2025 08:39:56 +0000 Subject: [PATCH 6/7] xz-java: fix the license error by excluding the license path in doc --- SPECS-EXTENDED/xz-java/xz-java.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index c5d771a5b84..c5ccfa7a03b 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -83,6 +83,11 @@ rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/ADDITIONAL_LICENSE_INFO %{_javadir}/xz.jar %files javadoc + +%exclude %{_javadocdir}/%{name}/legal/LICENSE +%exclude %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO +%{_javadocdir}/%{name} + %{_javadocdir}/%{name} %changelog From f4db22ac3d54720381cea5b88643b253e9db43a5 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 26 May 2025 10:11:57 +0000 Subject: [PATCH 7/7] xz-java: remove extra spaces --- SPECS-EXTENDED/xz-java/xz-java.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/SPECS-EXTENDED/xz-java/xz-java.spec b/SPECS-EXTENDED/xz-java/xz-java.spec index c5ccfa7a03b..41d8512b968 100644 --- a/SPECS-EXTENDED/xz-java/xz-java.spec +++ b/SPECS-EXTENDED/xz-java/xz-java.spec @@ -19,7 +19,6 @@ Distribution: Azure Linux # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - Name: xz-java Version: 1.10 Release: 1%{?dist} @@ -70,10 +69,9 @@ install -pm 0644 build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{nam # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} - # remove duplicated license files from javadoc -rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/LICENSE -rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/ADDITIONAL_LICENSE_INFO +rm -f %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE +rm -f %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO %fdupes -s %{buildroot}%{_javadocdir} @@ -83,13 +81,10 @@ rm -f %{{buildroot}}%{{_javadocdir}}/%{{name}}/legal/ADDITIONAL_LICENSE_INFO %{_javadir}/xz.jar %files javadoc - %exclude %{_javadocdir}/%{name}/legal/LICENSE %exclude %{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO %{_javadocdir}/%{name} -%{_javadocdir}/%{name} - %changelog * Tue May 20 2025 Durga Jagadeesh Palli - 1.10-1 - Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag).