From e7644a113d3cb3bc081955f0680e9867a3cdbe2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 29 Feb 2016 07:26:24 +0100 Subject: [PATCH] Update to upstream version 4.5.2 --- .gitignore | 1 + 0001-Use-system-copy-of-effective_tld_names.dat.patch | 10 +++++----- httpcomponents-client.spec | 7 +++++-- sources | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 009751a..6945cc4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.4.1-src.tar.gz /httpcomponents-client-4.5-src.tar.gz /httpcomponents-client-4.5.1-src.tar.gz +/httpcomponents-client-4.5.2-src.tar.gz diff --git a/0001-Use-system-copy-of-effective_tld_names.dat.patch b/0001-Use-system-copy-of-effective_tld_names.dat.patch index c3a84a6..b7bdca4 100644 --- a/0001-Use-system-copy-of-effective_tld_names.dat.patch +++ b/0001-Use-system-copy-of-effective_tld_names.dat.patch @@ -1,4 +1,4 @@ -From 52ebf0fdea572cb42fdf415baab346e2057594c7 Mon Sep 17 00:00:00 2001 +From aa26c8d92170f5ec9c94063f01679bde15e736c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Jan 2015 16:04:31 +0100 Subject: [PATCH] Use system copy of effective_tld_names.dat @@ -8,10 +8,10 @@ Subject: [PATCH] Use system copy of effective_tld_names.dat 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 -index 9017406..d792eca 100644 +index 5a25b46..f5b5b45 100644 --- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java +++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java -@@ -80,11 +80,10 @@ public final class PublicSuffixMatcherLoader { +@@ -81,11 +81,10 @@ public final class PublicSuffixMatcherLoader { if (DEFAULT_INSTANCE == null) { synchronized (PublicSuffixMatcherLoader.class) { if (DEFAULT_INSTANCE == null){ @@ -23,9 +23,9 @@ index 9017406..d792eca 100644 try { - DEFAULT_INSTANCE = load(url); + DEFAULT_INSTANCE = load(file); - } catch (IOException ex) { + } catch (final IOException ex) { // Should never happen final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class); -- -2.1.0 +2.5.0 diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 0132103..67d076a 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -6,8 +6,8 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.5.1 -Release: 4%{?dist} +Version: 4.5.2 +Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -160,6 +160,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc LICENSE.txt NOTICE.txt %changelog +* Mon Feb 29 2016 Mikolaj Izdebski - 4.5.2-1 +- Update to upstream version 4.5.2 + * Wed Feb 10 2016 Mat Booth - 4.5.1-4 - Enable the fluent API module diff --git a/sources b/sources index d82805d..6892230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -274eabf741ea50184fd0a86f93ec69d7 httpcomponents-client-4.5.1-src.tar.gz +36fae919b6f26a7f65aa51b0af389775 httpcomponents-client-4.5.2-src.tar.gz