summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2014-02-22 17:14:43 +0100
committerBertrand Jacquin <beber@meleeweb.net>2014-02-22 17:18:44 +0100
commitd37e24a6b2873bf27d2c28fbc12f3fdc8210354f (patch)
treec30dd40b8ca192f537ebe4694313869725a86b3d
parentwww-apps/phabricator: Add patch from Carsten Haitzler to fix public wiki (diff)
downloadportage-d37e24a6b2873bf27d2c28fbc12f3fdc8210354f.tar.xz
dev-php/libphutil: Refresh patch
Package-Manager: portage-2.2.8-r1
-rw-r--r--dev-php/libphutil/ChangeLog5
-rw-r--r--dev-php/libphutil/Manifest6
-rw-r--r--dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch (renamed from dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch)9
-rw-r--r--dev-php/libphutil/libphutil-9999.ebuild2
-rw-r--r--metadata/md5-cache/dev-php/libphutil-99992
5 files changed, 13 insertions, 11 deletions
diff --git a/dev-php/libphutil/ChangeLog b/dev-php/libphutil/ChangeLog
index 0707cfaa..f5436e2e 100644
--- a/dev-php/libphutil/ChangeLog
+++ b/dev-php/libphutil/ChangeLog
@@ -1,3 +1,8 @@
+ 22 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
+ +files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch,
+ -files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch:
+ dev-php/libphutil: Refresh patch
+
11 Feb 2014; Bertrand Jacquin <beber@meleeweb.net> libphutil-9999.ebuild:
dev-php/libphutil: Move to git-r3
diff --git a/dev-php/libphutil/Manifest b/dev-php/libphutil/Manifest
index 07d9d2a6..aa6808c4 100644
--- a/dev-php/libphutil/Manifest
+++ b/dev-php/libphutil/Manifest
@@ -1,4 +1,4 @@
-AUX 0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2166 SHA256 6d85a72631dfd13598e21ef09365bdfa8ad4b039f834657c0153b536a7e52716 WHIRLPOOL 8242f71438c9620aab5f08fc57472b25a1d1bf59656c81e5e2f9d4184a9ac6537b6bf9e375b5ef9766ad0278f0ff7e99f680134d801be07440333275b6ac7da0
-EBUILD libphutil-9999.ebuild 3174 SHA256 1a04dfff392c9dcd3ca8c7cddfad29d25cfc2cf9687e785a55f3587e26a95231 WHIRLPOOL 3e471b1c411ba01a643570a1a02e271814a1f4539ef76a51d3c6d8ffa342cdbb2c0132e88f1dec1b517cae74625f622f7d0465f101a73597557da4c3255c3cd0
-MISC ChangeLog 1925 SHA256 900f103a3f448d07979a1764c9ee71878f398301ef81e67a2f06b4cc0cd512c6 WHIRLPOOL 17b5757fbe6c22323eb75e9952ad405558381080ec79e4da9d9f4199bac63ea360502f4354b1e8a7553df116087cd2cba8c435f9767538bbdb12f34a39a67b90
+AUX 9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2153 SHA256 e7571907ec629452421a48bcd67f244467cb41338fe7fcf749f6556baf63c12e WHIRLPOOL 5f71f7ed48013a27af10314099ff9a82e6b95f8abfab83aaf7e20364bc82f76998a87c616dc5f700d227b5a141c5d62315b9d67ae721a9e58575b0bc5055119d
+EBUILD libphutil-9999.ebuild 3175 SHA256 b86e77e750258a41dd26d71273e7551fedb4fd11df9cafcd88087d33ea1f402f WHIRLPOOL cec7a13e846a7396d708709faa7f004f84cf408ebf0cb5d922eb92b0c61caaafc364b942fab565d41c634988e6f196bf9f9b6e9d4c049f6c4e9470793a881eaf
+MISC ChangeLog 2162 SHA256 0bec31bbbcd995be46e853a7dc879b20c3538e1494a5df98c57e861e68768264 WHIRLPOOL 973dd47d5923092ee6be1cbae0632c6ec3bfe9be3e76314356ede123324b4922ff9221152dd27dedca79d3ea35d7825deed2e2afa8ef05004ac06a496a97485f
MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
index e8581205..0c437027 100644
--- a/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ b/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
@@ -1,4 +1,4 @@
-From d1f7d4c12b30ee990315e8a9bfbeb7c775846bed Mon Sep 17 00:00:00 2001
+From 56d212192897b043cd02405f4150e59ed83b6723 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Tue, 13 Aug 2013 16:07:58 +0200
Subject: [PATCH] Remove the usage of local SSL certificates and use system
@@ -9,10 +9,10 @@ Subject: [PATCH] Remove the usage of local SSL certificates and use system
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 0434907..3a58e3d 100644
+index afbd4ce..561de18 100644
--- a/src/future/http/HTTPSFuture.php
+++ b/src/future/http/HTTPSFuture.php
-@@ -246,28 +246,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
+@@ -286,28 +286,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
// `setCABundle()` or similar.
// - Then, check if a global bundle is set explicitly for all requests,
// via `setGlobalCABundle()` or similar.
@@ -43,6 +43,3 @@ index 0434907..3a58e3d 100644
}
}
---
-1.8.1.5
-
diff --git a/dev-php/libphutil/libphutil-9999.ebuild b/dev-php/libphutil/libphutil-9999.ebuild
index 4ecc57c2..7161f33f 100644
--- a/dev-php/libphutil/libphutil-9999.ebuild
+++ b/dev-php/libphutil/libphutil-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
dev-php/pecl-apc:0"
src_prepare() {
- epatch "${FILESDIR}/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
+ epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
if use test ; then
tc-export AR CXX
diff --git a/metadata/md5-cache/dev-php/libphutil-9999 b/metadata/md5-cache/dev-php/libphutil-9999
index 5e15fa95..a61ed975 100644
--- a/metadata/md5-cache/dev-php/libphutil-9999
+++ b/metadata/md5-cache/dev-php/libphutil-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
RDEPEND=>=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode] dev-php/pecl-apc:0
SLOT=0
_eclasses_=eutils 40081e8c7e7f7c4f9db349a1d6d52925 git-r3 f089608c770d9ad72a2c92b547d2b20d multilib fac675dcccf94392371a6abee62d909f toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=13bbe95cc6bff8d6c012bd1da33bd4d2
+_md5_=bce96d1aea96ac172945ea8c935bf6b5