[netty3] Updated to netty 3.9.3
Marek Goldmann
goldmann at fedoraproject.org
Thu Feb 12 14:04:35 UTC 2015
commit 34f444d568854a853dab1ffc242948dc7d2ba1a8
Author: Jiri Vanek <jvanek at redhat.com>
Date: Thu Feb 12 14:36:42 2015 +0100
Updated to netty 3.9.3
- uploaded sources netty-3.10.0.Final-dist.tar.bz2 and netty-3.9.3.Final-dist.tar.bz2
- added and applied patch1, disableNPN.patch
- modified patch0 netty-port-to-jzlib-1.1.0.patch
- release reset to 0
- added build requires java-devel and bouncycastle-pkix
- xpathed out npn-api and os-maven-plugin
- xpathed out from netty-tcnative classifier and scope
- from sources removed JettyNpnSslEngine.java
.gitignore | 2 ++
disableNPN.patch | 38 ++++++++++++++++++++++++++++++++++++++
netty-port-to-jzlib-1.1.0.patch | 15 ---------------
netty3.spec | 33 ++++++++++++++++++++++++++++++---
sources | 2 +-
5 files changed, 71 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2c0d1d..eb1f14a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/netty-3.6.6.Final-dist.tar.bz2
+/netty-3.10.0.Final-dist.tar.bz2
+/netty-3.9.3.Final-dist.tar.bz2
diff --git a/disableNPN.patch b/disableNPN.patch
new file mode 100644
index 0000000..9160424
--- /dev/null
+++ b/disableNPN.patch
@@ -0,0 +1,38 @@
+diff -rupN netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java
+--- netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java 2014-08-06 20:56:29.000000000 +0200
++++ netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslClientContext.java 2015-01-30 08:23:00.394802892 +0100
+@@ -108,9 +108,6 @@ public final class JdkSslClientContext e
+ super(bufPool, ciphers);
+
+ if (nextProtocols != null && nextProtocols.iterator().hasNext()) {
+- if (!JettyNpnSslEngine.isAvailable()) {
+- throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+- }
+
+ List<String> nextProtoList = new ArrayList<String>();
+ for (String p: nextProtocols) {
+diff -rupN netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java
+--- netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java 2014-08-06 20:56:29.000000000 +0200
++++ netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslContext.java 2015-01-30 08:23:09.590641116 +0100
+@@ -165,7 +165,7 @@ public abstract class JdkSslContext exte
+ if (nextProtocols().isEmpty()) {
+ return engine;
+ } else {
+- return new JettyNpnSslEngine(engine, nextProtocols(), isServer());
++ return null;
+ }
+ }
+
+diff -rupN netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java
+--- netty-3.9.3.Final/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java 2014-08-06 20:56:29.000000000 +0200
++++ netty-3.9.3.Final-mod/src/main/java/org/jboss/netty/handler/ssl/JdkSslServerContext.java 2015-01-30 08:23:19.097473868 +0100
+@@ -114,9 +114,6 @@ public final class JdkSslServerContext e
+ }
+
+ if (nextProtocols != null && nextProtocols.iterator().hasNext()) {
+- if (!JettyNpnSslEngine.isAvailable()) {
+- throw new SSLException("NPN/ALPN unsupported: " + nextProtocols);
+- }
+
+ List<String> list = new ArrayList<String>();
+ for (String p: nextProtocols) {
diff --git a/netty-port-to-jzlib-1.1.0.patch b/netty-port-to-jzlib-1.1.0.patch
index 90fd7b2..1dff943 100644
--- a/netty-port-to-jzlib-1.1.0.patch
+++ b/netty-port-to-jzlib-1.1.0.patch
@@ -87,18 +87,3 @@ index 954edde..93d204f 100644
}
private ZlibUtil() {
-diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
-index 612419d..957649b 100644
---- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
-+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
-@@ -46,7 +46,7 @@ class SpdyHeaderBlockJZlibCompressor extends SpdyHeaderBlockCompressor {
- }
-
- int resultCode = z.deflateInit(
-- compressionLevel, windowBits, memLevel, JZlib.W_ZLIB);
-+ compressionLevel, windowBits, memLevel);
- if (resultCode != JZlib.Z_OK) {
- throw new CompressionException(
- "failed to initialize an SPDY header block deflater: " + resultCode);
---
-1.7.11.7
diff --git a/netty3.spec b/netty3.spec
index 6255c04..8480c30 100644
--- a/netty3.spec
+++ b/netty3.spec
@@ -2,13 +2,14 @@
%global namedversion %{version}%{?namedreltag}
Name: netty3
-Version: 3.6.6
-Release: 4%{?dist}
+Version: 3.9.3
+Release: 0%{?dist}
Summary: An asynchronous event-driven network application framework and tools for Java
License: ASL 2.0 and BSD
URL: https://netty.io/
Source0: http://netty.googlecode.com/files/netty-%{namedversion}-dist.tar.bz2
Patch0: netty-port-to-jzlib-1.1.0.patch
+Patch1: disableNPN.patch
BuildArch: noarch
@@ -23,6 +24,10 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: ant-contrib
+BuildRequires: netty-tcnative
+
+BuildRequires: java-devel
+BuildRequires: bouncycastle-pkix
BuildRequires: felix-osgi-compendium
BuildRequires: felix-osgi-core
@@ -33,6 +38,9 @@ BuildRequires: slf4j
BuildRequires: sonatype-oss-parent
BuildRequires: tomcat-servlet-3.0-api
+Requires: netty-tcnative
+Requires: java-headless
+
%description
Netty is a NIO client server framework which enables quick and easy
development of network applications such as protocol servers and
@@ -65,8 +73,12 @@ rm -rf jar doc license
%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
%pom_remove_dep javax.activation:activation
%pom_remove_plugin :animal-sniffer-maven-plugin
+%pom_remove_dep :npn-api
+%pom_xpath_remove "pom:extension[pom:artifactId[text()='os-maven-plugin']]"
%pom_xpath_remove "pom:execution[pom:id[text()='remove-examples']]"
%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration"
+%pom_xpath_remove "pom:dependency[pom:artifactId[text()='netty-tcnative']]/pom:classifier"
+%pom_xpath_remove "pom:dependency[pom:artifactId[text()='netty-tcnative']]/pom:scope"
# Set scope of optional compile dependencies to 'provided'
%pom_xpath_set "pom:dependency[pom:scope[text()='compile']
and pom:optional[text()='true']]/pom:scope" provided
@@ -79,6 +91,10 @@ rm -rf src/main/java/org/jboss/netty/util/internal/jzlib
sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
$(find src/main/java/org/jboss/netty/handler/codec -name \*.java | sort -u)
%patch0 -p1
+%patch1 -p1
+
+#adapting to excluded dep
+ rm -v src/main/java/org/jboss/netty/handler/ssl/JettyNpnSslEngine.java
%build
%mvn_compat_version : %{version} %{namedversion} 3
@@ -95,8 +111,19 @@ sed -i s/org.jboss.netty.util.internal.jzlib/com.jcraft.jzlib/ \
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-
+
%changelog
+* Thu Feb 12 2015 Jiri Vanek <jvanek at redhat.com> - 3.9.3-0
+- Updated to netty 3.9.3
+- uploaded sources netty-3.10.0.Final-dist.tar.bz2 and netty-3.9.3.Final-dist.tar.bz2
+- added and applied patch1, disableNPN.patch
+- modified patch0 netty-port-to-jzlib-1.1.0.patch
+- release reset to 0
+- added build requires java-devel and bouncycastle-pkix
+- xpathed out npn-api and os-maven-plugin
+- xpathed out from netty-tcnative classifier and scope
+- from sources removed JettyNpnSslEngine.java
+
* Tue Jun 10 2014 Michal Srb <msrb at redhat.com> - 3.6.6-4
- Rebuilt to fix provides
diff --git a/sources b/sources
index d6c3144..d1cf034 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b07b7b2fbc9d79a13f9b7da386018836 netty-3.6.6.Final-dist.tar.bz2
+8d137eedf64586c7a2423971c04eda11 netty-3.9.3.Final-dist.tar.bz2
More information about the scm-commits
mailing list