dev-php/libphutil: Version bump

Package-Manager: portage-2.3.0

7 files changed, 190 insertions, 11 deletions

diff --git a/dev-php/libphutil/Manifest b/dev-php/libphutil/Manifest
index 6f35e3f7..d4efab9f 100644
--- a/dev-php/libphutil/Manifest
+++ b/dev-php/libphutil/Manifest
@@ -1,7 +1,9 @@
 AUX 20160709-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 ed7e0c81f1cca4d6b2e14d8229e521302e0f656f9a1b742e478d2c2d036b6962 WHIRLPOOL bf0008faee1cf53a9a729ce9df486eadd40c16258c0ef0faf010c6cee14460bc253f2956dc75c8bc5a796727d9b0f877fa56ebcf0ef161649966d99fa14740b0
 AUX 20161209-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2165 SHA256 19c836419750de7fc81c929ee035aa8444176eb0f23d2808c059b20542446c46 WHIRLPOOL 5df841187aa097b8adf736a1b7995ea42ba0495e9eb5628ae05202d6fbdea89c6228a04e4890dced799d4fa588ed2f6c4e105d62403b333338a9526e80c7f770
-AUX 9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2165 SHA256 b846806226c5fbb301713e6d0a944a0f7316239385a1294786262aee0b92464d WHIRLPOOL a57e4266a5bb8fa88902012a9a46e4c015b85af72e73a17113401fd99c540faab4ac8d936380a66b6c93e0a5b44618f2a49d08582b5d494e3edeea779ac9f54d
-EBUILD libphutil-20160709.ebuild 3409 SHA256 b5c94f027576462cd720d4def07e29e09d467f750b27f4901eb7dfe527a9c26d WHIRLPOOL 4fa5f8e1f3d9ad49c3590db6fcf427916d0b43923629a93d3fd8401e1383beb9b2d8224f4710b62303f59c4eadea3947aae69f36e13a0b1c4ce42eb73a8a3b31
-EBUILD libphutil-20161209.ebuild 3409 SHA256 5a26c901727fef1503b15170569e120763da14e27f474a07b93f82717a70bd5f WHIRLPOOL f85bab709df93859c9f06ed955188f7bdcefc9be10089dec7869ebd81218cf4d87fbe97ef39eea255c3a3173b65783da431228c042e748a0840ea56df162cd84
-EBUILD libphutil-9999.ebuild 3324 SHA256 d01edefff940b7f515c694c182b4015b326ba52b075dd430c75421effe322b40 WHIRLPOOL 598252c788ca490ec99fb73d0a761d0c9596665661c5b7daaa01987c7406e75b340332015ddf86a35a72cbdd180ec3b0b080b585fae9ab233d0a6583e0897672
+AUX 20170113-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2165 SHA256 7a9e04d66e33f4ff7ea1d4a23dd1fe9676c5261be2cd8d18a4aaeb3e6c085089 WHIRLPOOL 4b58879e5f41319ddd218d97277ee02f710282262e4c270e5520e70405e4bda5ecf16e65a7ccec3bd998298bc64c20f824c11506f71463363d5e05f9baa879f2
+AUX 9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2165 SHA256 02ea8becbf7808e66bd02e0f6381cf30805984c79b59f32149bbdfbef41342b4 WHIRLPOOL 236c7a3c63fda1e463c3eac11ea7abef0d6fa2561cdaa18a2c79e38762d82b21297446c407798c99480059300f3d9424fdb601420624d2052ab50365ae446e2c
+EBUILD libphutil-20160709.ebuild 3411 SHA256 82a54f65cccdf9b6a225bd2d4996a377c164adaf16bf4cd95cccf4672a98b171 WHIRLPOOL dcaaf3b93a946a2d90dcf04ca3ea7899814842591896e967be2dbbf4cb66da64d4edede9c9a3f229ae0ccb007dc4a9e3df327346b5a286caecc68bf204271714
+EBUILD libphutil-20161209.ebuild 3411 SHA256 459fbc5102116d3cf9d9ae8c584c5b621debcc932e51e928f67031cb48d62a01 WHIRLPOOL 71cba608317b4ced116d8aa0ba165e4af501b7231f1c57813690557183624607c821ebf440abd4869e74b007a26eb0afedaddd66250674348aeff13a87047c4b
+EBUILD libphutil-20170113.ebuild 3509 SHA256 68503d08ff88864d8e2ae3b6155f2a1ed36ebe38d54015344f5d56f72b7b29ed WHIRLPOOL 0a72f499b78eb842b05ffa8a61b411e1e2692f975a6682b16964935982dee96b99fb37b2c9d709be56ad440704de86db781df563340f8238eb321db8469441ad
+EBUILD libphutil-9999.ebuild 3422 SHA256 79aa33c01cba8ebc8bcd9fa4c162ba3f6d8e91ecb3552274ff10dc8125c3aa4b WHIRLPOOL 8e731dfda61b07b95c5f8015654d341e6cb9cbe9949fc5f602bcefab75a80ac910201c89ed8daca1b138cae09be5f1f6fa6024d11c451c611c57dafcbf9f61a2
 MISC metadata.xml 270 SHA256 c04cdb11fb00afb6ff02df034d8b5b9f0e81547e40c6222532f7093720e11830 WHIRLPOOL 265753a2137d4b55b97549114cf475b9996e2358f570533f3db7ec7a91b7d3cfb60372ac9ebf83284ef963fc4c36f7e6fbeb144fba17a9cef6c402a74557cf94
