[netty-3.9] 05/18: Disabled NPN support

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty-3.9.

commit 651e0f075f5ff064566cf9b896fb2e4772fa6a59
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:03:52 2017 +0100

    Disabled NPN support
---
 debian/changelog                     |  1 +
 debian/maven.ignoreRules             |  1 +
 debian/patches/0002-ignore-npn.patch | 46 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index edefa30..68f9aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ netty-3.9 (3.9.2.Final-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patch
     - New dependency on libbcpkix-java
+    - Disabled NPN support (obsolete and missing dependencies)
   * Switch to debhelper level 10
   * Modified the watch file to track the 3.9.x releases from Git
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 6d9c70f..7d189d3 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,6 +14,7 @@ org.apache.maven.plugins maven-surefire-plugin * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.easymock easymock * * * *
 org.easymock easymockclassextension * * * *
+org.eclipse.jetty.npn npn-api * * * *
 org.jboss.logging jboss-logging-spi * * * *
 org.jboss.marshalling jboss-marshalling-river * * * *
 org.jboss.marshalling jboss-marshalling-serial * * * *
diff --git a/debian/patches/0002-ignore-npn.patch b/debian/patches/0002-ignore-npn.patch
new file mode 100644
index 0000000..d78f6c8
--- /dev/null
+++ b/debian/patches/0002-ignore-npn.patch
@@ -0,0 +1,46 @@
+Description: Disable the NPN support since it relies on jetty npn-api which isn't available in Debian (and deprecated anyway)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java
++++ b/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java
+@@ -165,7 +165,7 @@
+         if (nextProtocols().isEmpty()) {
+             return engine;
+         } else {
+-            return new JettyNpnSslEngine(engine, nextProtocols(), isServer());
++            throw new UnsupportedOperationException("NPN isn't supported");
+         }
+     }
+ 
+--- a/pom.xml
++++ b/pom.xml
+@@ -364,6 +364,7 @@
+             <exclude>org/jboss/netty/handler/codec/marshalling/**</exclude>
+             <exclude>org/jboss/netty/logging/JBossLogger*.java</exclude>
+             <exclude>org/jboss/netty/logging/OsgiLogger*.java</exclude>
++            <exclude>org/jboss/netty/handler/ssl/JettyNpnSsl*.java</exclude>
+           </excludes>
+         </configuration>
+       </plugin>
+--- a/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java
++++ b/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java
+@@ -108,7 +108,7 @@
+         super(bufPool, ciphers);
+ 
+         if (nextProtocols != null && nextProtocols.iterator().hasNext()) {
+-            if (!JettyNpnSslEngine.isAvailable()) {
++            if (true) {
+                 throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+             }
+ 
+--- a/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java
++++ b/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java
+@@ -104,7 +104,7 @@
+         }
+ 
+         if (nextProtocols != null && nextProtocols.iterator().hasNext()) {
+-            if (!JettyNpnSslEngine.isAvailable()) {
++            if (true) {
+                 throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+             }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 33b9af0..461d05e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Exclude-some-source-files.patch
+0002-ignore-npn.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-3.9.git