[Git][java-team/netty][master] 3 commits: Add patch to address FTBFS with JDK 17 (Closes: #1011135)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / netty


Commits:
d3ff8bf6 by tony mancill at 2022-05-25T22:07:45-07:00
Add patch to address FTBFS with JDK 17 (Closes: #1011135)

- - - - -
d6f46a95 by tony mancill at 2022-05-25T22:08:45-07:00
Freshen years in debian/copyright

- - - - -
3be76cb2 by tony mancill at 2022-05-25T22:09:36-07:00
Prepare changelog for upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- + debian/patches/21-java-17.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+netty (1:4.1.48-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS on Java 17 (Closes: #1011135)
+
+ -- tony mancill <tmancill at debian.org>  Wed, 25 May 2022 22:09:22 -0700
+
 netty (1:4.1.48-4) unstable; urgency=high
 
   * Team upload.


=====================================
debian/copyright
=====================================
@@ -127,8 +127,8 @@ License: BSD-3-clause
 Files: debian/*
 Copyright: 2009, Thierry Carrez <thierry.carrez at ubuntu.com>
            2011, Damien Raude-Morvan <drazzib at debian.org>
-           2015-2018, Emmanuel Bourg <ebourg at apache.org>
-           2016-2017, tony mancill <tmancill at debian.org>
+           2015-2022, Emmanuel Bourg <ebourg at apache.org>
+           2016-2022, tony mancill <tmancill at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/21-java-17.patch
=====================================
@@ -0,0 +1,17 @@
+Description: compile with JDK 17
+Source: https://github.com/netty/netty/commit/bb184794341255cf02f9b7156c5ad828b172fdab.patch
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011135
+Comment: No longer needed after updating upstream to 4.1.52 or later
+
+--- a/handler/src/main/java/io/netty/handler/ssl/util/OpenJdkSelfSignedCertGenerator.java
++++ b/handler/src/main/java/io/netty/handler/ssl/util/OpenJdkSelfSignedCertGenerator.java
+@@ -66,7 +66,8 @@
+         info.set(X509CertInfo.VALIDITY, new CertificateValidity(notBefore, notAfter));
+         info.set(X509CertInfo.KEY, new CertificateX509Key(keypair.getPublic()));
+         info.set(X509CertInfo.ALGORITHM_ID,
+-                new CertificateAlgorithmId(new AlgorithmId(AlgorithmId.sha256WithRSAEncryption_oid)));
++                // sha256WithRSAEncryption
++                new CertificateAlgorithmId(AlgorithmId.get("1.2.840.113549.1.1.11")));
+ 
+         // Sign the cert to identify the algorithm that's used.
+         X509CertImpl cert = new X509CertImpl(info);


=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@
 CVE-2021-21290.patch
 CVE-2021-21295.patch
 CVE-2021-21409.patch
+21-java-17.patch



View it on GitLab: https://salsa.debian.org/java-team/netty/-/compare/96ba0b4c395222998f6e7b6f9a593d2b766b6fec...3be76cb25da9ead045f7efae226d1c099efd978e

-- 
View it on GitLab: https://salsa.debian.org/java-team/netty/-/compare/96ba0b4c395222998f6e7b6f9a593d2b766b6fec...3be76cb25da9ead045f7efae226d1c099efd978e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220526/3151c201/attachment.htm>