diff --git a/dev-php/libphutil/files/20170113-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20170113-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
new file mode 100644
index 00000000..b161a2c1
--- /dev/null
+++ b/dev-php/libphutil/files/20170113-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
@@ -0,0 +1,45 @@
+From 27559314c165b8a5489a2aee1699aec27e455914 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Tue, 13 Aug 2013 16:07:58 +0200
+Subject: [PATCH] Remove the usage of local SSL certificates and use system
+ provided by ca-certificates.
+
+---
+ src/future/http/HTTPSFuture.php | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
+index 255e7f6878cd..7870de405aed 100644
+--- a/src/future/http/HTTPSFuture.php
++++ b/src/future/http/HTTPSFuture.php
+@@ -310,28 +310,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.
+-      // - Then, if a local custom.pem exists, use that, because it probably
+-      //   means that the user wants to override everything (also because the
+-      //   user might not have access to change the box's php.ini to add
+-      //   curl.cainfo).
+       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
+       //   probably reasonable to try using it before we fall back to what
+       //   libphutil ships with.
+-      // - Lastly, try the default that libphutil ships with. If it doesn't
++      // - Lastly, try the default from ca-certificates. If it doesn't
+       //   work, give up and yell at the user.
+ 
+       if (!$this->getCABundle()) {
+-        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
+         $ini_val = ini_get('curl.cainfo');
+         if (self::getGlobalCABundle()) {
+           $this->setCABundleFromPath(self::getGlobalCABundle());
+-        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
+-          $this->setCABundleFromPath($caroot.'custom.pem');
+         } else if ($ini_val) {
+           // TODO: We can probably do a pathExists() here, even.
+           $this->setCABundleFromPath($ini_val);
+         } else {
+-          $this->setCABundleFromPath($caroot.'default.pem');
++          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
+         }
+       }
+ 
diff --git a/dev-php/libphutil/files/9999-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 98aa80cc..bf08f026 100644
--- a/dev-php/libphutil/files/9999-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 dc93c456ec3843d105910c11ab361f941c2f8e63 Mon Sep 17 00:00:00 2001
+From f99885c04b9d92f0d66f8ed02ccb4d2b36225178 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Tue, 13 Aug 2013 16:07:58 +0200
 Subject: [PATCH] Remove the usage of local SSL certificates and use system
diff --git a/dev-php/libphutil/libphutil-20160709.ebuild b/dev-php/libphutil/libphutil-20160709.ebuild
index d3cfd0c9..f0ca4675 100644
--- a/dev-php/libphutil/libphutil-20160709.ebuild
+++ b/dev-php/libphutil/libphutil-20160709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ EGIT_COMMIT="5fd2cf9d5ddd38424a54a8fba02398d527639970"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl test"
 
 DEPEND="virtual/awk:0
diff --git a/dev-php/libphutil/libphutil-20161209.ebuild b/dev-php/libphutil/libphutil-20161209.ebuild
index 19d2b1b4..a921a44d 100644
--- a/dev-php/libphutil/libphutil-20161209.ebuild
+++ b/dev-php/libphutil/libphutil-20161209.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ EGIT_COMMIT="0ae0cc00acb1413c22bfe3384fd6086ade4cc206"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl test"
 
 DEPEND="virtual/awk:0
