[apache-commons-fileupload] Update to upstream version 1.3.1
by Mikolaj Izdebski
commit 26e11326b1386b316ba42761d8bb119ce1797a05
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Feb 10 08:25:51 2014 +0100
Update to upstream version 1.3.1
.gitignore | 1 +
apache-commons-fileupload-CVE-2014-0050.patch | 151 ------------------------
apache-commons-fileupload-portlet20.patch | 65 ----------
apache-commons-fileupload-remove-portlet.patch | 24 ----
apache-commons-fileupload.spec | 13 +-
sources | 2 +-
6 files changed, 8 insertions(+), 248 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e0f367..00bbdef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
commons-fileupload-1.2.1-src.tar.gz
/commons-fileupload-1.2.2-src.tar.gz
/commons-fileupload-1.3-src.tar.gz
+/commons-fileupload-1.3.1-src.tar.gz
diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
index c00bc7d..db55e7b 100644
--- a/apache-commons-fileupload.spec
+++ b/apache-commons-fileupload.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.3
-Release: 5%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: This package provides an api to work with html file upload
License: ASL 2.0
Group: Development/Libraries
@@ -11,10 +11,6 @@ URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
BuildArch: noarch
-# Backported from upstream revision 1565143
-Patch0: %{name}-CVE-2014-0050.patch
-Patch1: %{name}-portlet20.patch
-
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven-local
BuildRequires: junit >= 0:3.8.1
@@ -65,7 +61,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
sed -i 's/\r//' LICENSE.txt
sed -i 's/\r//' NOTICE.txt
@@ -126,6 +121,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
# -----------------------------------------------------------------------------
%changelog
+* Mon Feb 10 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3.1-1
+- Update to upstream version 1.3.1
+- Remove unused patched
+
* Thu Feb 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3-5
- Add backported upstream patch to fix DoS vulnerability
- Resolves: CVE-2014-0050
diff --git a/sources b/sources
index 7b8af5f..becc879 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ebb9e0e7d528d4660c35c63a13f20a5 commons-fileupload-1.3-src.tar.gz
+0903f9606096d11a8ff57525fd9ee83c commons-fileupload-1.3.1-src.tar.gz
10 years, 3 months
[async-http-client] Update to latest upstream version 1.8.1
by Michal Srb
commit a4d16735094411cd28321cc41bfda5ba054df0a9
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Feb 7 09:50:19 2014 +0100
Update to latest upstream version 1.8.1
.gitignore | 1 +
async-http-client.spec | 11 +++++++++--
sources | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be1c00c..61ca962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/async-http-client-1.7.21.tar.gz
/async-http-client-1.7.22.tar.gz
/async-http-client-1.7.23.tar.gz
+/async-http-client-1.8.1.tar.gz
diff --git a/async-http-client.spec b/async-http-client.spec
index da4a8b2..d4c8e0c 100644
--- a/async-http-client.spec
+++ b/async-http-client.spec
@@ -1,7 +1,7 @@
Name: async-http-client
-Version: 1.7.23
-Release: 2%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
Summary: Asynchronous Http Client for Java
License: ASL 2.0
@@ -60,6 +60,10 @@ rm -Rf src/test/java/com/ning/http/client/websocket
# Animal sniffer is causing more trouble than good
%pom_remove_plugin :animal-sniffer-maven-plugin
+# Build against netty3 compat package
+%pom_remove_dep io.netty:netty
+%pom_add_dep io.netty:netty:3
+
%build
%mvn_build
@@ -75,6 +79,9 @@ rm -Rf src/test/java/com/ning/http/client/websocket
%changelog
+* Fri Feb 07 2014 Michal Srb <msrb(a)redhat.com> - 1.8.1-1
+- Update to latest upstream version 1.8.1
+
* Fri Jan 17 2014 Michal Srb <msrb(a)redhat.com> - 1.7.23-2
- Migrate to netty 3 compat
diff --git a/sources b/sources
index 98b4ae0..70e06a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-013d5d1cbe0b3259e917f2d9f809ea23 async-http-client-1.7.23.tar.gz
+8e524bf79793aca175184785fb0c8cb7 async-http-client-1.8.1.tar.gz
10 years, 3 months