From 576e7ccb580fada845892e69571b573624b3f1a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 24 Apr 2022 21:36:40 +0200 Subject: [PATCH 01/35] Update to upstream version 6.5.0 --- .gitignore | 1 + bcel.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 90ef3da..a4a9e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /bcel-6.3-src.tar.gz /bcel-6.3.1-src.tar.gz /bcel-6.4.1-src.tar.gz +/bcel-6.5.0-src.tar.gz diff --git a/bcel.spec b/bcel.spec index 54b1457..3a95f34 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel -Version: 6.4.1 -Release: 9%{?dist} +Version: 6.5.0 +Release: 1%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -37,6 +37,7 @@ This package provides %{summary}. %setup -q -n %{name}-%{version}-src %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :spotbugs-maven-plugin %mvn_alias : bcel: apache: %mvn_file : %{name} @@ -55,6 +56,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Sun Apr 24 2022 Mikolaj Izdebski - 6.5.0-1 +- Update to upstream version 6.5.0 + * Sat Feb 05 2022 Jiri Vanek - 6.4.1-9 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index d7a23b1..17a9a18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.4.1-src.tar.gz) = 746987c314d3a2bd7308e5cd0b3403c915f09b5127af5980f986a81bccff91cca6098b636fd2f337e8e42f1e3600e8eac14b4f3b0564739b155955603a2e9b7f +SHA512 (bcel-6.5.0-src.tar.gz) = c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d From da8d5fe6e516dadc7d2a0a643d78d85ae0df315d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 02/35] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- bcel.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/bcel.spec b/bcel.spec index 3a95f34..b8744ba 100644 --- a/bcel.spec +++ b/bcel.spec @@ -5,6 +5,7 @@ Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz From e4b7d5f2fef28951fcdbcfccb77e83ea1bbff877 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:50:29 +0000 Subject: [PATCH 03/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index b8744ba..0f13262 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -57,6 +57,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 6.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Apr 24 2022 Mikolaj Izdebski - 6.5.0-1 - Update to upstream version 6.5.0 From e999cebb931956749411e658780ce8d23e0895ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 04/35] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From d36f02eb2137a1646cfbba1bbb95b44e241bfc62 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Dec 2022 20:15:50 +0100 Subject: [PATCH 05/35] Fix arbitrary bytecode produced via out-of-bounds writing Resolves: CVE-2022-42920 --- 0001-CVE-2022-42920.patch | 67 +++++++++++++++++++++++++++++++++++++++ bcel.spec | 9 +++++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-CVE-2022-42920.patch diff --git a/0001-CVE-2022-42920.patch b/0001-CVE-2022-42920.patch new file mode 100644 index 0000000..8c64097 --- /dev/null +++ b/0001-CVE-2022-42920.patch @@ -0,0 +1,67 @@ +From 60a3e8874e1646c1198252e531029a6f78ff7a51 Mon Sep 17 00:00:00 2001 +From: Richard Atkins +Date: Wed, 21 Sep 2022 23:18:58 +1000 +Subject: [PATCH] CVE-2022-42920 + +--- + .../java/org/apache/bcel/classfile/ConstantPool.java | 11 +++++++++-- + .../java/org/apache/bcel/generic/ConstantPoolGen.java | 11 ++++++++++- + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/src/main/java/org/apache/bcel/classfile/ConstantPool.java b/src/main/java/org/apache/bcel/classfile/ConstantPool.java +index c2926c08..b4177771 100644 +--- a/src/main/java/org/apache/bcel/classfile/ConstantPool.java ++++ b/src/main/java/org/apache/bcel/classfile/ConstantPool.java +@@ -218,8 +218,15 @@ public class ConstantPool implements Cloneable, Node { + * @throws IOException + */ + public void dump( final DataOutputStream file ) throws IOException { +- file.writeShort(constantPool.length); +- for (int i = 1; i < constantPool.length; i++) { ++ /* ++ * Constants over the size of the constant pool shall not be written out. ++ * This is a redundant measure as the ConstantPoolGen should have already ++ * reported an error back in the situation. ++ */ ++ final int size = Math.min(constantPool.length, Const.MAX_CP_ENTRIES); ++ ++ file.writeShort(size); ++ for (int i = 1; i < size; i++) { + if (constantPool[i] != null) { + constantPool[i].dump(file); + } +diff --git a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java +index 5a09e0d3..ce783549 100644 +--- a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java ++++ b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java +@@ -95,7 +95,7 @@ public class ConstantPoolGen { + public ConstantPoolGen(final Constant[] cs) { + final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE); + +- size = Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64); ++ size = Math.min(Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64), Const.MAX_CP_ENTRIES + 1); + constants = new Constant[size]; + + System.arraycopy(cs, 0, constants, 0, cs.length); +@@ -224,9 +224,18 @@ public class ConstantPoolGen { + /** Resize internal array of constants. + */ + protected void adjustSize() { ++ // 3 extra spaces are needed as some entries may take 3 slots ++ if (index + 3 >= Const.MAX_CP_ENTRIES + 1) { ++ throw new IllegalStateException("The number of constants " + (index + 3) ++ + " is over the size of the constant pool: " ++ + Const.MAX_CP_ENTRIES); ++ } ++ + if (index + 3 >= size) { + final Constant[] cs = constants; + size *= 2; ++ // the constant array shall not exceed the size of the constant pool ++ size = Math.min(size, Const.MAX_CP_ENTRIES + 1); + constants = new Constant[size]; + System.arraycopy(cs, 0, constants, 0, index); + } +-- +2.38.1 + diff --git a/bcel.spec b/bcel.spec index 0f13262..6d131a4 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -9,6 +9,8 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz +Patch1: 0001-CVE-2022-42920.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -36,6 +38,7 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{version}-src +%patch1 -p1 %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :spotbugs-maven-plugin @@ -57,6 +60,10 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Thu Dec 01 2022 Mikolaj Izdebski - 6.5.0-3 +- Fix arbitrary bytecode produced via out-of-bounds writing +- Resolves: CVE-2022-42920 + * Wed Jul 20 2022 Fedora Release Engineering - 6.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a3fd64b78de3b14e6e395ade305b53976a22dd9f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Dec 2022 20:15:50 +0100 Subject: [PATCH 06/35] Fix arbitrary bytecode produced via out-of-bounds writing Resolves: CVE-2022-42920 --- 0001-CVE-2022-42920.patch | 71 +++++++++++++++++++++++++++++++++++++++ bcel.spec | 9 ++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 0001-CVE-2022-42920.patch diff --git a/0001-CVE-2022-42920.patch b/0001-CVE-2022-42920.patch new file mode 100644 index 0000000..4bbb9ee --- /dev/null +++ b/0001-CVE-2022-42920.patch @@ -0,0 +1,71 @@ +From 3a4e355796891149adfd9228633f179015293dbd Mon Sep 17 00:00:00 2001 +From: Richard Atkins +Date: Wed, 21 Sep 2022 23:18:58 +1000 +Subject: [PATCH] CVE-2022-42920 + +--- + .../org/apache/bcel/classfile/ConstantPool.java | 15 +++++++++++---- + .../org/apache/bcel/generic/ConstantPoolGen.java | 11 ++++++++++- + 2 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/src/main/java/org/apache/bcel/classfile/ConstantPool.java b/src/main/java/org/apache/bcel/classfile/ConstantPool.java +index f2c946a1..77ab0da4 100644 +--- a/src/main/java/org/apache/bcel/classfile/ConstantPool.java ++++ b/src/main/java/org/apache/bcel/classfile/ConstantPool.java +@@ -218,10 +218,17 @@ public class ConstantPool implements Cloneable, Node { + * @throws IOException + */ + public void dump( final DataOutputStream file ) throws IOException { +- file.writeShort(constant_pool.length); +- for (int i = 1; i < constant_pool.length; i++) { +- if (constant_pool[i] != null) { +- constant_pool[i].dump(file); ++ /* ++ * Constants over the size of the constant pool shall not be written out. ++ * This is a redundant measure as the ConstantPoolGen should have already ++ * reported an error back in the situation. ++ */ ++ final int size = Math.min(constant_pool.length, Const.MAX_CP_ENTRIES); ++ ++ file.writeShort(size); ++ for (int i = 1; i < size; i++) { ++ if (constant_pool[i] != null) { ++ constant_pool[i].dump(file); + } + } + } +diff --git a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java +index fd0af47e..d3189ba4 100644 +--- a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java ++++ b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java +@@ -95,7 +95,7 @@ public class ConstantPoolGen { + public ConstantPoolGen(final Constant[] cs) { + final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE); + +- size = Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64); ++ size = Math.min(Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64), Const.MAX_CP_ENTRIES + 1); + constants = new Constant[size]; + + System.arraycopy(cs, 0, constants, 0, cs.length); +@@ -224,9 +224,18 @@ public class ConstantPoolGen { + /** Resize internal array of constants. + */ + protected void adjustSize() { ++ // 3 extra spaces are needed as some entries may take 3 slots ++ if (index + 3 >= Const.MAX_CP_ENTRIES + 1) { ++ throw new IllegalStateException("The number of constants " + (index + 3) ++ + " is over the size of the constant pool: " ++ + Const.MAX_CP_ENTRIES); ++ } ++ + if (index + 3 >= size) { + final Constant[] cs = constants; + size *= 2; ++ // the constant array shall not exceed the size of the constant pool ++ size = Math.min(size, Const.MAX_CP_ENTRIES + 1); + constants = new Constant[size]; + System.arraycopy(cs, 0, constants, 0, index); + } +-- +2.38.1 + diff --git a/bcel.spec b/bcel.spec index 54b1457..cecb9d6 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.4.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -8,6 +8,8 @@ BuildArch: noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz +Patch1: 0001-CVE-2022-42920.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -35,6 +37,7 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{version}-src +%patch1 -p1 %pom_remove_plugin :maven-source-plugin @@ -55,6 +58,10 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Thu Dec 01 2022 Mikolaj Izdebski - 6.4.1-10 +- Fix arbitrary bytecode produced via out-of-bounds writing +- Resolves: CVE-2022-42920 + * Sat Feb 05 2022 Jiri Vanek - 6.4.1-9 - Rebuilt for java-17-openjdk as system jdk From 0542278fc4879b8b775c0c73a1a708ffc96ce8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:44:09 +0000 Subject: [PATCH 07/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 6d131a4..f2cf791 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 6.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 01 2022 Mikolaj Izdebski - 6.5.0-3 - Fix arbitrary bytecode produced via out-of-bounds writing - Resolves: CVE-2022-42920 From 142b1d96043bf66fbd542eb1f53f02e6ac0aa32f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:26:43 +0000 Subject: [PATCH 08/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index f2cf791..c37cb55 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 6.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 6.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8e90847c63a27406adfbba9efe9ff0d2fb7e4820 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 18 Aug 2023 09:21:02 +0200 Subject: [PATCH 09/35] Update to upstream version 6.7.0 --- .gitignore | 1 + bcel.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a4a9e6a..8bd5536 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /bcel-6.3.1-src.tar.gz /bcel-6.4.1-src.tar.gz /bcel-6.5.0-src.tar.gz +/bcel-6.7.0-src.tar.gz diff --git a/bcel.spec b/bcel.spec index c37cb55..507c99d 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel -Version: 6.5.0 -Release: 5%{?dist} +Version: 6.7.0 +Release: 1%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -9,8 +9,6 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz -Patch1: 0001-CVE-2022-42920.patch - BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -38,10 +36,10 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{version}-src -%patch1 -p1 %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :spotbugs-maven-plugin +%pom_remove_plugin :jacoco-maven-plugin %mvn_alias : bcel: apache: %mvn_file : %{name} @@ -60,6 +58,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-1 +- Update to upstream version 6.7.0 + * Wed Jul 19 2023 Fedora Release Engineering - 6.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 17a9a18..9f08da9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.5.0-src.tar.gz) = c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d +SHA512 (bcel-6.7.0-src.tar.gz) = 71f0e227dbc558296f535507b3640ce4c91dddf12ef06502b5fca95b35510b02d09ca649f121427b4b47deb96c2edfe0de70999261cffbcbe170a835730096a0 From f61b1896392349cd31b4a7ccd789e19f581321f6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 18 Aug 2023 14:21:34 +0200 Subject: [PATCH 10/35] Add missing build-requires --- bcel.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 507c99d..6cc1067 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Byte Code Engineering Library License: ASL 2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -10,7 +10,9 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz BuildRequires: maven-local +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description The Byte Code Engineering Library (formerly known as JavaClass) is @@ -58,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-2 +- Add missing build-requires + * Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-1 - Update to upstream version 6.7.0 From f02924b4823b4af7361707f02b5a8a48d4254e4c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:31 +0200 Subject: [PATCH 11/35] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- bcel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bcel.spec b/bcel.spec index 6cc1067..7bd235d 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,8 +1,8 @@ Name: bcel Version: 6.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Byte Code Engineering Library -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 6.7.0-3 +- Convert License tag to SPDX format + * Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-2 - Add missing build-requires From 69830a1f2e93ff8989e138c3a31f1cfb5568855f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 12/35] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From b8f75e8f0c4e0fe2c66ef3342d9c9163f2371c84 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 11 Dec 2023 13:42:50 +0100 Subject: [PATCH 13/35] Update to upstream version 6.8.0 --- .gitignore | 1 + 0001-CVE-2022-42920.patch | 67 --------------------------------------- bcel.spec | 7 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 0001-CVE-2022-42920.patch diff --git a/.gitignore b/.gitignore index 8bd5536..bec3885 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /bcel-6.4.1-src.tar.gz /bcel-6.5.0-src.tar.gz /bcel-6.7.0-src.tar.gz +/bcel-6.8.0-src.tar.gz diff --git a/0001-CVE-2022-42920.patch b/0001-CVE-2022-42920.patch deleted file mode 100644 index 8c64097..0000000 --- a/0001-CVE-2022-42920.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 60a3e8874e1646c1198252e531029a6f78ff7a51 Mon Sep 17 00:00:00 2001 -From: Richard Atkins -Date: Wed, 21 Sep 2022 23:18:58 +1000 -Subject: [PATCH] CVE-2022-42920 - ---- - .../java/org/apache/bcel/classfile/ConstantPool.java | 11 +++++++++-- - .../java/org/apache/bcel/generic/ConstantPoolGen.java | 11 ++++++++++- - 2 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/src/main/java/org/apache/bcel/classfile/ConstantPool.java b/src/main/java/org/apache/bcel/classfile/ConstantPool.java -index c2926c08..b4177771 100644 ---- a/src/main/java/org/apache/bcel/classfile/ConstantPool.java -+++ b/src/main/java/org/apache/bcel/classfile/ConstantPool.java -@@ -218,8 +218,15 @@ public class ConstantPool implements Cloneable, Node { - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { -- file.writeShort(constantPool.length); -- for (int i = 1; i < constantPool.length; i++) { -+ /* -+ * Constants over the size of the constant pool shall not be written out. -+ * This is a redundant measure as the ConstantPoolGen should have already -+ * reported an error back in the situation. -+ */ -+ final int size = Math.min(constantPool.length, Const.MAX_CP_ENTRIES); -+ -+ file.writeShort(size); -+ for (int i = 1; i < size; i++) { - if (constantPool[i] != null) { - constantPool[i].dump(file); - } -diff --git a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java -index 5a09e0d3..ce783549 100644 ---- a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java -+++ b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java -@@ -95,7 +95,7 @@ public class ConstantPoolGen { - public ConstantPoolGen(final Constant[] cs) { - final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE); - -- size = Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64); -+ size = Math.min(Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64), Const.MAX_CP_ENTRIES + 1); - constants = new Constant[size]; - - System.arraycopy(cs, 0, constants, 0, cs.length); -@@ -224,9 +224,18 @@ public class ConstantPoolGen { - /** Resize internal array of constants. - */ - protected void adjustSize() { -+ // 3 extra spaces are needed as some entries may take 3 slots -+ if (index + 3 >= Const.MAX_CP_ENTRIES + 1) { -+ throw new IllegalStateException("The number of constants " + (index + 3) -+ + " is over the size of the constant pool: " -+ + Const.MAX_CP_ENTRIES); -+ } -+ - if (index + 3 >= size) { - final Constant[] cs = constants; - size *= 2; -+ // the constant array shall not exceed the size of the constant pool -+ size = Math.min(size, Const.MAX_CP_ENTRIES + 1); - constants = new Constant[size]; - System.arraycopy(cs, 0, constants, 0, index); - } --- -2.38.1 - diff --git a/bcel.spec b/bcel.spec index 7bd235d..c8b37fa 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel -Version: 6.7.0 -Release: 3%{?dist} +Version: 6.8.0 +Release: 1%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Mon Dec 11 2023 Marian Koncek - 6.8.0-1 +- Update to upstream version 6.8.0 + * Fri Sep 01 2023 Mikolaj Izdebski - 6.7.0-3 - Convert License tag to SPDX format diff --git a/sources b/sources index 9f08da9..1f04241 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.7.0-src.tar.gz) = 71f0e227dbc558296f535507b3640ce4c91dddf12ef06502b5fca95b35510b02d09ca649f121427b4b47deb96c2edfe0de70999261cffbcbe170a835730096a0 +SHA512 (bcel-6.8.0-src.tar.gz) = fcec4920f841b9b22b7fe05190ed09a31e2edd32dbc9bc6217981af34fecab0725249bbaf0e5810e0c7ef8a347dbe07fa1dfc1a80a7b651368ad4ea852f54f6e From 1fe134b9ddcbd1e659485fae305a67c82bc75b3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:15:11 +0000 Subject: [PATCH 14/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index c8b37fa..6d2e443 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 6.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 11 2023 Marian Koncek - 6.8.0-1 - Update to upstream version 6.8.0 From 928b97e64a6d81427f27492867fbe01ddff83f72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:11:56 +0000 Subject: [PATCH 15/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 6d2e443..9a0abc9 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 6.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 6.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 87ff5c61abea2407abc35c7b2c89ef71b3672dd9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Feb 2024 09:56:06 +0100 Subject: [PATCH 16/35] Update to upstream version 6.8.1 --- .gitignore | 1 + bcel.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bec3885..8eddb0f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /bcel-6.5.0-src.tar.gz /bcel-6.7.0-src.tar.gz /bcel-6.8.0-src.tar.gz +/bcel-6.8.1-src.tar.gz diff --git a/bcel.spec b/bcel.spec index 9a0abc9..2dbdc62 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel -Version: 6.8.0 -Release: 3%{?dist} +Version: 6.8.1 +Release: 1%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Thu Feb 01 2024 Mikolaj Izdebski - 6.8.1-1 +- Update to upstream version 6.8.1 + * Tue Jan 23 2024 Fedora Release Engineering - 6.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1f04241..7bcd686 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.8.0-src.tar.gz) = fcec4920f841b9b22b7fe05190ed09a31e2edd32dbc9bc6217981af34fecab0725249bbaf0e5810e0c7ef8a347dbe07fa1dfc1a80a7b651368ad4ea852f54f6e +SHA512 (bcel-6.8.1-src.tar.gz) = 1a38f4603bfe8692e4fc71a911fbb37ddc30ee5afa270d4b36f0325879a555df2cab34e2abf38645a3c7b780e30dec516a0eac21a0d7e18ff412a5762282360e From 13ead7692506a19f08938e5f22c898c0e3a8acaf Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:58:07 +0100 Subject: [PATCH 17/35] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 2dbdc62..b67c516 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 6.8.1-2 +- Rebuilt for java-21-openjdk as system jdk + * Thu Feb 01 2024 Mikolaj Izdebski - 6.8.1-1 - Update to upstream version 6.8.1 From 6c0265959f97bd5bc71eeb63016d1b409ff3708f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 4 Jul 2024 10:03:40 +0200 Subject: [PATCH 18/35] Run upstream test suite as tmt tests We don't run upstream tests during the build, but we should at least run them during CI. --- gating.yaml | 1 + plans/smoke.fmf | 5 +++ tests/Sanity/upstream-tests/main.fmf | 7 ++++ tests/Sanity/upstream-tests/runtest.sh | 47 ++++++++++++++++++++++++++ tests/main.fmf | 5 +++ 5 files changed, 65 insertions(+) create mode 100644 plans/smoke.fmf create mode 100644 tests/Sanity/upstream-tests/main.fmf create mode 100755 tests/Sanity/upstream-tests/runtest.sh create mode 100644 tests/main.fmf diff --git a/gating.yaml b/gating.yaml index 0d484d7..7b6e38f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,4 +5,5 @@ decision_contexts: - bodhi_update_push_testing - bodhi_update_push_stable rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..a1e7bfd --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf new file mode 100644 index 0000000..c957ccd --- /dev/null +++ b/tests/Sanity/upstream-tests/main.fmf @@ -0,0 +1,7 @@ +summary: BCEL upstream tests +description: | + Run BCEL upstream tests that are packaged in the SRPM. +require: + - bcel + - javapackages-tools + - maven diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh new file mode 100755 index 0000000..b38cb6c --- /dev/null +++ b/tests/Sanity/upstream-tests/runtest.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + rlPhaseStartSetup + rlAssertRpm bcel + rlRun "pushd \$(mktemp -d)" + rlPhaseEnd + + rlPhaseStartTest "prepare test sources" + rlFetchSrcForInstalled bcel + srpm=$(echo bcel-*.src.rpm) + rlAssertExists ${srpm} + rlRun "rpm2cpio ${srpm} | cpio -id" + tarball=$(echo bcel-*.tar.gz) + rlAssertExists ${tarball} + rlRun "tar xf ${tarball}" + basedir=$(echo bcel-*-src) + rlAssertExists ${basedir}/ + jar=$(find-jar bcel) + rlAssertExists ${jar} + rlRun "mkdir ${basedir}/target" + rlRun "ln -s ${jar} ${basedir}/target/classes" + rlPhaseEnd + + mvn="mvn -V -B -f ${basedir}" + + rlPhaseStartTest "compile test sources" + rlRun -s "${mvn} compiler:testCompile" + rlAssertGrep "BUILD SUCCESS" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "generate test resources" + rlRun -s "${mvn} resources:testResources" + rlAssertGrep "BUILD SUCCESS" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "run tests" + rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,BCELifierTestCase" + rlAssertGrep "BUILD SUCCESS" $rlRun_LOG + rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..4116d53 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,5 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0 +component: bcel From 082cc9b608fb47d22d7ab87009a5366df9b64f1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:08:39 +0000 Subject: [PATCH 19/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index b67c516..d4ffc53 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 6.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 6.8.1-2 - Rebuilt for java-21-openjdk as system jdk From 51407939b05351f0aff2e940846586debf2c902c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 20/35] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From a9d43097522c543c7c923f68e0f3cbabe3230a6d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 21/35] Switch from %setup to %autosetup --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index d4ffc53..77b93ce 100644 --- a/bcel.spec +++ b/bcel.spec @@ -37,7 +37,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n %{name}-%{version}-src +%autosetup -p1 -n %{name}-%{version}-src %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :spotbugs-maven-plugin From 86f35c821ebd475f065fe079a3b8799f5c49e41d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:02 +0200 Subject: [PATCH 22/35] Convert to %autorelease and %autochangelog --- bcel.spec | 295 +----------------------------------------------------- changelog | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 294 insertions(+), 293 deletions(-) create mode 100644 changelog diff --git a/bcel.spec b/bcel.spec index 77b93ce..e0dadf6 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,6 +1,6 @@ Name: bcel Version: 6.8.1 -Release: 3%{?dist} +Release: %autorelease Summary: Byte Code Engineering Library License: Apache-2.0 URL: http://commons.apache.org/proper/commons-bcel/ @@ -60,295 +60,4 @@ This package provides %{summary}. %license LICENSE.txt NOTICE.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 6.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 6.8.1-2 -- Rebuilt for java-21-openjdk as system jdk - -* Thu Feb 01 2024 Mikolaj Izdebski - 6.8.1-1 -- Update to upstream version 6.8.1 - -* Tue Jan 23 2024 Fedora Release Engineering - 6.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 6.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Marian Koncek - 6.8.0-1 -- Update to upstream version 6.8.0 - -* Fri Sep 01 2023 Mikolaj Izdebski - 6.7.0-3 -- Convert License tag to SPDX format - -* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-2 -- Add missing build-requires - -* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-1 -- Update to upstream version 6.7.0 - -* Wed Jul 19 2023 Fedora Release Engineering - 6.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 6.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 01 2022 Mikolaj Izdebski - 6.5.0-3 -- Fix arbitrary bytecode produced via out-of-bounds writing -- Resolves: CVE-2022-42920 - -* Wed Jul 20 2022 Fedora Release Engineering - 6.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Apr 24 2022 Mikolaj Izdebski - 6.5.0-1 -- Update to upstream version 6.5.0 - -* Sat Feb 05 2022 Jiri Vanek - 6.4.1-9 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 6.4.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 6.4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jun 28 2021 Mikolaj Izdebski - 6.4.1-6 -- Remove dependency on jna - -* Tue Jan 26 2021 Fedora Release Engineering - 0:6.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0:6.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 0:6.4.1-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 0:6.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 6.4.1-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Oct 16 2019 Marian Koncek - 6.4.1-1 -- Update to upstream version 6.4.1 - -* Fri Oct 04 2019 Fabio Valentini - 0:6.4.1-1 -- Update to version 6.4.1. - -* Wed Jul 24 2019 Fedora Release Engineering - 0:6.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 6.3.1-2 -- Mass rebuild for javapackages-tools 201901 - -* Mon May 06 2019 Marian Koncek - 0:6.3.1-1 -- Update to upstream version 6.3.1 -- Fixes: RHBZ #1692150 - -* Tue Feb 05 2019 Marian Koncek - 0:6.3-1 -- Update to upstream version 6.3 -- Fixes: RHBZ #1670025 - -* Thu Jan 31 2019 Fedora Release Engineering - 0:6.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0:6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0:6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 10 2017 Michael Simacek - 0:6.2-1 -- Update to upstream version 6.2 - -* Fri Sep 22 2017 Mikolaj Izdebski - 0:6.1-2 -- Conditionally build without jna - -* Tue Sep 19 2017 Michael Simacek - 0:6.1-1 -- Update to upstream version 6.1 - -* Wed Jul 26 2017 Fedora Release Engineering - 0:6.0-0.7.20140406svn1592769 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0:6.0-0.6.20140406svn1592769 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 0:6.0-0.5.20140406svn1592769 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0:6.0-0.4.20140406svn1592769 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 11 2014 Mikolaj Izdebski - 0:6.0-0.3.20140406svn1592769 -- Add alias for apache:bcel - -* Sat Jun 07 2014 Fedora Release Engineering - 0:6.0-0.2.20140406svn1592769 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 06 2014 Michael Simacek - 0:6.0-0.1.20140406svn1592769 -- Update to upstream snapshot compatible with Java 8 - -* Sat Aug 03 2013 Fedora Release Engineering - 0:5.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 14 2013 Mikolaj Izdebski - 0:5.2-16 -- Complete spec file rewrite -- Build with Maven instead of Ant -- Remove manual subpackage - -* Wed Feb 13 2013 Fedora Release Engineering - 0:5.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 13 2012 Tom Callaway - 0:5.2-14 -- Package NOTICE.txt - -* Tue Aug 21 2012 Andy Grimm - 0:5.2-13 -- This package should not own _mavendepmapfragdir (RHBZ#850005) -- Build with maven, and clean up deprecated spec constructs -- Fix pom file (See http://jira.codehaus.org/browse/MEV-592) - -* Wed Jul 18 2012 Fedora Release Engineering - 0:5.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jun 24 2012 Gerard Ryan - 0:5.2-11 -- Inject OSGI Manifest. - -* Wed Jan 11 2012 Ville Skyttä - 0:5.2-10 -- Specify explicit source encoding to fix build with Java 7. -- Install jar and javadocs unversioned. -- Crosslink with JDK javadocs. - -* Mon Feb 07 2011 Fedora Release Engineering - 0:5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Alexander Kurtakov 0:5.2-8 -- Use global. -- Drop gcj_support. -- Fix groups. -- Fix build. - -* Fri Jul 24 2009 Fedora Release Engineering - 0:5.2-7.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 0:5.2-6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Dec 04 2008 Permaine Cheung 0:5.2-5.1 -- Do not install poms in /usr/share/maven2/default_poms - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:5.2-5 -- drop repotag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2 -- Autorebuild for GCC 4.3 - -* Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1 -- Merge with upstream - -* Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2 -- Fixed unowned directory (Bugzilla 246185) - -* Fri Nov 16 2007 Ralph Apel 0:5.2-3jpp -- Install poms unconditionally -- Add pom in ./maven2/default_poms -- Add org.apache.bcel:bcel depmap frag - -* Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1 -- Update to 5.2 in Fedora - -* Mon Sep 4 2007 Jason Corley 0:5.2-2jpp -- use official 5.2 release tarballs and location -- change vendor and distribution to macros -- add missing requires on and maven-plugin-test, maven-plugins-base, and - maven-plugin-xdoc -- macro bracket fixes -- remove demo subpackage (examples are not included in the distribution tarball) -- build in mock - -* Wed Jun 27 2007 Ralph Apel 0:5.2-1jpp -- Upgrade to 5.2 -- Drop bootstrap option: not necessary any more -- Add pom and depmap frags - -* Fri Feb 09 2007 Ralph Apel 0:5.1-10jpp -- Fix empty-%%post and empty-%%postun -- Fix no-cleaning-of-buildroot - -* Fri Feb 09 2007 Ralph Apel 0:5.1-9jpp -- Optionally build without maven -- Add bootstrap option - -* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp -- Add missing requires for Javadoc task - -* Sun Jul 23 2006 Matt Wringe 0:5.1-7jpp -- Add conditional native compilation -- Change spec file encoding from ISO-8859-1 to UTF-8 -- Add missing BR werken.xpath and ant-apache-regexp - -* Tue Apr 11 2006 Ralph Apel 0:5.1-6jpp -- First JPP-1.7 release -- Use tidyed sources from svn -- Add resources to build the manual -- Add examples to -demo subpackage -- Build with maven by default -- Add option to build with straight ant - -* Fri Nov 19 2004 David Walluck 0:5.1-5jpp -- rebuild to fix packager - -* Sat Nov 06 2004 David Walluck 0:5.1-4jpp -- rebuild with javac 1.4.2 - -* Sat Oct 16 2004 David Walluck 0:5.1-3jpp -- rebuild for JPackage 1.6 - -* Fri Aug 20 2004 Ralph Apel 0:5.1-2jpp -- Build with ant-1.6.2 - -* Sun May 11 2003 David Walluck 0:5.1-1jpp -- 5.1 -- update for JPackage 1.5 - -* Mon Mar 24 2003 Nicolas Mailhot - 5.0-6jpp -- For jpackage-utils 1.5 - -* Tue Feb 25 2003 Ville Skyttä - 5.0-5jpp -- Rebuild to get docdir right on modern distros. -- Fix License tag and source file perms. -- Built with IBM's 1.3.1SR3 (doesn't build with Sun's 1.4.1_01). - -* Tue Jun 11 2002 Henri Gomez 5.0-4jpp -- use sed instead of bash 2.x extension in link area to make spec compatible - with distro using bash 1.1x - -* Tue May 07 2002 Guillaume Rousse 5.0-3jpp -- vendor, distribution, group tags - -* Wed Jan 23 2002 Guillaume Rousse 5.0-2jpp -- section macro -- no dependencies for manual and javadoc package - -* Tue Jan 22 2002 Henri Gomez 5.0-1jpp -- bcel is now a jakarta apache project -- dependency on jakarta-regexp instead of gnu.regexp -- created manual package - -* Sat Dec 8 2001 Guillaume Rousse 4.4.1-2jpp -- javadoc into javadoc package -- Requires: and BuildRequires: gnu.regexp - -* Wed Nov 21 2001 Christian Zoffoli 4.4.1-1jpp -- removed packager tag -- new jpp extension -- 4.4.1 - -* Thu Oct 11 2001 Guillaume Rousse 4.4.0-2jpp -- first unified release -- used lower case for name -- used original tarball -- s/jPackage/JPackage - -* Mon Aug 27 2001 Guillaume Rousse 4.4.0-1mdk -- first Mandrake release +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..3aca486 --- /dev/null +++ b/changelog @@ -0,0 +1,292 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 6.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 6.8.1-2 +- Rebuilt for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 6.8.1-1 +- Update to upstream version 6.8.1 + +* Tue Jan 23 2024 Fedora Release Engineering - 6.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 6.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 11 2023 Marian Koncek - 6.8.0-1 +- Update to upstream version 6.8.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 6.7.0-3 +- Convert License tag to SPDX format + +* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-2 +- Add missing build-requires + +* Fri Aug 18 2023 Mikolaj Izdebski - 6.7.0-1 +- Update to upstream version 6.7.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 6.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 6.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 01 2022 Mikolaj Izdebski - 6.5.0-3 +- Fix arbitrary bytecode produced via out-of-bounds writing +- Resolves: CVE-2022-42920 + +* Wed Jul 20 2022 Fedora Release Engineering - 6.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 6.5.0-1 +- Update to upstream version 6.5.0 + +* Sat Feb 05 2022 Jiri Vanek - 6.4.1-9 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 6.4.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 6.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 28 2021 Mikolaj Izdebski - 6.4.1-6 +- Remove dependency on jna + +* Tue Jan 26 2021 Fedora Release Engineering - 0:6.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0:6.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:6.4.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 0:6.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 6.4.1-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Oct 16 2019 Marian Koncek - 6.4.1-1 +- Update to upstream version 6.4.1 + +* Fri Oct 04 2019 Fabio Valentini - 0:6.4.1-1 +- Update to version 6.4.1. + +* Wed Jul 24 2019 Fedora Release Engineering - 0:6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 6.3.1-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon May 06 2019 Marian Koncek - 0:6.3.1-1 +- Update to upstream version 6.3.1 +- Fixes: RHBZ #1692150 + +* Tue Feb 05 2019 Marian Koncek - 0:6.3-1 +- Update to upstream version 6.3 +- Fixes: RHBZ #1670025 + +* Thu Jan 31 2019 Fedora Release Engineering - 0:6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0:6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0:6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 10 2017 Michael Simacek - 0:6.2-1 +- Update to upstream version 6.2 + +* Fri Sep 22 2017 Mikolaj Izdebski - 0:6.1-2 +- Conditionally build without jna + +* Tue Sep 19 2017 Michael Simacek - 0:6.1-1 +- Update to upstream version 6.1 + +* Wed Jul 26 2017 Fedora Release Engineering - 0:6.0-0.7.20140406svn1592769 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0:6.0-0.6.20140406svn1592769 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 0:6.0-0.5.20140406svn1592769 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:6.0-0.4.20140406svn1592769 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 11 2014 Mikolaj Izdebski - 0:6.0-0.3.20140406svn1592769 +- Add alias for apache:bcel + +* Sat Jun 07 2014 Fedora Release Engineering - 0:6.0-0.2.20140406svn1592769 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 06 2014 Michael Simacek - 0:6.0-0.1.20140406svn1592769 +- Update to upstream snapshot compatible with Java 8 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:5.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 14 2013 Mikolaj Izdebski - 0:5.2-16 +- Complete spec file rewrite +- Build with Maven instead of Ant +- Remove manual subpackage + +* Wed Feb 13 2013 Fedora Release Engineering - 0:5.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 13 2012 Tom Callaway - 0:5.2-14 +- Package NOTICE.txt + +* Tue Aug 21 2012 Andy Grimm - 0:5.2-13 +- This package should not own _mavendepmapfragdir (RHBZ#850005) +- Build with maven, and clean up deprecated spec constructs +- Fix pom file (See http://jira.codehaus.org/browse/MEV-592) + +* Wed Jul 18 2012 Fedora Release Engineering - 0:5.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 24 2012 Gerard Ryan - 0:5.2-11 +- Inject OSGI Manifest. + +* Wed Jan 11 2012 Ville Skyttä - 0:5.2-10 +- Specify explicit source encoding to fix build with Java 7. +- Install jar and javadocs unversioned. +- Crosslink with JDK javadocs. + +* Mon Feb 07 2011 Fedora Release Engineering - 0:5.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 13 2010 Alexander Kurtakov 0:5.2-8 +- Use global. +- Drop gcj_support. +- Fix groups. +- Fix build. + +* Fri Jul 24 2009 Fedora Release Engineering - 0:5.2-7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0:5.2-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Dec 04 2008 Permaine Cheung 0:5.2-5.1 +- Do not install poms in /usr/share/maven2/default_poms + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:5.2-5 +- drop repotag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2 +- Autorebuild for GCC 4.3 + +* Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1 +- Merge with upstream + +* Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2 +- Fixed unowned directory (Bugzilla 246185) + +* Fri Nov 16 2007 Ralph Apel 0:5.2-3jpp +- Install poms unconditionally +- Add pom in ./maven2/default_poms +- Add org.apache.bcel:bcel depmap frag + +* Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1 +- Update to 5.2 in Fedora + +* Mon Sep 4 2007 Jason Corley 0:5.2-2jpp +- use official 5.2 release tarballs and location +- change vendor and distribution to macros +- add missing requires on and maven-plugin-test, maven-plugins-base, and + maven-plugin-xdoc +- macro bracket fixes +- remove demo subpackage (examples are not included in the distribution tarball) +- build in mock + +* Wed Jun 27 2007 Ralph Apel 0:5.2-1jpp +- Upgrade to 5.2 +- Drop bootstrap option: not necessary any more +- Add pom and depmap frags + +* Fri Feb 09 2007 Ralph Apel 0:5.1-10jpp +- Fix empty-%%post and empty-%%postun +- Fix no-cleaning-of-buildroot + +* Fri Feb 09 2007 Ralph Apel 0:5.1-9jpp +- Optionally build without maven +- Add bootstrap option + +* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp +- Add missing requires for Javadoc task + +* Sun Jul 23 2006 Matt Wringe 0:5.1-7jpp +- Add conditional native compilation +- Change spec file encoding from ISO-8859-1 to UTF-8 +- Add missing BR werken.xpath and ant-apache-regexp + +* Tue Apr 11 2006 Ralph Apel 0:5.1-6jpp +- First JPP-1.7 release +- Use tidyed sources from svn +- Add resources to build the manual +- Add examples to -demo subpackage +- Build with maven by default +- Add option to build with straight ant + +* Fri Nov 19 2004 David Walluck 0:5.1-5jpp +- rebuild to fix packager + +* Sat Nov 06 2004 David Walluck 0:5.1-4jpp +- rebuild with javac 1.4.2 + +* Sat Oct 16 2004 David Walluck 0:5.1-3jpp +- rebuild for JPackage 1.6 + +* Fri Aug 20 2004 Ralph Apel 0:5.1-2jpp +- Build with ant-1.6.2 + +* Sun May 11 2003 David Walluck 0:5.1-1jpp +- 5.1 +- update for JPackage 1.5 + +* Mon Mar 24 2003 Nicolas Mailhot - 5.0-6jpp +- For jpackage-utils 1.5 + +* Tue Feb 25 2003 Ville Skyttä - 5.0-5jpp +- Rebuild to get docdir right on modern distros. +- Fix License tag and source file perms. +- Built with IBM's 1.3.1SR3 (doesn't build with Sun's 1.4.1_01). + +* Tue Jun 11 2002 Henri Gomez 5.0-4jpp +- use sed instead of bash 2.x extension in link area to make spec compatible + with distro using bash 1.1x + +* Tue May 07 2002 Guillaume Rousse 5.0-3jpp +- vendor, distribution, group tags + +* Wed Jan 23 2002 Guillaume Rousse 5.0-2jpp +- section macro +- no dependencies for manual and javadoc package + +* Tue Jan 22 2002 Henri Gomez 5.0-1jpp +- bcel is now a jakarta apache project +- dependency on jakarta-regexp instead of gnu.regexp +- created manual package + +* Sat Dec 8 2001 Guillaume Rousse 4.4.1-2jpp +- javadoc into javadoc package +- Requires: and BuildRequires: gnu.regexp + +* Wed Nov 21 2001 Christian Zoffoli 4.4.1-1jpp +- removed packager tag +- new jpp extension +- 4.4.1 + +* Thu Oct 11 2001 Guillaume Rousse 4.4.0-2jpp +- first unified release +- used lower case for name +- used original tarball +- s/jPackage/JPackage + +* Mon Aug 27 2001 Guillaume Rousse 4.4.0-1mdk +- first Mandrake release From 73a80c65228ca2ec3928f361800715e235e9eeaa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 23/35] Use %autosetup -C --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index e0dadf6..090a01c 100644 --- a/bcel.spec +++ b/bcel.spec @@ -37,7 +37,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%autosetup -p1 -n %{name}-%{version}-src +%autosetup -p1 -C %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :spotbugs-maven-plugin From f683a413c602d28fcbe6ae47205aea26a6def1f0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 24/35] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 5da575499eb87c408a589bd80f7eeb6310568a42 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 25/35] Update javadoc package description [skip changelog] --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 090a01c..afa15b5 100644 --- a/bcel.spec +++ b/bcel.spec @@ -34,7 +34,7 @@ being the Xalan XSLT processor at Apache. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep %autosetup -p1 -C From 2b6cc05ee95ffb89be1fbb1906593fd29bdb9217 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 26/35] Switch upstream URL to https --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index afa15b5..27f8f67 100644 --- a/bcel.spec +++ b/bcel.spec @@ -3,7 +3,7 @@ Version: 6.8.1 Release: %autorelease Summary: Byte Code Engineering Library License: Apache-2.0 -URL: http://commons.apache.org/proper/commons-bcel/ +URL: https://commons.apache.org/proper/commons-bcel/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From d76c2191720b345bd5b8aab508faa1d29163e2b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:20:15 +0000 Subject: [PATCH 27/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 51b72a3336b2b3bda002e206dee81cd8831dd9d3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 28/35] Remove javadoc subpackage --- bcel.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/bcel.spec b/bcel.spec index 27f8f67..05dd62b 100644 --- a/bcel.spec +++ b/bcel.spec @@ -13,6 +13,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 6.8.1-14 %description The Byte Code Engineering Library (formerly known as JavaClass) is @@ -30,12 +32,6 @@ being used successfully in several projects such as compilers, optimizers, obsfuscators and analysis tools, the most popular probably being the Xalan XSLT processor at Apache. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -47,7 +43,7 @@ API documentation for %{name}. %mvn_file : %{name} %build -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -56,8 +52,5 @@ API documentation for %{name}. %doc RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From 83fb93cef29c3da1f992414b5ac1dd0f7d3d47d1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 29/35] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 422b9937d1eedd678d2c3689d8a3b08b31df0de7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 30/35] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 7d3479cb6116f073f2530b5eb15c1288a93f9cc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 31/35] Build with OpenJDK 25 --- bcel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 05dd62b..7bd0005 100644 --- a/bcel.spec +++ b/bcel.spec @@ -9,7 +9,7 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From 5a094ca60150c5b8ebdc68ee8fb93da5ee79ee15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Jul 2025 07:49:29 +0200 Subject: [PATCH 32/35] Update to upstream version 6.10.0 --- .gitignore | 1 + bcel.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8eddb0f..5b2eb60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /bcel-6.7.0-src.tar.gz /bcel-6.8.0-src.tar.gz /bcel-6.8.1-src.tar.gz +/bcel-6.10.0-src.tar.gz diff --git a/bcel.spec b/bcel.spec index 7bd0005..54856cc 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,5 +1,5 @@ Name: bcel -Version: 6.8.1 +Version: 6.10.0 Release: %autorelease Summary: Byte Code Engineering Library License: Apache-2.0 diff --git a/sources b/sources index 7bcd686..2a1c63f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bcel-6.8.1-src.tar.gz) = 1a38f4603bfe8692e4fc71a911fbb37ddc30ee5afa270d4b36f0325879a555df2cab34e2abf38645a3c7b780e30dec516a0eac21a0d7e18ff412a5762282360e +SHA512 (bcel-6.10.0-src.tar.gz) = 7ea129a048bf510ed15212a17680dfa37fe8c4adcc75504fa9a6ff35ef97d25f267547ad019fe146cd2fea9a3ef0eaca432d4c9cac7570ba5e68897f21c29a14 From 50d90c920ce5c53ca3b381aa37ffde193a3a06e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Jul 2025 08:47:25 +0200 Subject: [PATCH 33/35] Update tests for version 6.10.0 --- tests/Sanity/upstream-tests/main.fmf | 1 + tests/Sanity/upstream-tests/runtest.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Sanity/upstream-tests/main.fmf b/tests/Sanity/upstream-tests/main.fmf index c957ccd..a3a52fb 100644 --- a/tests/Sanity/upstream-tests/main.fmf +++ b/tests/Sanity/upstream-tests/main.fmf @@ -5,3 +5,4 @@ require: - bcel - javapackages-tools - maven + - cpio diff --git a/tests/Sanity/upstream-tests/runtest.sh b/tests/Sanity/upstream-tests/runtest.sh index b38cb6c..9c38473 100755 --- a/tests/Sanity/upstream-tests/runtest.sh +++ b/tests/Sanity/upstream-tests/runtest.sh @@ -38,7 +38,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "run tests" - rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,BCELifierTestCase" + rlRun -s "${mvn} surefire:test -Dsurefire.excludes=JdkGenericDumpTestCase,ConstantPoolModuleToStringTestCase,ConstantPoolModuleAccessTestCase,BCELifierTestCase" rlAssertGrep "BUILD SUCCESS" $rlRun_LOG rlAssertGrep "Failures: 0, Errors: 0" $rlRun_LOG rlPhaseEnd From 77100c6b1c53884c625ef5be531034a0d7831c61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:37:02 +0000 Subject: [PATCH 34/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 03a7be70c6d48193442b504ead9461a2b08ab8c4 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:49:10 +0200 Subject: [PATCH 35/35] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.