diff --git a/dev-php/libphutil/libphutil-20170113.ebuild b/dev-php/libphutil/libphutil-20170113.ebuild
new file mode 100644
index 00000000..3887e680
--- /dev/null
+++ b/dev-php/libphutil/libphutil-20170113.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils toolchain-funcs git-r3
+
+DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
+HOMEPAGE="https://www.phacility.com"
+EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
+EGIT_BRANCH="stable"
+EGIT_COMMIT="10963f771f118baa338aacd3172aaede695cde62"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl test"
+
+DEPEND="virtual/awk:0
+	test? (
+		sys-devel/bison:0
+		>=sys-devel/flex-2.5.35:0
+		=www-client/arcanist-20170106:0
+		>=dev-lang/php-5.2.3[cli]
+	)"
+RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
+
+src_prepare() {
+	default
+
+	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
+	git remote add origin "${EGIT_REPO_URI}"
+	git remote -v > "${S}/GIT_REMOTE_INFO"
+
+	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
+
+	if use test ; then
+		tc-export AR CXX
+	fi
+
+	find "${S}" -type f -name .gitignore -print0 \
+		| xargs -0 --no-run-if-empty -- \
+			rm
+
+	rm -r resources/ssl
+	rm -r scripts/daemon/torture
+	rm scripts/build_xhpast.php
+	rm src/parser/xhpast/bin/xhpast.exe
+
+	# Replace 'env' shebang to files it point to
+	find "${S}" -type f \
+		| sort \
+		| xargs -n 1 --no-run-if-empty -- \
+			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
+		| while read ; do
+			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
+			cmd="$1" ; shift ; args="$@"
+
+			case "${cmd}" in
+				bash|php)	;;
+				*)			continue ;;
+			esac
+
+			path="$(type -p ${cmd})" || continue
+			[[ -z "${path}" ]] && continue
+
+			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
+			sed -i \
+				-e "1 s:^#!.*:#!${path} ${args}:" \
+				"${REPLY}"
+			eend $?
+		done
+}
+
+src_compile() {
+	if use test ; then
+		cd support/xhpast
+
+		# Avoid sandbox violation for dev-lang/php[snmp]
+		# php -f generate_nodes.php'
+		#
+		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
+		#  abs_path: /var/lib/net-snmp/mib_indexes/0
+		#  res_path: /var/lib/net-snmp/mib_indexes/0
+		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
+		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
+		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
+		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
+		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
+		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
+		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
+		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
+		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
+		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
+		#  /proc/15834/cmdline: php -f generate_nodes.php
+		#
+		# See snmp_config(5)
+		export SNMP_PERSISTENT_DIR="${T}"
+
+		emake
+		emake install
+	fi
+}
+
+src_test() {
+	arc unit --everything --no-coverage || die "arc unit failed"
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins GIT_COMMIT_INFO GIT_REMOTE_INFO
+
+	insinto "/usr/share/php/${PN}"
+	doins -r externals resources scripts src
+
+	if use test ; then
+		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
+		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
+	fi
+
+	# Make executable all shebanged files
+	find "${ED}" -type f \
+		| xargs -n 1 --no-run-if-empty -- \
+			awk 'NR == 1 && /^#!/ {print FILENAME}' \
+		| sed -e "s:${ED}:/:" \
+		| xargs --no-run-if-empty -- \
+			fperms 755
+
+	dodoc NOTICE README.md
+}
diff --git a/dev-php/libphutil/libphutil-9999.ebuild b/dev-php/libphutil/libphutil-9999.ebuild
index 5a8c4649..075e5abb 100644
--- a/dev-php/libphutil/libphutil-9999.ebuild
+++ b/dev-php/libphutil/libphutil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,6 +27,8 @@ src_prepare() {
 	default
 
 	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
+	git remote add origin "${EGIT_REPO_URI}"
+	git remote -v > "${S}/GIT_REMOTE_INFO"
 
 	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
 
@@ -104,7 +106,7 @@ src_test() {
 
 src_install() {
 	insinto "/usr/share/${PN}"
-	doins GIT_COMMIT_INFO
+	doins GIT_COMMIT_INFO GIT_REMOTE_INFO
 
 	insinto "/usr/share/php/${PN}"
 	doins -r externals resources scripts src