Update to upstream 4.0.28 release.
- Fixes CVE-2015-2156 (HttpOnly cookie bypass). - Resolves RHBZ#1111502.
This commit is contained in:
parent
a914f64e84
commit
e2a34bc035
|
@ -12,3 +12,5 @@
|
|||
/netty-3.6.6.Final-dist.tar.bz2
|
||||
/netty-4.0.14.Final.tar.gz
|
||||
/netty-4.0.19.Final.tar.gz
|
||||
/netty-4.0.27.Final.tar.gz
|
||||
/netty-4.0.28.Final.tar.gz
|
||||
|
|
47
netty.spec
47
netty.spec
|
@ -1,13 +1,17 @@
|
|||
# Disable generation of debuginfo package
|
||||
%global debug_package %{nil}
|
||||
%global namedreltag .Final
|
||||
%global namedversion %{version}%{?namedreltag}
|
||||
|
||||
Name: netty
|
||||
Version: 4.0.19
|
||||
Release: 2%{?dist}
|
||||
Version: 4.0.28
|
||||
Release: 1%{?dist}
|
||||
Summary: An asynchronous event-driven network application framework and tools for Java
|
||||
License: ASL 2.0
|
||||
URL: https://netty.io/
|
||||
Source0: https://github.com/netty/netty/archive/netty-%{namedversion}.tar.gz
|
||||
Patch0: npn_alpn_ssl_fixes.patch
|
||||
Patch1: transport-native-epoll-configure-fix.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(ant-contrib:ant-contrib)
|
||||
|
@ -39,6 +43,8 @@ BuildRequires: mvn(org.jboss.marshalling:jboss-marshalling-serial)
|
|||
BuildRequires: mvn(org.jmock:jmock-junit4)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
|
||||
BuildRequires: mvn(kr.motd.maven:os-maven-plugin)
|
||||
BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
|
||||
|
||||
Provides: netty4 = %{version}-%{release}
|
||||
Obsoletes: netty4 < %{version}-%{release}
|
||||
|
@ -66,6 +72,9 @@ Summary: API documentation for %{name}
|
|||
%prep
|
||||
%setup -q -n netty-netty-%{namedversion}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p2
|
||||
|
||||
# Missing Mavenized rxtx
|
||||
%pom_disable_module "transport-rxtx"
|
||||
%pom_remove_dep ":netty-transport-rxtx" all
|
||||
|
@ -77,24 +86,38 @@ Summary: API documentation for %{name}
|
|||
%pom_disable_module "example"
|
||||
%pom_remove_dep ":netty-example" all
|
||||
%pom_disable_module "testsuite"
|
||||
%pom_disable_module "testsuite-osgi"
|
||||
%pom_disable_module "tarball"
|
||||
%pom_disable_module "microbench"
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%pom_remove_plugin :animal-sniffer-maven-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-antrun-plugin
|
||||
%pom_remove_plugin :maven-dependency-plugin
|
||||
# Optional things we don't ship
|
||||
%pom_remove_dep ":netty-tcnative"
|
||||
%pom_remove_dep ":netty-tcnative" handler
|
||||
%pom_remove_dep "org.eclipse.jetty.npn:npn-api"
|
||||
%pom_remove_dep "org.eclipse.jetty.npn:npn-api" handler
|
||||
%pom_remove_dep "org.mortbay.jetty.npn:npn-boot"
|
||||
%pom_remove_dep "org.mortbay.jetty.npn:npn-boot" handler
|
||||
%pom_remove_dep "org.eclipse.jetty.alpn:alpn-api"
|
||||
%pom_remove_dep "org.eclipse.jetty.alpn:alpn-api" handler
|
||||
%pom_remove_dep "org.mortbay.jetty.alpn:alpn-boot"
|
||||
%pom_remove_dep "org.mortbay.jetty.alpn:alpn-boot" handler
|
||||
|
||||
sed -i 's|taskdef|taskdef classpathref="maven.plugin.classpath"|' all/pom.xml
|
||||
|
||||
%pom_xpath_inject "pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin']" '<dependencies><dependency><groupId>ant-contrib</groupId><artifactId>ant-contrib</artifactId><version>1.0b3</version></dependency></dependencies>' all/pom.xml
|
||||
%pom_xpath_inject "pom:execution[pom:id = 'build-native-lib']/pom:configuration" '<verbose>true</verbose>' transport-native-epoll/pom.xml
|
||||
|
||||
# Java is exempt from multilb - disable 32-bit library on 64-bit
|
||||
# architectures and vice versa.
|
||||
%pom_xpath_remove "pom:execution[pom:id='build-linux32']" transport-native-epoll
|
||||
sed -i "s/linux64/linux%{__isa_bits}/" transport-native-epoll/pom.xml
|
||||
sed -i "s/x86_64/%{_arch}/" transport-native-epoll/pom.xml
|
||||
# Tell xmvn to install attached artifact, which it does not
|
||||
# do by default. In this case install all attached artifacts with
|
||||
# the linux classifier.
|
||||
%mvn_package ":::linux*:"
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
|
@ -107,6 +130,14 @@ sed -i "s/x86_64/%{_arch}/" transport-native-epoll/pom.xml
|
|||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
%changelog
|
||||
* Wed May 20 2015 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.28-1
|
||||
- Update to upstream 4.0.28 release.
|
||||
- Fixes CVE-2015-2156 (HttpOnly cookie bypass).
|
||||
- Resolves RHBZ#1111502
|
||||
|
||||
* Wed May 20 2015 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.27-1
|
||||
- Update to upstream 4.0.27 release.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.19-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
@ -189,7 +220,7 @@ sed -i "s/x86_64/%{_arch}/" transport-native-epoll/pom.xml
|
|||
* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.5-1
|
||||
- Update to upstream version 3.5.5
|
||||
|
||||
* Thu Aug 15 2012 Tomas Rohovsky <trohovsk@redhat.com> - 3.5.4-1
|
||||
* Wed Aug 15 2012 Tomas Rohovsky <trohovsk@redhat.com> - 3.5.4-1
|
||||
- Update to upstream version 3.5.4
|
||||
|
||||
* Tue Jul 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.3-1
|
||||
|
|
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
|
@ -1 +1 @@
|
|||
2634bf8ea936a014cf414bb8532ecfbf netty-4.0.19.Final.tar.gz
|
||||
a38973b451fb2c8e59c1adb01b292224 netty-4.0.28.Final.tar.gz
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/netty-netty-4.0.27.Final/transport-native-epoll/pom.xml b/netty-netty-4.0.27.Final/transport-native-epoll/pom.xml
|
||||
index c9c7b25..b489b3f 100644
|
||||
--- a/netty-netty-4.0.27.Final/transport-native-epoll/pom.xml
|
||||
+++ b/netty-netty-4.0.27.Final/transport-native-epoll/pom.xml
|
||||
@@ -73,9 +73,6 @@
|
||||
<platform>.</platform>
|
||||
<forceConfigure>true</forceConfigure>
|
||||
<forceAutogen>true</forceAutogen>
|
||||
- <configureArgs>
|
||||
- <arg>${jni.compiler.args}</arg>
|
||||
- </configureArgs>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>generate</goal>
|
Loading…
Reference in New Issue