rpms/httpcomponents-client
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 4.5.3

Browse Source
This commit is contained in:
Michael Simacek 2017-01-26 13:52:15 +01:00
parent 3be5d8572a
commit 9a7c13acd9
5 changed files with 12 additions and 6506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ httpcomponents-client-4.1-src.tar.gz
/httpcomponents-client-4.5-src.tar.gz /httpcomponents-client-4.5-src.tar.gz
/httpcomponents-client-4.5.1-src.tar.gz /httpcomponents-client-4.5.1-src.tar.gz
/httpcomponents-client-4.5.2-src.tar.gz /httpcomponents-client-4.5.2-src.tar.gz
/httpcomponents-client-4.5.3-src.tar.gz

10
0001-Use-system-copy-of-effective_tld_names.dat.patch
View File

@ -1,17 +1,17 @@
From f4d129a1c230f559ada08070927db6edc900cd01 Mon Sep 17 00:00:00 2001 From 3514ce0f38dddafd052d76e6a0da9bbb862ff8a4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Jan 2015 16:04:31 +0100 Date: Tue, 20 Jan 2015 16:04:31 +0100
Subject: [PATCH 1/2] Use system copy of effective_tld_names.dat Subject: [PATCH] Use system copy of effective_tld_names.dat
--- ---
.../java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java | 7 +++---- .../java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-) 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java diff --git a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
index 5a25b46..f5b5b45 100644 index 8783c5b..c858220 100644
--- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java --- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
+++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java +++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
@@ -81,11 +81,10 @@ public final class PublicSuffixMatcherLoader { @@ -82,11 +82,10 @@ public final class PublicSuffixMatcherLoader {
if (DEFAULT_INSTANCE == null) { if (DEFAULT_INSTANCE == null) {
synchronized (PublicSuffixMatcherLoader.class) { synchronized (PublicSuffixMatcherLoader.class) {
if (DEFAULT_INSTANCE == null){ if (DEFAULT_INSTANCE == null){
@ -27,5 +27,5 @@ index 5a25b46..f5b5b45 100644
// Should never happen // Should never happen
final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class); final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
-- --
2.7.4 2.9.3

6495
0002-Remove-missing-compile-time-annotations.patch
View File

File diff suppressed because it is too large Load Diff

10
httpcomponents-client.spec
View File

@ -1,14 +1,12 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.5.2 Version: 4.5.3
Release: 4%{?dist} Release: 1%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch
# Some compile-time only annotations were removed from httpcore
Patch1: 0002-Remove-missing-compile-time-annotations.patch
BuildArch: noarch BuildArch: noarch
@ -54,7 +52,6 @@ Summary: API documentation for %{name}
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Don't install javadoc and sources jars # Don't install javadoc and sources jars
%mvn_package ":{*}::{sources,javadoc}:" __noinstall %mvn_package ":{*}::{sources,javadoc}:" __noinstall
@ -171,6 +168,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Thu Jan 26 2017 Michael Simacek <msimacek@redhat.com> - 4.5.3-1
- Update to upstream version 4.5.3
* Fri Jun 24 2016 Michael Simacek <msimacek@redhat.com> - 4.5.2-4 * Fri Jun 24 2016 Michael Simacek <msimacek@redhat.com> - 4.5.2-4
- Fix build with httpcomponents-core-4.4.5 - Fix build with httpcomponents-core-4.4.5

2
sources
View File

@ -1 +1 @@
36fae919b6f26a7f65aa51b0af389775 httpcomponents-client-4.5.2-src.tar.gz SHA512 (httpcomponents-client-4.5.3-src.tar.gz) = e3a438af3b85b19779a64724ef3d34b0c5d39f9a47e9180f3b3c283734c29e8e4566a65a5c28e83571c96b87155ab2c0792897c92e2304d18533bbed656b4e90