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

Update to upstream version 4.4

Browse Source
This commit is contained in:
Mikolaj Izdebski 2015-02-18 21:36:06 +01:00
parent 20bd458f34
commit 366cf718ea
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ httpcomponents-client-4.1-src.tar.gz
/httpcomponents-client-4.3.5-src.tar.gz /httpcomponents-client-4.3.5-src.tar.gz
/httpcomponents-client-4.4-beta1-src.tar.gz /httpcomponents-client-4.4-beta1-src.tar.gz
/effective_tld_names.dat /effective_tld_names.dat
/httpcomponents-client-4.4-src.tar.gz

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

@ -1,4 +1,4 @@
From b4954ca99dcc6daa344c9223a5997487e0806605 Mon Sep 17 00:00:00 2001 From 52ebf0fdea572cb42fdf415baab346e2057594c7 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] Use system copy of effective_tld_names.dat Subject: [PATCH] Use system copy of effective_tld_names.dat
@ -8,7 +8,7 @@ Subject: [PATCH] Use system copy of effective_tld_names.dat
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 173763a..d792eca 100644 index 9017406..d792eca 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
@@ -80,11 +80,10 @@ public final class PublicSuffixMatcherLoader { @@ -80,11 +80,10 @@ public final class PublicSuffixMatcherLoader {
@ -16,7 +16,7 @@ index 173763a..d792eca 100644
synchronized (PublicSuffixMatcherLoader.class) { synchronized (PublicSuffixMatcherLoader.class) {
if (DEFAULT_INSTANCE == null){ if (DEFAULT_INSTANCE == null){
- final URL url = PublicSuffixMatcherLoader.class.getResource( - final URL url = PublicSuffixMatcherLoader.class.getResource(
- "mozilla/public-suffix-list.txt"); - "/mozilla/public-suffix-list.txt");
- if (url != null) { - if (url != null) {
+ final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat"); + final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat");
+ if (file.exists()) { + if (file.exists()) {

9
httpcomponents-client.spec
View File

@ -3,10 +3,10 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.4 Version: 4.4
Release: 0.3.beta1%{?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}-beta1-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
@ -48,7 +48,7 @@ Summary: API documentation for %{name}
%{summary}. %{summary}.
%prep %prep
%setup -q -n %{name}-%{version}-beta1 %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
# Don't install javadoc and sources jars # Don't install javadoc and sources jars
@ -140,6 +140,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
* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4-1
- Update to upstream version 4.4
* Thu Jan 22 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4-0.3.beta1 * Thu Jan 22 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4-0.3.beta1
- Split httpclient-cache into subpackage - Split httpclient-cache into subpackage

2
sources
View File

@ -1 +1 @@
2a1b26a5a10384a02016d072ee0fea98 httpcomponents-client-4.4-beta1-src.tar.gz befd6f1f9ad1cf642581f31b63ae559e httpcomponents-client-4.4-src.tar.gz