Bug#1066045: maven-bundle-plugin: diff for NMU version 3.5.1-2.1

[tony mancill]

On Wed, Mar 27, 2024 at 09:24:34PM -0700, tony mancill wrote:
> Thank you for the patch and the NMU.  Feel free to proceed with a 0-day
> upload if you'd prefer.

Resending - the prior reply was from me, but didn't have the correct
From: header.

Cheers,
tony


signature.asc
Description: PGP signature
__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#1066045: maven-bundle-plugin: diff for NMU version 3.5.1-2.1

[tony mancill]

On Wed, Mar 27, 2024 at 06:18:51PM +0100, Mattia Rizzolo wrote:
> I've prepared an NMU for maven-bundle-plugin (versioned as 3.5.1-2.1) and
> uploaded it to DELAYED/15. Please feel free to tell me if I
> should delay it longer.

Hi Mattia, hi James,

Thank you for the patch and the NMU.  Feel free to proceed with a 0-day
upload if you'd prefer.

I will import the changes into the repo and ACK the NMU with the next
upload.

Cheers,
tony


signature.asc
Description: PGP signature
__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Processed: tagging 1067188, tagging 1067795, tagging 1067796

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tags 1067188 + sid trixie
Bug #1067188 [src:gcc-mingw-w64] gdb-mingw-w64: FTBFS in trixie
Added tag(s) sid and trixie.
> tags 1067795 + sid trixie
Bug #1067795 [src:httpcomponents-client] httpcomponents-client: FTBFS: failing 
tests
Added tag(s) trixie and sid.
> tags 1067796 + sid trixie
Bug #1067796 [src:mailscripts] mailscripts: FTBFS: 
email-print-mime-structure:51: error: Unused "type: ignore" comment
Added tag(s) trixie and sid.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
1067188: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067188
1067795: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067795
1067796: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067796
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Processed: Re: maven-bundle-plugin: produces nondeterministic ordering in MANIFEST.MF headers

[Debian Bug Tracking System]

Processing control commands:

> forwarded -1 
> https://salsa.debian.org/java-team/maven-bundle-plugin/-/merge_requests/1
Bug #1066045 [libmaven-bundle-plugin-java] maven-bundle-plugin: produces 
nondeterministic ordering in MANIFEST.MF headers
Set Bug forwarded-to-address to 
'https://salsa.debian.org/java-team/maven-bundle-plugin/-/merge_requests/1'.
> tags -1 pending
Bug #1066045 [libmaven-bundle-plugin-java] maven-bundle-plugin: produces 
nondeterministic ordering in MANIFEST.MF headers
Ignoring request to alter tags of bug #1066045 to the same tags previously set

-- 
1066045: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066045
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#1066045: maven-bundle-plugin: produces nondeterministic ordering in MANIFEST.MF headers

[James Addison]

Followup-For: Bug #1066045
Control: forwarded -1 
https://salsa.debian.org/java-team/maven-bundle-plugin/-/merge_requests/1
Control: tags -1 pending

This change has recently been uploaded to DELAYED/15 by Mattia from the
Reproducible Builds team after I requested that; in addition I'm providing the
same change as a merge request on Salsa (adding this as the forwarded-to URL
for reference, although in this case the change itself is a backport from
upstream).

__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#1066045: maven-bundle-plugin: diff for NMU version 3.5.1-2.1

[Mattia Rizzolo]

Control: tags 1066045 + pending


Dear maintainer,

I've prepared an NMU for maven-bundle-plugin (versioned as 3.5.1-2.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
More about me:  https://mapreri.org : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for maven-bundle-plugin-3.5.1 maven-bundle-plugin-3.5.1

 changelog  |9 ++
 patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch |   33 ++
 patches/series |1 
 3 files changed, 43 insertions(+)

diff -Nru maven-bundle-plugin-3.5.1/debian/changelog maven-bundle-plugin-3.5.1/debian/changelog
--- maven-bundle-plugin-3.5.1/debian/changelog	2018-09-05 11:48:32.0 +0200
+++ maven-bundle-plugin-3.5.1/debian/changelog	2024-03-27 18:13:06.0 +0100
@@ -1,3 +1,12 @@
+maven-bundle-plugin (3.5.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from upstream to fix nondeterministic ordering in MANIFEST.MF
+headers.  Closes: #1066045
+Thanks to James Addison  for bringing up the patch.
+
+ -- Mattia Rizzolo   Wed, 27 Mar 2024 18:13:06 +0100
+
 maven-bundle-plugin (3.5.1-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru maven-bundle-plugin-3.5.1/debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch maven-bundle-plugin-3.5.1/debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch
--- maven-bundle-plugin-3.5.1/debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch	1970-01-01 01:00:00.0 +0100
+++ maven-bundle-plugin-3.5.1/debian/patches/0002-FELIX-6602-sort-resources-and-exported-packages.patch	2024-03-27 18:11:20.0 +0100
@@ -0,0 +1,33 @@
+From d885d99a6a16660f655a4fd18e8a1a39beef0a15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
+Date: Sat, 25 Mar 2023 00:18:11 +0100
+Subject: [PATCH] FELIX-6602 sort resources and exported packages
+
+---
+ .../java/org/apache/felix/bundleplugin/BundlePlugin.java | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+@@ -1938,6 +1938,7 @@ public class BundlePlugin extends AbstractMojo
+ scanner.scan();
+ 
+ String[] paths = scanner.getIncludedFiles();
++Arrays.sort( paths );
+ for ( int i = 0; i < paths.length; i++ )
+ {
+ packages.put( analyzer.getPackageRef( getPackageName( paths[i] ) ) );
+@@ -2076,7 +2077,9 @@ public class BundlePlugin extends AbstractMojo
+ scanner.addDefaultExcludes();
+ scanner.scan();
+ 
+-List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
++String[] f = scanner.getIncludedFiles();
++Arrays.sort( f );
++List includedFiles = Arrays.asList( f );
+ 
+ for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
+ {
+-- 
+2.43.0
+
diff -Nru maven-bundle-plugin-3.5.1/debian/patches/series maven-bundle-plugin-3.5.1/debian/patches/series
--- maven-bundle-plugin-3.5.1/debian/patches/series	2018-07-30 14:16:51.0 +0200
+++ maven-bundle-plugin-3.5.1/debian/patches/series	2024-03-27 18:11:24.0 +0100
@@ -4,3 +4,4 @@
 maven-archiver3-869361.patch
 maven3-compatibility.patch
 0001-Port-to-current-maven-dependency-tree.patch
+0002-FELIX-6602-sort-resources-and-exported-packages.patch


signature.asc
Description: PGP signature
__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Processing of maven-bundle-plugin_3.5.1-2.1_source.changes

[Debian FTP Masters]

maven-bundle-plugin_3.5.1-2.1_source.changes uploaded successfully to localhost
along with the files:
  maven-bundle-plugin_3.5.1-2.1.dsc
  maven-bundle-plugin_3.5.1-2.1.debian.tar.xz
  maven-bundle-plugin_3.5.1-2.1_amd64.buildinfo

Greetings,

Your Debian queue daemon (running on host usper.debian.org)

__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.

Processed: maven-bundle-plugin: diff for NMU version 3.5.1-2.1

[Debian Bug Tracking System]

Processing control commands:

> tags 1066045 + pending
Bug #1066045 [libmaven-bundle-plugin-java] maven-bundle-plugin: produces 
nondeterministic ordering in MANIFEST.MF headers
Added tag(s) pending.

-- 
1066045: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066045
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

__
This is the maintainer address of Debian's Java team
.
 Please use
debian-j...@lists.debian.org for discussions and questions.