Merge ~vpa1977/ubuntu/+source/android-platform-tools-base:ubuntu/devel into ubuntu/+source/android-platform-tools-base:ubuntu/devel

[Vladimir Petko]

This MP resolves ftbfs due to sun.security and BouncyCastle API changes.

PPA: ppa:vpa1977/plusone [1]

Changes:
 - resolve ftbfs due to BouncyCastle and internal Java API changes.

Testing:
 - package builds [2]
 - piuparts test [3]
 - rebuild kotlin (build-dep)[4]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15840966/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/android-platform-tools-base/+bug/2056088/comments/1
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+build/27880378

[Pushkar Kulkarni (pushkarnk)]

The changes LGTM.

The upstream release that we currently include seems to be quite old (2016) [1]. I couldn't find newer releases. Might make sense to check and confirm if we really need to maintain this package, going forward.

[1] https://android.googlesource.com/platform/tools/base/+/refs/tags/studio-2.2.2

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 175b081..c11c862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+android-platform-tools-base (2.2.2-4ubuntu1) noble; urgency=medium
+
+  * Resolve the failure to build from source (LP: #2056088):
+    - d/p/{der-output-stream.patch, add-exports.patch}: sun.security
+      PKCS7 class now only supports encoding to DerOutputStream.
+      Explicitly instantiate it.
+    - d/p/bouncycastle177-compat.patch: use ASN1OutputStream instead
+      of remove DerOutputStream.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 06 Mar 2024 13:16:37 +1300
+
 android-platform-tools-base (2.2.2-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 76cb394..95e3524 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: android-platform-tools-base
 Section: java
 Priority: optional
-Maintainer: Android Tools Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Android Tools Maintainers <[e-mail]>
 Uploaders: Hans-Christoph Steiner <[e-mail]>,
 Build-Depends:
  antlr3,
diff --git a/debian/patches/add-exports.patch b/debian/patches/add-exports.patch
index 6d46ed2..9705b7e 100644
--- a/debian/patches/add-exports.patch
+++ b/debian/patches/add-exports.patch
@@ -5,7 +5,7 @@
  }
  
 +compileJava {
-+    options.compilerArgs << '--add-exports' << 'java.base/sun.security.pkcs=ALL-UNNAMED' << '--add-exports' << 'java.base/sun.security.x509=ALL-UNNAMED'
++    options.compilerArgs << '--add-exports' << 'java.base/sun.security.pkcs=ALL-UNNAMED' << '--add-exports' << 'java.base/sun.security.x509=ALL-UNNAMED' << '--add-exports' << 'java.base/sun.security.util=ALL-UNNAMED'
 +}
 +
  task initSdkForTests(type: JavaExec) {
diff --git a/debian/patches/bouncycastle177-compat.patch b/debian/patches/bouncycastle177-compat.patch
new file mode 100644
index 0000000..60d6038
--- /dev/null
+++ b/debian/patches/bouncycastle177-compat.patch
@@ -0,0 +1,57 @@
+Description: bouncycastle 1.77 compatibility patch
+ Remove usages of DerOutputStream that is no longer public.
+Author: Vladimir Petko <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/android-platform-tools-base/+bug/2056088
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058331
+Forwarded: not-needed
+Last-Update: 2024-03-06
+
+--- a/build-system/builder/src/main/java/com/android/builder/internal/packaging/sign/SignatureExtension.java
++++ b/build-system/builder/src/main/java/com/android/builder/internal/packaging/sign/SignatureExtension.java
+@@ -29,7 +29,8 @@
+ 
+ import org.apache.commons.codec.binary.Base64;
+ import org.bouncycastle.asn1.ASN1InputStream;
+-import org.bouncycastle.asn1.DEROutputStream;
++import org.bouncycastle.asn1.ASN1OutputStream;
++import org.bouncycastle.asn1.ASN1Encoding;
+ import org.bouncycastle.cert.jcajce.JcaCertStore;
+ import org.bouncycastle.cms.CMSException;
+ import org.bouncycastle.cms.CMSProcessableByteArray;
+@@ -610,12 +611,12 @@
+         /*
+          * DEROutputStream is not closeable! OMG!
+          */
+-        DEROutputStream dos = null;
++        ASN1OutputStream dos = null;
+         try (ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded())) {
+-            dos = new DEROutputStream(outputBytes);
++            dos = ASN1OutputStream.create(outputBytes, ASN1Encoding.DER);
+             dos.writeObject(asn1.readObject());
+ 
+-            DEROutputStream toClose = dos;
++            ASN1OutputStream toClose = dos;
+             dos = null;
+             toClose.close();
+         } catch (IOException e) {
+--- a/build-system/builder/src/main/java/com/android/builder/signing/SignedJarApkCreator.java
++++ b/build-system/builder/src/main/java/com/android/builder/signing/SignedJarApkCreator.java
+@@ -33,7 +33,8 @@
+ import com.google.common.io.Files;
+ 
+ import org.bouncycastle.asn1.ASN1InputStream;
+-import org.bouncycastle.asn1.DEROutputStream;
++import org.bouncycastle.asn1.ASN1OutputStream;
++import org.bouncycastle.asn1.ASN1Encoding;
+ import org.bouncycastle.cert.jcajce.JcaCertStore;
+ import org.bouncycastle.cms.CMSException;
+ import org.bouncycastle.cms.CMSProcessableByteArray;
+@@ -400,7 +401,7 @@
+         CMSSignedData sigData = gen.generate(data, false);
+ 
+         try (ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded())) {
+-            DEROutputStream dos = new DEROutputStream(mOutputJar);
++            ASN1OutputStream dos = ASN1OutputStream.create(mOutputJar, ASN1Encoding.DER);
+             try {
+                 dos.writeObject(asn1.readObject());
+             } finally {
diff --git a/debian/patches/der-output-stream.patch b/debian/patches/der-output-stream.patch
new file mode 100644
index 0000000..d711939
--- /dev/null
+++ b/debian/patches/der-output-stream.patch
@@ -0,0 +1,30 @@
+Description: workaround removal of pkcs7.encodeSignedData(OutputStream)
+  pkcs7.encodeSignedData(OutputStream) was removed in Java 21.
+  Explicitly instantiate DerOutputStream to encode pkcs7 contents.
+Author: Vladimir Petko <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/android-platform-tools-base/+bug/2056088
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058331
+Forwarded: not-needed
+Last-Update: 2024-03-06
+
+--- a/sdklib/src/main/java/com/android/sdklib/internal/build/SignedJarBuilder.java
++++ b/sdklib/src/main/java/com/android/sdklib/internal/build/SignedJarBuilder.java
+@@ -25,6 +25,7 @@
+ import sun.security.pkcs.SignerInfo;
+ import sun.security.x509.AlgorithmId;
+ import sun.security.x509.X500Name;
++import sun.security.util.DerOutputStream;
+
+ import java.io.BufferedOutputStream;
+ import java.io.ByteArrayOutputStream;
+@@ -394,6 +395,9 @@
+                 new X509Certificate[] { publicKey },
+                 new SignerInfo[] { signerInfo });
+
+-        pkcs7.encodeSignedData(mOutputJar);
++        try (DerOutputStream derout = new DerOutputStream()) {
++            pkcs7.encodeSignedData(derout);
++            mOutputJar.write(derout.toByteArray());
++        }
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2961d30..387aeb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@ gradle-compatibility.patch
 ecj-compatibility.patch
 asm-dependency.patch
 add-exports.patch
+der-output-stream.patch
+bouncycastle177-compat.patch