From b389b4c495252f9d79582992860d5f40c52da1b9 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Dec 13 2019 19:15:05 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ffdd417..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/results_* -/*.src.rpm - -/netty-3.6.6.Final-dist.tar.bz2 -/netty-3.10.0.Final-dist.tar.bz2 -/netty-3.9.3.Final-dist.tar.bz2 -/netty-3.10.6.Final.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/disableNPN.patch b/disableNPN.patch deleted file mode 100644 index 9160424..0000000 --- a/disableNPN.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 nextProtoList = new ArrayList(); - 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 list = new ArrayList(); - for (String p: nextProtocols) { diff --git a/netty-3.10.6-port-to-jzlib-1.1.0.patch b/netty-3.10.6-port-to-jzlib-1.1.0.patch deleted file mode 100644 index 5f1ecae..0000000 --- a/netty-3.10.6-port-to-jzlib-1.1.0.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Nru netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java ---- netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2016-06-29 14:41:47.000000000 +0200 -+++ netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2016-11-03 15:51:13.967846143 +0100 -@@ -77,7 +77,7 @@ - - synchronized (z) { - int resultCode; -- resultCode = z.inflateInit(JZlib.W_ZLIB); -+ resultCode = z.inflateInit(); - if (resultCode != JZlib.Z_OK) { - ZlibUtil.fail(z, "initialization failure", resultCode); - } -diff -Nru netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java ---- netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2016-06-29 14:41:47.000000000 +0200 -+++ netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2016-11-03 15:50:14.712839882 +0100 -@@ -147,8 +147,7 @@ - wrapperOverhead = ZlibUtil.wrapperOverhead(wrapper); - - synchronized (z) { -- int resultCode = z.deflateInit(compressionLevel, windowBits, memLevel, -- ZlibUtil.convertWrapperType(wrapper)); -+ int resultCode = z.deflateInit(compressionLevel, ZlibUtil.convertWrapperType(wrapper), memLevel); - if (resultCode != JZlib.Z_OK) { - ZlibUtil.fail(z, "initialization failure", resultCode); - } -@@ -235,8 +234,7 @@ - - synchronized (z) { - int resultCode; -- resultCode = z.deflateInit(compressionLevel, windowBits, memLevel, -- JZlib.W_ZLIB); // Default: ZLIB format -+ resultCode = z.deflateInit(compressionLevel, windowBits, memLevel); - if (resultCode != JZlib.Z_OK) { - ZlibUtil.fail(z, "initialization failure", resultCode); - } else { -diff -Nru netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java ---- netty-netty-3.10.6.Final/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2016-06-29 14:41:47.000000000 +0200 -+++ netty-netty-3.10.6.Final.jzlib/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2016-11-03 15:48:56.294801795 +0100 -@@ -32,25 +32,26 @@ - (z.msg != null? ": " + z.msg : "")); - } - -- static Enum convertWrapperType(ZlibWrapper wrapper) { -- Enum convertedWrapperType; -- switch (wrapper) { -+ static int convertWrapperType(ZlibWrapper wrapper, int windowBits) { -+ switch (wrapper) { - case NONE: -- convertedWrapperType = JZlib.W_NONE; -+ windowBits = -windowBits; - break; - case ZLIB: -- convertedWrapperType = JZlib.W_ZLIB; - break; - case GZIP: -- convertedWrapperType = JZlib.W_GZIP; -+ windowBits += 16; - break; - case ZLIB_OR_NONE: -- convertedWrapperType = JZlib.W_ZLIB_OR_NONE; - break; - default: - throw new Error(); - } -- return convertedWrapperType; -+ return windowBits; -+ } -+ -+ static int convertWrapperType(ZlibWrapper wrapper) { -+ return convertWrapperType(wrapper, 15); - } - - static int wrapperOverhead(ZlibWrapper wrapper) { diff --git a/netty3.spec b/netty3.spec deleted file mode 100644 index 6426c56..0000000 --- a/netty3.spec +++ /dev/null @@ -1,198 +0,0 @@ -%global namedreltag .Final -%global namedversion %{version}%{?namedreltag} - -Name: netty3 -Version: 3.10.6 -Release: 8%{?dist} -Summary: An asynchronous event-driven network application framework and tools for Java -# CC0: src/main/java/org/jboss/netty/handler/codec/base64/Base64.java -License: ASL 2.0 and BSD and CC0 -URL: http://netty.io/ -Source0: https://github.com/netty/netty/archive/netty-%{namedversion}.tar.gz - -Patch0: netty-3.10.6-port-to-jzlib-1.1.0.patch -Patch1: disableNPN.patch - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: mvn(ant-contrib:ant-contrib) -BuildRequires: mvn(com.google.protobuf:protobuf-java) -BuildRequires: mvn(com.jcraft:jzlib) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(io.netty:netty-tcnative) -BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(log4j:log4j:12) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.ant:ant-launcher) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) -BuildRequires: mvn(org.jboss.logging:jboss-logging) -BuildRequires: mvn(org.jboss.marshalling:jboss-marshalling) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) - -Requires: netty-tcnative -# src/main/java/org/jboss/netty/handler/codec/base64/Base64.java (unkown version) -Provides: bundled(java-base64) - -%description -Netty is a NIO client server framework which enables quick and easy -development of network applications such as protocol servers and -clients. It greatly simplifies and streamlines network programming -such as TCP and UDP socket server. - -'Quick and easy' doesn't mean that a resulting application will suffer -from a maintainability or a performance issue. Netty has been designed -carefully with the experiences earned from the implementation of a lot -of protocols such as FTP, SMTP, HTTP, and various binary and -text-based legacy protocols. As a result, Netty has succeeded to find -a way to achieve ease of development, performance, stability, and -flexibility without a compromise. - -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - -%prep -%setup -q -n netty-netty-%{namedversion} - -# just to be sure, but not used anyway -rm -rf jar doc license - -%pom_remove_plugin :maven-jxr-plugin -%pom_remove_plugin :maven-checkstyle-plugin -%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 - -# Force use servlet 3.1 apis -%pom_change_dep :servlet-api javax.servlet:javax.servlet-api:3.1.0 - -# use latest OSGi implementation -%pom_change_dep :org.osgi.core org.osgi:osgi.core -%pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn - -%pom_xpath_set "pom:dependency[pom:artifactId = 'log4j']/pom:version" 12 - -# Uneeded tasks -%pom_remove_plugin :maven-assembly-plugin -%pom_remove_plugin :maven-source-plugin -# Unavailable plugin -%pom_remove_plugin kr.motd.maven:exec-maven-plugin -# Fix javadoc doclint -%pom_remove_plugin :maven-javadoc-plugin - -sed s/jboss-logging-spi/jboss-logging/ -i pom.xml - -# Remove bundled jzlib and use system jzlib -rm -r src/main/java/org/jboss/netty/util/internal/jzlib -%pom_add_dep com.jcraft: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 - -%mvn_compat_version : %{version} 3.9.3 %{namedversion} 3.9.3.Final 3 -%mvn_alias : org.jboss.netty: -%mvn_file : %{name} - -%build - -# skipping tests because we don't have easymockclassextension -%mvn_build -f - -%install -%mvn_install - -%files -f .mfiles -%doc README.md -%license LICENSE.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - -%changelog -* Sat Oct 05 2019 Fabio Valentini - 3.10.6-8 -- Migrate away from the retired felix OSGi implementation. - -* Thu Jul 25 2019 Fedora Release Engineering - 3.10.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.10.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 3.10.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 3.10.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.10.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.10.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Nov 03 2016 gil cattaneo 3.10.6-1 -- update to 3.10.6.Final - -* Thu Feb 04 2016 Fedora Release Engineering - 3.9.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Aug 08 2015 gil cattaneo 3.9.3-3 -- fix FTBFS rhbz#1239716 -- fix URL field -- fix BR list and use BR mvn()-like -- switch to glassfish-servlet-api -- force log4j12 -- remove duplicate files -- fix some rpmlint problem -- introduce license macro - -* Wed Jun 17 2015 Fedora Release Engineering - 3.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Feb 12 2015 Marek Goldmann - 3.9.3-1 -- Rebuild to fix the release - -* Thu Feb 12 2015 Jiri Vanek - 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 - 3.6.6-4 -- Rebuilt to fix provides - -* Sat Jun 07 2014 Fedora Release Engineering - 3.6.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 3.6.6-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Dec 30 2013 Marek Goldmann - 3.6.6-1 -- Initial packaging of compat version 3 as a compat package - diff --git a/sources b/sources deleted file mode 100644 index 25259c5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (netty-3.10.6.Final.tar.gz) = 93495d1db04e7ae195cb840554e9dc6185dc22d59eec2667d0b9dd18a433121ed26bf9f679d57af1959463189d9e0dcf0d18faba5a920228f650135413395d8a