From fdf1290e6b2a65faeaa33a0893b74f3d981a13c3 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 16:03:50 -0500 Subject: [PATCH 01/16] net-analyzer/pnp4nagios: add gentoo package. --- net-analyzer/pnp4nagios/Manifest | 30 +++++++ .../pnp4nagios/files/98_pnp4nagios.conf | 22 +++++ net-analyzer/pnp4nagios/files/npcd | 37 ++++++++ net-analyzer/pnp4nagios/files/npcd.initd | 19 +++++ .../files/pnp4nagios-0.6.14-makefile.patch | 32 +++++++ net-analyzer/pnp4nagios/metadata.xml | 5 ++ .../pnp4nagios/pnp4nagios-0.6.24.ebuild | 85 +++++++++++++++++++ 7 files changed, 230 insertions(+) create mode 100644 net-analyzer/pnp4nagios/Manifest create mode 100644 net-analyzer/pnp4nagios/files/98_pnp4nagios.conf create mode 100644 net-analyzer/pnp4nagios/files/npcd create mode 100644 net-analyzer/pnp4nagios/files/npcd.initd create mode 100644 net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch create mode 100644 net-analyzer/pnp4nagios/metadata.xml create mode 100644 net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest new file mode 100644 index 0000000..e620875 --- /dev/null +++ b/net-analyzer/pnp4nagios/Manifest @@ -0,0 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX 98_pnp4nagios.conf 1025 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 WHIRLPOOL d28394eb0f63bd02f71c3ddd6c651f06c69354e2c9fd6fbd0bf65433d4721087078d06aa93df795c80f43a422b35f563b763ed7895891c603d6abbf359a197b1 +AUX npcd 759 SHA256 ea4c71df5c0a6bb410c44b08fc5c5428a3adf8c5daa7a12fe1068eaf71613be5 SHA512 54ccf3da9831b407d7a6b21d3409f7a8c854a32ec6eeda6036997059551bcec52e01b2b63a59e5269fef00c1c859dc856c4c6feb2323ff7fb328dd546c576a80 WHIRLPOOL 4e79bc6ee46a3aad0724488f4fa364b2e6916e30065ff8aed834c2e38929d6fd363210870fb3e4868ee65b0e7073b0d736c954f76415eec37aaa4efe62738454 +AUX npcd.initd 477 SHA256 eb1d5bdf589867136aaefa2f47bd808ef41109860d07d3862fd308585b6d7cff SHA512 c7c0ad6a94820f7327561e779968dc73104bf104bfc3077e952866522e89e7db69c2e289c7e4d61fce978416ef1a8e6d10e3f997fb498ce2157a3c23a869da4d WHIRLPOOL 7ff2db763dc3ee6cf24b0d720e1dd58235681ee1580d44aebbac406631c7c22366d871937eda7d64b4f07448fc28737650e42904aa69a687b7dbf0ab7a0672ab +AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 WHIRLPOOL 7e6725dfef952a97f5d682af955560c88895ae71e5aae9a3bb4842b3696d2f6009e6239c0860991d86fe68d64b4bf7c1e668a5059751cbba4b33850f2bc7584f +DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8 +EBUILD pnp4nagios-0.6.24.ebuild 2090 SHA256 9bbb4b82fee3508615da92f46381d24d759704c0146f787ebe32ee868516603a SHA512 1ba51aedc02b5103ec5ae4e5f42995a285182bd01508559072c4b6d201f4c03f861a11e4ceb7b3418d4be71732b7444823f97c72133d4fe109fa9b2c5c8cc8a2 WHIRLPOOL bb8686244a1a9517bb846c5971f1b4e688ee6ce92c78c3320d67e18151886badfcab5edc04a1ba5b5bb6ec9678f6e20eeac565790e45bf42e08002078890cfd8 +MISC ChangeLog 9540 SHA256 aacad009c732fc64069a73a79dd9af28300f44887342a2c684f0d3927864a3b5 SHA512 7da91e6a91dcec2f808d95def588e5d2e684c08651e81fde52e8b3413c95426f9c70e3b68d86a14ec3be361d12ae43c987b50bfdd014ad0d6be13781836d2e57 WHIRLPOOL 57861add7d44bed281b7d04f33bf75e0926e31a1aef053d5e2fc46cde991ea3ba2e736ee1c6c305dbf384928ef7d0589d79267c8031259ad9812a7da77ed0da4 +MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCgBmBQJUYMOhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNzoP/ApkkSAlXXh28hGQLA1Nf7wv +WD+3uZ55qU82fHSpiNCuitYN/yUs8RWuH/PN3oOJmtuxPECNhyNQrtoAaQ1si674 +FIY+vOZrAOx2bd08FSqIEJxMDgmhr1GBmYXhUeVjztj+0skPv6SWbHMHPVDyd0yr +gYBf58aMCSvQl7cC+A3t/TmfuNrL/GlUVEA9QMl75VUmFNFMQ3fm+x0WsgcwJRCJ +eSCsBlQspPKydJztWGkysavEIzEdVGPmVEWMqGYlEu6OrC+tSBNAbYT06kd0tYU3 +ts3RqHIGgfuqpd/jeGUT91+loh1A/WVrAhf7OYSB2LsdMmAP0w3HAEr1pHbXR3BK +PekVwtT98EQN3T03Hb/4xLK3eErldve/iUdzIP3i8REbg+TZvcIZAumVGCHwuZJ5 +0y6p3n/YvhN2IglNkHEqjYqxWZcuuGMpa7Nm9qL6kbTy/4oeF7hpekgsPCd69yGx +JhyBXkqxlmhsBIOmQw4tAy3qhZNgNiloc4J+POrvZJ8ts+Pg+qcgzTGKRidhBxda +5yousoqaQxXlyxamEmlkEzYUTvrjPfv4i8ObDj6mQrCHi2XZ9A7ZBp3lcsPgRQec +FtvVAyZ/ewcsRjimQk77fcArAzPYM92Pn39lcrMg1MXXu8zWHkl585R/tZR9t5jM +WxN3FT+easVElvSRnk9G +=0tQf +-----END PGP SIGNATURE----- diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf new file mode 100644 index 0000000..4879779 --- /dev/null +++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf @@ -0,0 +1,22 @@ + + Alias /pnp4nagios /usr/share/pnp/ + + AllowOverride AuthConfig + Order allow,deny + Allow from all + + # Turn on URL rewriting + RewriteEngine On + Options FollowSymLinks + # Installation directory + RewriteBase /pnp4nagios + # Protect application and system files from being viewed + RewriteRule ^(application|modules|system) - [F,L] + # Allow any files or directories that exist to be displayed directly + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + # Rewrite all other URLs to index.php/URL + RewriteRule .* index.php/$0 [PT,L] + + + diff --git a/net-analyzer/pnp4nagios/files/npcd b/net-analyzer/pnp4nagios/files/npcd new file mode 100644 index 0000000..9158c18 --- /dev/null +++ b/net-analyzer/pnp4nagios/files/npcd @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/files/npcd,v 1.2 2010/10/20 16:37:27 dertobi123 Exp $ + +opts="${opts} reload" + +depend() { + need net +} + +start() { + ebegin "Starting npcd" + start-stop-daemon --start --exec /usr/bin/npcd \ + -- -f /etc/pnp/npcd.cfg \ + -d + eend $? "Failed to Start npcd" +} + +stop() { + ebegin "Stopping npcd" + start-stop-daemon --stop --quiet -n npcd + eend $? "Failed to Stop npcd" +} + +reload() { + ebegin "Reloading npcd" + kill -HUP `pgrep npcd` + eend $? "Failed to reload npcd" +} + +restart() { + ebegin "Restarting npcd" + svc_stop + svc_start + eend $? "Failed to Restart npcd" +} diff --git a/net-analyzer/pnp4nagios/files/npcd.initd b/net-analyzer/pnp4nagios/files/npcd.initd new file mode 100644 index 0000000..abf7aeb --- /dev/null +++ b/net-analyzer/pnp4nagios/files/npcd.initd @@ -0,0 +1,19 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/files/npcd.initd,v 1.1 2012/07/22 21:45:07 idl0r Exp $ + +extra_started_commands="reload" + +command="/usr/bin/npcd" +command_args="-f /etc/pnp/npcd.cfg -d" + +depend() { + need net +} + +reload() { + ebegin "Reloading npcd" + kill -HUP `pgrep npcd` + eend $? "Failed to reload npcd" +} diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch new file mode 100644 index 0000000..469389d --- /dev/null +++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch @@ -0,0 +1,32 @@ +diff -Naur pnp4nagios-0.6.14.orig/src/Makefile.in pnp4nagios-0.6.14/src/Makefile.in +--- pnp4nagios-0.6.14.orig/src/Makefile.in 2011-08-10 17:18:46.000000000 +0200 ++++ pnp4nagios-0.6.14/src/Makefile.in 2011-08-10 17:19:51.000000000 +0200 +@@ -83,7 +83,7 @@ + # + ############################### + npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD) +- $(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread + + ############################### + # +@@ -118,7 +118,6 @@ + + install: + $(MAKE) install-basic +- $(MAKE) strip-post-install + + install-unstripped: + $(MAKE) install-basic +diff -Naur pnp4nagios-0.6.14.orig/configure pnp4nagios-0.6.14/configure +--- pnp4nagios-0.6.14.orig/configure 2011-08-12 09:01:12.000000000 +0200 ++++ pnp4nagios-0.6.14/configure 2011-08-12 09:03:32.000000000 +0200 +@@ -5565,7 +5565,7 @@ + PERFDATA_LOG="${localstatedir}/perfdata.log" + PERFDATA_DIR="${localstatedir}/perfdata" + PERFDATA_SPOOL_DIR="${localstatedir}/spool" +- mandir="\${prefix}/man" ++ mandir="/usr/share/man" + ;; + esac + diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml new file mode 100644 index 0000000..d7649f4 --- /dev/null +++ b/net-analyzer/pnp4nagios/metadata.xml @@ -0,0 +1,5 @@ + + + + sysadmin + diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild new file mode 100644 index 0000000..b94e1a1 --- /dev/null +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild,v 1.5 2014/11/10 13:51:44 ago Exp $ + +EAPI=5 + +inherit depend.apache eutils + +DESCRIPTION="A performance data analyzer for nagios" +HOMEPAGE="http://www.pnp4nagios.org" +SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" +KEYWORDS="amd64 ppc ppc64 ~sparc x86" + +DEPEND=" + dev-lang/php[json,simplexml,zlib,xml,filter] + >=dev-lang/php-5.3 + >=net-analyzer/rrdtool-1.2[graph,perl] + || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )" +RDEPEND="${DEPEND} + virtual/perl-Getopt-Long + virtual/perl-Time-HiRes + media-fonts/dejavu + apache2? ( www-servers/apache[apache2_modules_rewrite] )" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch +} + +src_configure() { + local var_dir= + local user_group= + + if has_version net-analyzer/nagios-core; then + var_dir=/var/nagios/ + user_group=nagios + else + var_dir=/var/lib/icinga/ + user_group=icinga + fi + + econf \ + --sysconfdir=/etc/pnp \ + --datarootdir=/usr/share/pnp \ + --mandir=/usr/share/man \ + --with-perfdata-dir=${var_dir}/perfdata \ + --with-nagios-user=${user_group} \ + --with-nagios-group=${user_group} \ + --with-perfdata-logfile=${var_dir}/perfdata.log \ + --with-perfdata-spool-dir=/var/spool/pnp +} + +src_compile() { + # The default target just shows a help + emake all +} + +src_install() { + emake DESTDIR="${D}" install install-config + newinitd "${FILESDIR}"/npcd.initd npcd + rm "${D}"/usr/share/pnp/install.php || die + + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}"/98_pnp4nagios.conf + fi + + # Bug 430358 - CVE-2012-3457 + find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die + find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die +} + +pkg_postinst() { + elog "Please make sure to enable URL rewriting in Apache or any other" + elog "webserver you're using, to get pnp4nagios running!" +} -- 2.43.2 From 51699a8fe80b540bb3990a840a24603bb15c3eb6 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 16:47:03 -0500 Subject: [PATCH 02/16] Bump copyright year. --- skel.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skel.ebuild b/skel.ebuild index 047abec..5975437 100644 --- a/skel.ebuild +++ b/skel.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -- 2.43.2 From 7675d9d3a65ccd567578df3e9755d0793e41886e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 17:08:20 -0500 Subject: [PATCH 03/16] net-analyzer/pnp4nagios: Revbump for apache-2.4 support. * Use apache-2.4.x directives in the apache conf file * Append +Options instead of setting them wholesale in the conf file * Use less indentation in the apache conf file * Depend on >=apache-2.4 * Use better "die" messages * Fix death of find.. -exec commands. --- net-analyzer/pnp4nagios/Manifest | 27 ++-------------- .../pnp4nagios/files/98_pnp4nagios-2.4.conf | 29 +++++++++++++++++ .../pnp4nagios/files/98_pnp4nagios.conf | 22 ------------- ....24.ebuild => pnp4nagios-0.6.24-r1.ebuild} | 32 +++++++++++++------ 4 files changed, 53 insertions(+), 57 deletions(-) create mode 100644 net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf delete mode 100644 net-analyzer/pnp4nagios/files/98_pnp4nagios.conf rename net-analyzer/pnp4nagios/{pnp4nagios-0.6.24.ebuild => pnp4nagios-0.6.24-r1.ebuild} (60%) diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index e620875..7845fa3 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -1,30 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX 98_pnp4nagios.conf 1025 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 WHIRLPOOL d28394eb0f63bd02f71c3ddd6c651f06c69354e2c9fd6fbd0bf65433d4721087078d06aa93df795c80f43a422b35f563b763ed7895891c603d6abbf359a197b1 +AUX 98_pnp4nagios-2.4.conf 725 SHA256 44436bf79e2b3624e3eb9eda86a083896b7057bb94dc04637ad2ad58e5e40f76 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000 WHIRLPOOL 0661a385e75d41b9a3e61cabf555ec0bbf6f59504867d7dee47936097dd491457d55d1507720af4152fcabb7ed90752def669270c5f31dcbc0d84f8db732f876 AUX npcd 759 SHA256 ea4c71df5c0a6bb410c44b08fc5c5428a3adf8c5daa7a12fe1068eaf71613be5 SHA512 54ccf3da9831b407d7a6b21d3409f7a8c854a32ec6eeda6036997059551bcec52e01b2b63a59e5269fef00c1c859dc856c4c6feb2323ff7fb328dd546c576a80 WHIRLPOOL 4e79bc6ee46a3aad0724488f4fa364b2e6916e30065ff8aed834c2e38929d6fd363210870fb3e4868ee65b0e7073b0d736c954f76415eec37aaa4efe62738454 AUX npcd.initd 477 SHA256 eb1d5bdf589867136aaefa2f47bd808ef41109860d07d3862fd308585b6d7cff SHA512 c7c0ad6a94820f7327561e779968dc73104bf104bfc3077e952866522e89e7db69c2e289c7e4d61fce978416ef1a8e6d10e3f997fb498ce2157a3c23a869da4d WHIRLPOOL 7ff2db763dc3ee6cf24b0d720e1dd58235681ee1580d44aebbac406631c7c22366d871937eda7d64b4f07448fc28737650e42904aa69a687b7dbf0ab7a0672ab AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 WHIRLPOOL 7e6725dfef952a97f5d682af955560c88895ae71e5aae9a3bb4842b3696d2f6009e6239c0860991d86fe68d64b4bf7c1e668a5059751cbba4b33850f2bc7584f DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8 -EBUILD pnp4nagios-0.6.24.ebuild 2090 SHA256 9bbb4b82fee3508615da92f46381d24d759704c0146f787ebe32ee868516603a SHA512 1ba51aedc02b5103ec5ae4e5f42995a285182bd01508559072c4b6d201f4c03f861a11e4ceb7b3418d4be71732b7444823f97c72133d4fe109fa9b2c5c8cc8a2 WHIRLPOOL bb8686244a1a9517bb846c5971f1b4e688ee6ce92c78c3320d67e18151886badfcab5edc04a1ba5b5bb6ec9678f6e20eeac565790e45bf42e08002078890cfd8 -MISC ChangeLog 9540 SHA256 aacad009c732fc64069a73a79dd9af28300f44887342a2c684f0d3927864a3b5 SHA512 7da91e6a91dcec2f808d95def588e5d2e684c08651e81fde52e8b3413c95426f9c70e3b68d86a14ec3be361d12ae43c987b50bfdd014ad0d6be13781836d2e57 WHIRLPOOL 57861add7d44bed281b7d04f33bf75e0926e31a1aef053d5e2fc46cde991ea3ba2e736ee1c6c305dbf384928ef7d0589d79267c8031259ad9812a7da77ed0da4 +EBUILD pnp4nagios-0.6.24-r1.ebuild 2559 SHA256 897a231717c11747ec3783e4618a5134e70bd418025659780ab71d7039a7080b SHA512 d62a276741c98bf2afc99cef82e55783e60c05511965807c6c3e7cfc77769ea559eb7580d3a231080dbab9dd1210eb252dd1978009785eece6d89cab95e21a2a WHIRLPOOL 317fd213d0caec6a2b328bf8d107b130f88a59d911206a3c3ea4cd38714ad4d0145408aa024aca98755388908eeda9e3261b7c18e165488dc317e3b6947c4d4f MISC metadata.xml 163 SHA256 a8aa48f63dab89c2af1f961029dea0ebf68a618dba59ac4661ea915dc85e18f0 SHA512 1744b806c2ddddbeee4d2b1e23c7f1ccf0d9427f679a65bd22cde617399d3a5bb30aada17ba5b648a3a46d9e1169b9d30ede4551fb8756dffc4e3e9306b199cf WHIRLPOOL b5af95c50999aaf066e6466928866baa34c6425459a580ab0712ba3e3ea518dc37a4082007043307ff169b1f8efe4f6a632d27d016b6fd307bf463cb47b78d55 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCgBmBQJUYMOhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNzoP/ApkkSAlXXh28hGQLA1Nf7wv -WD+3uZ55qU82fHSpiNCuitYN/yUs8RWuH/PN3oOJmtuxPECNhyNQrtoAaQ1si674 -FIY+vOZrAOx2bd08FSqIEJxMDgmhr1GBmYXhUeVjztj+0skPv6SWbHMHPVDyd0yr -gYBf58aMCSvQl7cC+A3t/TmfuNrL/GlUVEA9QMl75VUmFNFMQ3fm+x0WsgcwJRCJ -eSCsBlQspPKydJztWGkysavEIzEdVGPmVEWMqGYlEu6OrC+tSBNAbYT06kd0tYU3 -ts3RqHIGgfuqpd/jeGUT91+loh1A/WVrAhf7OYSB2LsdMmAP0w3HAEr1pHbXR3BK -PekVwtT98EQN3T03Hb/4xLK3eErldve/iUdzIP3i8REbg+TZvcIZAumVGCHwuZJ5 -0y6p3n/YvhN2IglNkHEqjYqxWZcuuGMpa7Nm9qL6kbTy/4oeF7hpekgsPCd69yGx -JhyBXkqxlmhsBIOmQw4tAy3qhZNgNiloc4J+POrvZJ8ts+Pg+qcgzTGKRidhBxda -5yousoqaQxXlyxamEmlkEzYUTvrjPfv4i8ObDj6mQrCHi2XZ9A7ZBp3lcsPgRQec -FtvVAyZ/ewcsRjimQk77fcArAzPYM92Pn39lcrMg1MXXu8zWHkl585R/tZR9t5jM -WxN3FT+easVElvSRnk9G -=0tQf ------END PGP SIGNATURE----- diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf new file mode 100644 index 0000000..5944a2e --- /dev/null +++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios-2.4.conf @@ -0,0 +1,29 @@ + + + Alias /pnp4nagios /usr/share/pnp/ + + + AllowOverride AuthConfig + Require all granted + + + # Turn on URL rewriting + RewriteEngine On + Options +FollowSymLinks + + # Installation directory + RewriteBase /pnp4nagios + + # Protect application and system files from being viewed + RewriteRule ^(application|modules|system) - [F,L] + + # Allow any files or directories that exist to be displayed directly + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + + # Rewrite all other URLs to index.php/URL + RewriteRule .* index.php/$0 [PT,L] + + + + diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf deleted file mode 100644 index 4879779..0000000 --- a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf +++ /dev/null @@ -1,22 +0,0 @@ - - Alias /pnp4nagios /usr/share/pnp/ - - AllowOverride AuthConfig - Order allow,deny - Allow from all - - # Turn on URL rewriting - RewriteEngine On - Options FollowSymLinks - # Installation directory - RewriteBase /pnp4nagios - # Protect application and system files from being viewed - RewriteRule ^(application|modules|system) - [F,L] - # Allow any files or directories that exist to be displayed directly - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - # Rewrite all other URLs to index.php/URL - RewriteRule .* index.php/$0 [PT,L] - - - diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild similarity index 60% rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild index b94e1a1..93ae572 100644 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24-r1.ebuild @@ -1,31 +1,39 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild,v 1.5 2014/11/10 13:51:44 ago Exp $ +# $Header: $ EAPI=5 inherit depend.apache eutils DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org" +HOMEPAGE="http://www.pnp4nagios.org/" SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" IUSE="" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" DEPEND=" dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )" + +# A list of modules used in our Apache config file. +APACHE_MODS="apache2_modules_alias," # "Alias" directive +APACHE_MODS+="apache2_modules_authz_core," # "Require" directive +APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends + RDEPEND="${DEPEND} virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu - apache2? ( www-servers/apache[apache2_modules_rewrite] )" + apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" +# There is no want_apache2_4, but we needed to specify that manually +# anyway to be able to include the list of modules. want_apache2 pkg_setup() { @@ -33,7 +41,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch + epatch "${FILESDIR}/${PN}-0.6.14-makefile.patch" } src_configure() { @@ -67,16 +75,20 @@ src_compile() { src_install() { emake DESTDIR="${D}" install install-config newinitd "${FILESDIR}"/npcd.initd npcd - rm "${D}"/usr/share/pnp/install.php || die + rm "${D}/usr/share/pnp/install.php" || \ + die "unable to remove ${D}/usr/share/pnp/install.php" if use apache2 ; then insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}"/98_pnp4nagios.conf + newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf fi # Bug 430358 - CVE-2012-3457 - find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die - find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die + find "${D}/etc/pnp" -type f -exec chmod 0640 '{}' + || \ + die "unable to set file permissions under ${D}/etc/pnp" + + find "${D}/etc/pnp" -type d -exec chmod 0750 '{}' + || \ + die "unable to set directory permissions under ${D}/etc/pnp" } pkg_postinst() { -- 2.43.2 From 450e7416d81188b1632d94d47548c5bcbe9e0857 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 18:42:09 -0500 Subject: [PATCH 04/16] net-proxy/torsocks: add gentoo package. --- net-proxy/torsocks/Manifest | 15 +++++++ net-proxy/torsocks/files/fix-docdir-r2.patch | 21 +++++++++ net-proxy/torsocks/files/fix-docdir.patch | 24 +++++++++++ .../torsocks/files/fix-find-libc.so.patch | 12 ++++++ .../files/suppress-warning-msgs.patch | 15 +++++++ net-proxy/torsocks/metadata.xml | 11 +++++ net-proxy/torsocks/torsocks-2.0.0.ebuild | 43 +++++++++++++++++++ 7 files changed, 141 insertions(+) create mode 100644 net-proxy/torsocks/Manifest create mode 100644 net-proxy/torsocks/files/fix-docdir-r2.patch create mode 100644 net-proxy/torsocks/files/fix-docdir.patch create mode 100644 net-proxy/torsocks/files/fix-find-libc.so.patch create mode 100644 net-proxy/torsocks/files/suppress-warning-msgs.patch create mode 100644 net-proxy/torsocks/metadata.xml create mode 100644 net-proxy/torsocks/torsocks-2.0.0.ebuild diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest new file mode 100644 index 0000000..68de610 --- /dev/null +++ b/net-proxy/torsocks/Manifest @@ -0,0 +1,15 @@ +AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb +AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424 +AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6 +AUX suppress-warning-msgs.patch 657 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759 SHA512 71472b0ea8ef99de58e2be415f7e90405b7f71c4dce26265dbfd4c2bdc2c037cfe2b7c6382f9128bfdc7d1cde850e20d411f9c5016e784840641d633cfa8482f WHIRLPOOL 90c90fb1a37c5f81008b0064be54302960f53886f90f854267502ebe523de1b02bac02b6549d52a5ba461192d395ff0a1b346b04c308a67f5cc1ac3ac50a4d9c +DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf +DIST torsocks-2.0.0-rc2.tar.gz 107022 SHA256 9467fc4e4d64b6d11dbbfc91196d7bd6fb08d7b4cc72d32a3850c9b78403908b SHA512 8b1d5870b70e20a3e3d5a4dc6344a41d5ff634293018ff721627a65325111b92444d0b715c61f111815d1d967fbd75a1f61815715895fb9ec5e4b6d7597b4409 WHIRLPOOL ac7f02fb4bcfab7a71bd0dc8ce730a2832ac220c6bc3605fe4c87532be3dcc773b0088824ecb9fef4ef24d93cbf16e637efe7858c8b9730705ab695c59f89716 +DIST torsocks-2.0.0-rc3.tar.gz 109998 SHA256 6d3ddb8856a12ff39365e359a06b057c0ea03edc7733b25437a3638d2a973244 SHA512 c10b8ae2f0115eae2b36baa46f48f586c1efaf101d391c4ace95e4b3fbc7287c1b281968524808a752e77e4be077b1583fe7b96d24643c7f27205a379fd9f946 WHIRLPOOL fcb474ff6d8e75265cec9b04914cb7a9f5826b2fc2f1ebec61d6bef7a8b29ee5e86b1882fae0658528b79b4de0da1ec04977ef062a9c77cb94ce4c49b9dac673 +DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5 +EBUILD torsocks-1.2-r2.ebuild 981 SHA256 87f50b8a941a23492aa1ed4250df01dc1d13409ed5b6d821695d6f5711c61536 SHA512 253ffe340bec3611fe7269298d0bebfebcb7ae314683119d242df4ab84ebe3dba5a5d05ca961ccb026f3fb9e3801f9bd05a2f961a355fda07622b75e2cf2ee1d WHIRLPOOL a7331db87b9975d99bc0578baf16483f376a29367116fe12514f92ca1ef6d585862545e4a00f35d85bb70ca2a95f55077c0440bc9d7c1a513bd9901028911a74 +EBUILD torsocks-1.2.ebuild 767 SHA256 7b6fc94c85685ce6191ac9381ff90f3b9aae2b76e00075da777dc0e6a1bb1cb1 SHA512 a004fc2ed9350a7e2e3929c754b21ff943604aa84a3c505bfe417f97fd997462c0e45ef1e77b9f861be76d75d5635fd4b2760dfd6bf7213bffcb22fec50de98a WHIRLPOOL 16a3f017f4f6cd8084cb5b25a64061be265741055894db444ae88112f9e315d1180db0e5112ea5ef603e191e318afd23c64f61844c0485203002a1e61657c035 +EBUILD torsocks-2.0.0.ebuild 1090 SHA256 ce483f5f904337a6b024c7e6b66e80e75381f68ef86e2f2bcdc43eedc429a552 SHA512 fa818b754865657db0cc101c6725c4e285eb131f9ba733d0d2b440315a3fce333d1ccf1f9764280d51ada76ca34078ff55608c20ddf7bf8f60748e7d583c5ac9 WHIRLPOOL 15823db58d222a2ab429849db88cef3d81c87cbef82ddb65e6042db5761776f5d62ac21366831b43173c103a3d2a80da67661637fdcbf5fe998a85b241970055 +EBUILD torsocks-2.0.0_rc2.ebuild 1068 SHA256 a1cdef44f05123a0220ee76f3618f85fa3f07c0140d0518b956caa60b3746078 SHA512 dc245eb13c1a29ef15e619c71c9615c10fc6eb903d924efa82998ce5b303df3a7dfce81ec766a4934230186d6e849827fe96fc7ba9226a837a345bac97d5cc1e WHIRLPOOL c086b4f9d1f34204fa29578e932cddcf972c60bd605c5eb9b6bfef3cfa82c64ae9cb34a5c8e965191d784d50b72547d83d2c2bd8057a3569781f56da9e3bcb1a +EBUILD torsocks-2.0.0_rc3.ebuild 1113 SHA256 487f1d6b91ff5bb913c5a2dbbc3abbd37c348981c020abfc8245d91494d44835 SHA512 c0a491887a118f39f8849b460eecb875dfe0753df497f376bb495d9fe8a16d57f313693553460231f48bf89266607eaddac131114b7cb3f2cfaa62239f6916d8 WHIRLPOOL 14f5b4fe008f12e6ebd55d0f6e4e72a664cc3a2edfeb40152da8ce44448f78fa3266c0bdfef2142d7b2aa52b90665cec68bdec438e32de9bec47ffd8ee485dd5 +MISC ChangeLog 2485 SHA256 542405864816063a05412ed4b5da2db8bda231db35721ec24060463361e45e0b SHA512 f6d28aaa9d5e0798e2dbb62c3780d769a06dc83f4b419d78a815072efdbf9d6e994dacf9c804e582fd0769be4674e99b6fcd07c11c2e2658df5a6f8314f3b97a WHIRLPOOL 32008925f0655056450ac12f5bd708e5a3aad36888ce01bd08f8dc40c9b95c6ac5300c8b8fff59cf9ebe7af4b43a03e4198465693ab59eb802f89b1a0b89babc +MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9 diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch new file mode 100644 index 0000000..05986ec --- /dev/null +++ b/net-proxy/torsocks/files/fix-docdir-r2.patch @@ -0,0 +1,21 @@ +diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am +--- torsocks-2.0.0-rc2.orig/doc/Makefile.am 2013-09-02 14:06:44.000000000 -0400 ++++ torsocks-2.0.0-rc2/doc/Makefile.am 2013-09-17 14:19:37.769272561 -0400 +@@ -6,5 +6,5 @@ + dist_man5_MANS = torsocks.conf.5 + dist_man8_MANS = torsocks.8 + +-dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG ++#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG + +diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am +--- torsocks-2.0.0-rc2.orig/Makefile.am 2013-09-02 14:06:44.000000000 -0400 ++++ torsocks-2.0.0-rc2/Makefile.am 2013-09-17 14:20:07.945273935 -0400 +@@ -2,6 +2,6 @@ + + SUBDIRS = src doc tests + +-dist_doc_DATA = ChangeLog ++#dist_doc_DATA = ChangeLog + + EXTRA_DIST = gpl-2.0.txt diff --git a/net-proxy/torsocks/files/fix-docdir.patch b/net-proxy/torsocks/files/fix-docdir.patch new file mode 100644 index 0000000..899c15b --- /dev/null +++ b/net-proxy/torsocks/files/fix-docdir.patch @@ -0,0 +1,24 @@ +diff -Naur torsocks-1.2.orig/doc/Makefile.am torsocks-1.2/doc/Makefile.am +--- torsocks-1.2.orig/doc/Makefile.am 2011-10-26 14:30:26.000000000 -0400 ++++ torsocks-1.2/doc/Makefile.am 2011-12-26 20:05:40.000000000 -0500 +@@ -7,8 +7,6 @@ + # Install man pages + dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 + +-dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ +- patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \ +- patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \ +- patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG ++dist_doc_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ ++ notes/DEBUG + +diff -Naur torsocks-1.2.orig/test/Makefile.am torsocks-1.2/test/Makefile.am +--- torsocks-1.2.orig/test/Makefile.am 2011-10-26 14:21:57.000000000 -0400 ++++ torsocks-1.2/test/Makefile.am 2011-12-26 20:04:34.000000000 -0500 +@@ -4,4 +4,4 @@ + test_torsocks_LDFLAGS= $(TESTLDFLAGS) + CLEANFILES= test_torsocks + +-dist_data_DATA = run_tests.sh expectedresults.txt +\ No newline at end of file ++dist_doc_DATA = run_tests.sh expectedresults.txt diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch new file mode 100644 index 0000000..0fb1949 --- /dev/null +++ b/net-proxy/torsocks/files/fix-find-libc.so.patch @@ -0,0 +1,12 @@ +diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac +--- torsocks-2.0.0-rc3.orig/configure.ac 2013-11-03 13:24:51.000000000 -0500 ++++ torsocks-2.0.0-rc3/configure.ac 2014-01-26 12:49:55.157606016 -0500 +@@ -132,7 +132,7 @@ + dnl Get libc full system path. Use prefix or some hardcoded standard + dnl location on Unixish system. + AC_MSG_CHECKING(location of libc.so) +-for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do ++for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do + if test "${LIBC_PATH}" = ""; then + LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` + fi diff --git a/net-proxy/torsocks/files/suppress-warning-msgs.patch b/net-proxy/torsocks/files/suppress-warning-msgs.patch new file mode 100644 index 0000000..7470b9f --- /dev/null +++ b/net-proxy/torsocks/files/suppress-warning-msgs.patch @@ -0,0 +1,15 @@ +--- torsocks-1.2.orig/src/torsocks.c 2011-10-25 17:49:50.000000000 -0400 ++++ torsocks-1.2/src/torsocks.c 2012-02-21 11:09:20.000000000 -0500 +@@ -124,9 +124,9 @@ + #define LOAD_ERROR(s,l) { \ + const char *error; \ + error = dlerror(); \ +- show_msg(l, "The symbol %s() was not found in any shared " \ +- "library. The error reported was: %s!\n", s, \ +- (error)?error:"not found"); \ ++ if (error) \ ++ show_msg(l, "The symbol %s() was not found in any shared " \ ++ "library. The error reported was: %s!\n", s, error); \ + dlerror(); \ + } + pthread_mutex_lock(&torsocks_init_mutex); diff --git a/net-proxy/torsocks/metadata.xml b/net-proxy/torsocks/metadata.xml new file mode 100644 index 0000000..651feb9 --- /dev/null +++ b/net-proxy/torsocks/metadata.xml @@ -0,0 +1,11 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + torsocks + + diff --git a/net-proxy/torsocks/torsocks-2.0.0.ebuild b/net-proxy/torsocks/torsocks-2.0.0.ebuild new file mode 100644 index 0000000..c7e4611 --- /dev/null +++ b/net-proxy/torsocks/torsocks-2.0.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0.ebuild,v 1.1 2014/12/21 21:34:58 mrueg Exp $ + +EAPI=5 + +inherit autotools eutils multilib versionator + +MY_PV="$(replace_version_separator 3 -)" +MY_PF="${PN}-${MY_PV}" +S=${WORKDIR}/${MY_PF} + +DESCRIPTION="Use most socks-friendly applications with Tor" +HOMEPAGE="http://github.com/dgoulet/torsocks" +SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static-libs" + +# We do not depend on tor which might be running on a different box +DEPEND="" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + + dodoc ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt} + + #Remove libtool .la files + cd "${D}"/usr/$(get_libdir)/torsocks + rm -f *.la +} -- 2.43.2 From 027598c2dc43821ad7cb896911269b8eeb2744ba Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 19:07:29 -0500 Subject: [PATCH 05/16] net-proxy/torsocks: disable network tests. --- net-proxy/torsocks/Manifest | 10 +--------- net-proxy/torsocks/torsocks-2.0.0.ebuild | 9 +++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest index 68de610..400589d 100644 --- a/net-proxy/torsocks/Manifest +++ b/net-proxy/torsocks/Manifest @@ -2,14 +2,6 @@ AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424 AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6 AUX suppress-warning-msgs.patch 657 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759 SHA512 71472b0ea8ef99de58e2be415f7e90405b7f71c4dce26265dbfd4c2bdc2c037cfe2b7c6382f9128bfdc7d1cde850e20d411f9c5016e784840641d633cfa8482f WHIRLPOOL 90c90fb1a37c5f81008b0064be54302960f53886f90f854267502ebe523de1b02bac02b6549d52a5ba461192d395ff0a1b346b04c308a67f5cc1ac3ac50a4d9c -DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf -DIST torsocks-2.0.0-rc2.tar.gz 107022 SHA256 9467fc4e4d64b6d11dbbfc91196d7bd6fb08d7b4cc72d32a3850c9b78403908b SHA512 8b1d5870b70e20a3e3d5a4dc6344a41d5ff634293018ff721627a65325111b92444d0b715c61f111815d1d967fbd75a1f61815715895fb9ec5e4b6d7597b4409 WHIRLPOOL ac7f02fb4bcfab7a71bd0dc8ce730a2832ac220c6bc3605fe4c87532be3dcc773b0088824ecb9fef4ef24d93cbf16e637efe7858c8b9730705ab695c59f89716 -DIST torsocks-2.0.0-rc3.tar.gz 109998 SHA256 6d3ddb8856a12ff39365e359a06b057c0ea03edc7733b25437a3638d2a973244 SHA512 c10b8ae2f0115eae2b36baa46f48f586c1efaf101d391c4ace95e4b3fbc7287c1b281968524808a752e77e4be077b1583fe7b96d24643c7f27205a379fd9f946 WHIRLPOOL fcb474ff6d8e75265cec9b04914cb7a9f5826b2fc2f1ebec61d6bef7a8b29ee5e86b1882fae0658528b79b4de0da1ec04977ef062a9c77cb94ce4c49b9dac673 DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5 -EBUILD torsocks-1.2-r2.ebuild 981 SHA256 87f50b8a941a23492aa1ed4250df01dc1d13409ed5b6d821695d6f5711c61536 SHA512 253ffe340bec3611fe7269298d0bebfebcb7ae314683119d242df4ab84ebe3dba5a5d05ca961ccb026f3fb9e3801f9bd05a2f961a355fda07622b75e2cf2ee1d WHIRLPOOL a7331db87b9975d99bc0578baf16483f376a29367116fe12514f92ca1ef6d585862545e4a00f35d85bb70ca2a95f55077c0440bc9d7c1a513bd9901028911a74 -EBUILD torsocks-1.2.ebuild 767 SHA256 7b6fc94c85685ce6191ac9381ff90f3b9aae2b76e00075da777dc0e6a1bb1cb1 SHA512 a004fc2ed9350a7e2e3929c754b21ff943604aa84a3c505bfe417f97fd997462c0e45ef1e77b9f861be76d75d5635fd4b2760dfd6bf7213bffcb22fec50de98a WHIRLPOOL 16a3f017f4f6cd8084cb5b25a64061be265741055894db444ae88112f9e315d1180db0e5112ea5ef603e191e318afd23c64f61844c0485203002a1e61657c035 -EBUILD torsocks-2.0.0.ebuild 1090 SHA256 ce483f5f904337a6b024c7e6b66e80e75381f68ef86e2f2bcdc43eedc429a552 SHA512 fa818b754865657db0cc101c6725c4e285eb131f9ba733d0d2b440315a3fce333d1ccf1f9764280d51ada76ca34078ff55608c20ddf7bf8f60748e7d583c5ac9 WHIRLPOOL 15823db58d222a2ab429849db88cef3d81c87cbef82ddb65e6042db5761776f5d62ac21366831b43173c103a3d2a80da67661637fdcbf5fe998a85b241970055 -EBUILD torsocks-2.0.0_rc2.ebuild 1068 SHA256 a1cdef44f05123a0220ee76f3618f85fa3f07c0140d0518b956caa60b3746078 SHA512 dc245eb13c1a29ef15e619c71c9615c10fc6eb903d924efa82998ce5b303df3a7dfce81ec766a4934230186d6e849827fe96fc7ba9226a837a345bac97d5cc1e WHIRLPOOL c086b4f9d1f34204fa29578e932cddcf972c60bd605c5eb9b6bfef3cfa82c64ae9cb34a5c8e965191d784d50b72547d83d2c2bd8057a3569781f56da9e3bcb1a -EBUILD torsocks-2.0.0_rc3.ebuild 1113 SHA256 487f1d6b91ff5bb913c5a2dbbc3abbd37c348981c020abfc8245d91494d44835 SHA512 c0a491887a118f39f8849b460eecb875dfe0753df497f376bb495d9fe8a16d57f313693553460231f48bf89266607eaddac131114b7cb3f2cfaa62239f6916d8 WHIRLPOOL 14f5b4fe008f12e6ebd55d0f6e4e72a664cc3a2edfeb40152da8ce44448f78fa3266c0bdfef2142d7b2aa52b90665cec68bdec438e32de9bec47ffd8ee485dd5 -MISC ChangeLog 2485 SHA256 542405864816063a05412ed4b5da2db8bda231db35721ec24060463361e45e0b SHA512 f6d28aaa9d5e0798e2dbb62c3780d769a06dc83f4b419d78a815072efdbf9d6e994dacf9c804e582fd0769be4674e99b6fcd07c11c2e2658df5a6f8314f3b97a WHIRLPOOL 32008925f0655056450ac12f5bd708e5a3aad36888ce01bd08f8dc40c9b95c6ac5300c8b8fff59cf9ebe7af4b43a03e4198465693ab59eb802f89b1a0b89babc +EBUILD torsocks-2.0.0.ebuild 1127 SHA256 b2da75ec354d94b230a15a7ca7e6899df2417963f3dc95eab4f3854996cf7d9d SHA512 82ece2514aa412eb08f535cd66e54b63ca9bda824c7c2d7b5b4434b4bc712e0dc0d87f8cb094ba4d0b41c23f8a6a991c010319d9a14b8ffd85d5c1541202c109 WHIRLPOOL 77801f03abcdfe95bab73ba5c7a14f902888b60d9c16162809b9b207138e94ac49a643e7603adad482c2be6a9e33f8ba20f14aad6d2d97d3db0a401712f1c49e MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9 diff --git a/net-proxy/torsocks/torsocks-2.0.0.ebuild b/net-proxy/torsocks/torsocks-2.0.0.ebuild index c7e4611..57c29df 100644 --- a/net-proxy/torsocks/torsocks-2.0.0.ebuild +++ b/net-proxy/torsocks/torsocks-2.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0.ebuild,v 1.1 2014/12/21 21:34:58 mrueg Exp $ +# $Header: $ EAPI=5 @@ -25,6 +25,11 @@ RDEPEND="${DEPEND}" src_prepare() { sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die + + # Disable tests requiring network access. + sed -i -e '/^\.\/test_dns$/d' tests/test_list || \ + die "failed to disable network tests" + eautoreconf } -- 2.43.2 From 429e250f2e8037fc30f838890640ce1279adc605 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 3 Jan 2015 19:07:56 -0500 Subject: [PATCH 06/16] net-proxy/torsocks: remove package, fix posted to the bug. --- net-proxy/torsocks/Manifest | 7 --- net-proxy/torsocks/files/fix-docdir-r2.patch | 21 -------- net-proxy/torsocks/files/fix-docdir.patch | 24 ---------- .../torsocks/files/fix-find-libc.so.patch | 12 ----- .../files/suppress-warning-msgs.patch | 15 ------ net-proxy/torsocks/metadata.xml | 11 ----- net-proxy/torsocks/torsocks-2.0.0.ebuild | 48 ------------------- 7 files changed, 138 deletions(-) delete mode 100644 net-proxy/torsocks/Manifest delete mode 100644 net-proxy/torsocks/files/fix-docdir-r2.patch delete mode 100644 net-proxy/torsocks/files/fix-docdir.patch delete mode 100644 net-proxy/torsocks/files/fix-find-libc.so.patch delete mode 100644 net-proxy/torsocks/files/suppress-warning-msgs.patch delete mode 100644 net-proxy/torsocks/metadata.xml delete mode 100644 net-proxy/torsocks/torsocks-2.0.0.ebuild diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest deleted file mode 100644 index 400589d..0000000 --- a/net-proxy/torsocks/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb -AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424 -AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6 -AUX suppress-warning-msgs.patch 657 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759 SHA512 71472b0ea8ef99de58e2be415f7e90405b7f71c4dce26265dbfd4c2bdc2c037cfe2b7c6382f9128bfdc7d1cde850e20d411f9c5016e784840641d633cfa8482f WHIRLPOOL 90c90fb1a37c5f81008b0064be54302960f53886f90f854267502ebe523de1b02bac02b6549d52a5ba461192d395ff0a1b346b04c308a67f5cc1ac3ac50a4d9c -DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5 -EBUILD torsocks-2.0.0.ebuild 1127 SHA256 b2da75ec354d94b230a15a7ca7e6899df2417963f3dc95eab4f3854996cf7d9d SHA512 82ece2514aa412eb08f535cd66e54b63ca9bda824c7c2d7b5b4434b4bc712e0dc0d87f8cb094ba4d0b41c23f8a6a991c010319d9a14b8ffd85d5c1541202c109 WHIRLPOOL 77801f03abcdfe95bab73ba5c7a14f902888b60d9c16162809b9b207138e94ac49a643e7603adad482c2be6a9e33f8ba20f14aad6d2d97d3db0a401712f1c49e -MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9 diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch deleted file mode 100644 index 05986ec..0000000 --- a/net-proxy/torsocks/files/fix-docdir-r2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am ---- torsocks-2.0.0-rc2.orig/doc/Makefile.am 2013-09-02 14:06:44.000000000 -0400 -+++ torsocks-2.0.0-rc2/doc/Makefile.am 2013-09-17 14:19:37.769272561 -0400 -@@ -6,5 +6,5 @@ - dist_man5_MANS = torsocks.conf.5 - dist_man8_MANS = torsocks.8 - --dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG -+#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG - -diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am ---- torsocks-2.0.0-rc2.orig/Makefile.am 2013-09-02 14:06:44.000000000 -0400 -+++ torsocks-2.0.0-rc2/Makefile.am 2013-09-17 14:20:07.945273935 -0400 -@@ -2,6 +2,6 @@ - - SUBDIRS = src doc tests - --dist_doc_DATA = ChangeLog -+#dist_doc_DATA = ChangeLog - - EXTRA_DIST = gpl-2.0.txt diff --git a/net-proxy/torsocks/files/fix-docdir.patch b/net-proxy/torsocks/files/fix-docdir.patch deleted file mode 100644 index 899c15b..0000000 --- a/net-proxy/torsocks/files/fix-docdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur torsocks-1.2.orig/doc/Makefile.am torsocks-1.2/doc/Makefile.am ---- torsocks-1.2.orig/doc/Makefile.am 2011-10-26 14:30:26.000000000 -0400 -+++ torsocks-1.2/doc/Makefile.am 2011-12-26 20:05:40.000000000 -0500 -@@ -7,8 +7,6 @@ - # Install man pages - dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 - --dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ -- patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \ -- patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \ -- patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG -+dist_doc_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ -+ notes/DEBUG - -diff -Naur torsocks-1.2.orig/test/Makefile.am torsocks-1.2/test/Makefile.am ---- torsocks-1.2.orig/test/Makefile.am 2011-10-26 14:21:57.000000000 -0400 -+++ torsocks-1.2/test/Makefile.am 2011-12-26 20:04:34.000000000 -0500 -@@ -4,4 +4,4 @@ - test_torsocks_LDFLAGS= $(TESTLDFLAGS) - CLEANFILES= test_torsocks - --dist_data_DATA = run_tests.sh expectedresults.txt -\ No newline at end of file -+dist_doc_DATA = run_tests.sh expectedresults.txt diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch deleted file mode 100644 index 0fb1949..0000000 --- a/net-proxy/torsocks/files/fix-find-libc.so.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac ---- torsocks-2.0.0-rc3.orig/configure.ac 2013-11-03 13:24:51.000000000 -0500 -+++ torsocks-2.0.0-rc3/configure.ac 2014-01-26 12:49:55.157606016 -0500 -@@ -132,7 +132,7 @@ - dnl Get libc full system path. Use prefix or some hardcoded standard - dnl location on Unixish system. - AC_MSG_CHECKING(location of libc.so) --for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do -+for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do - if test "${LIBC_PATH}" = ""; then - LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` - fi diff --git a/net-proxy/torsocks/files/suppress-warning-msgs.patch b/net-proxy/torsocks/files/suppress-warning-msgs.patch deleted file mode 100644 index 7470b9f..0000000 --- a/net-proxy/torsocks/files/suppress-warning-msgs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- torsocks-1.2.orig/src/torsocks.c 2011-10-25 17:49:50.000000000 -0400 -+++ torsocks-1.2/src/torsocks.c 2012-02-21 11:09:20.000000000 -0500 -@@ -124,9 +124,9 @@ - #define LOAD_ERROR(s,l) { \ - const char *error; \ - error = dlerror(); \ -- show_msg(l, "The symbol %s() was not found in any shared " \ -- "library. The error reported was: %s!\n", s, \ -- (error)?error:"not found"); \ -+ if (error) \ -+ show_msg(l, "The symbol %s() was not found in any shared " \ -+ "library. The error reported was: %s!\n", s, error); \ - dlerror(); \ - } - pthread_mutex_lock(&torsocks_init_mutex); diff --git a/net-proxy/torsocks/metadata.xml b/net-proxy/torsocks/metadata.xml deleted file mode 100644 index 651feb9..0000000 --- a/net-proxy/torsocks/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - blueness@gentoo.org - Anthony G. Basile - - - torsocks - - diff --git a/net-proxy/torsocks/torsocks-2.0.0.ebuild b/net-proxy/torsocks/torsocks-2.0.0.ebuild deleted file mode 100644 index 57c29df..0000000 --- a/net-proxy/torsocks/torsocks-2.0.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils multilib versionator - -MY_PV="$(replace_version_separator 3 -)" -MY_PF="${PN}-${MY_PV}" -S=${WORKDIR}/${MY_PF} - -DESCRIPTION="Use most socks-friendly applications with Tor" -HOMEPAGE="http://github.com/dgoulet/torsocks" -SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="static-libs" - -# We do not depend on tor which might be running on a different box -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die - - # Disable tests requiring network access. - sed -i -e '/^\.\/test_dns$/d' tests/test_list || \ - die "failed to disable network tests" - - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - - dodoc ChangeLog README.md TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt} - - #Remove libtool .la files - cd "${D}"/usr/$(get_libdir)/torsocks - rm -f *.la -} -- 2.43.2 From d08a36d9971508850b4f9c91ecbc3dd51c54b58b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 10 Jan 2015 11:50:06 -0500 Subject: [PATCH 07/16] app-emacs/multi-term: Update URLs and add a site file. --- app-emacs/multi-term/Manifest | 3 ++- app-emacs/multi-term/files/50multi-term-gentoo.el | 6 ++++++ app-emacs/multi-term/multi-term-1.2.ebuild | 8 +++++--- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 app-emacs/multi-term/files/50multi-term-gentoo.el diff --git a/app-emacs/multi-term/Manifest b/app-emacs/multi-term/Manifest index 59ff066..899bb5a 100644 --- a/app-emacs/multi-term/Manifest +++ b/app-emacs/multi-term/Manifest @@ -1,3 +1,4 @@ +AUX 50multi-term-gentoo.el 202 SHA256 ca0c03ce349a0b6823c946633acd29fc5b3ae4b42a3ca670a2bf6c32de4664b6 SHA512 33dd7ea311104f461551f349b36bd86aae95181da912cbdadaf26e309a983ad9e1b20025dcd7ea779aa7a071bfa14f8751adce23c0c5d7232999773c5116e336 WHIRLPOOL af7fcd8de816e471da311f7fb1387a81316874a08653cdf61620b7f3ccc92b3a80e00de42c87a4848a5d34314a707cc732d8ca120b63a7625830f3d194c6b740 DIST multi-term-1.2.el.xz 7876 SHA256 8fbc1b1f08b4905eab33187d6a2eb82399308a98092f39eeb4f4c12849bce3b3 SHA512 4041c7fa61aa6840aaad67d13a3e73717c2f9cbb4df68c4ba450c454d65aa4f3b3da749c346d0b06ac1ccf0c43b52dde771335148e03f66bbc561d84ba452180 WHIRLPOOL 02beb9b6d64ea4bda1fcb1a40e0f994c4bc50f4e80ad1f9fc4a448f9da2e3f6efa82e6931447478d09cc2695e3f719a5119435f01ad0149131a17506b387fd25 -EBUILD multi-term-1.2.ebuild 416 SHA256 34b429645e0583ba9171ee7d83232970b037308ea7bc681247eaf1a802d4bdef SHA512 79c9ba97360e796b87765df31a19031d9e8def2038d08ff51ac3cd361cb5b667f14beeb736c60635ba0716e153627d61c3a0033a51341d11cd6531649540f422 WHIRLPOOL d3a85a4fd0113e67a2c1af1f609f61fc2206ac231160fe96c527eee0be68795fe70b9390c20a9bc35861feee7b18f3841495471d7672d92c65d9a2f6499db06c +EBUILD multi-term-1.2.ebuild 452 SHA256 6cb7da3d584a3a2af7ae5fd35f5ac6887a7e617d28af696d1478fadf2679e862 SHA512 2b525272fcaf1f0520e195491d6f7161ab1372c276b0bb57caf956e76bf09252945e5516a30b57949ba30b5aae1f81188a9eb0f6a80cd43b9558e9f157457059 WHIRLPOOL 4fdf65e5373f443d66f8f59d2ce4891877e5aefdc680cfa998f5c4f83365d0c80d5b7c4006af6d30d8f1350948627cf80b315f47fc38d1326e76b9da021b54d8 MISC metadata.xml 259 SHA256 2af72b5ef9cc6595c20559a2b67094d0c86beaac45660285f3441ceeae198e98 SHA512 bf756188b6d70c59cf5427917dbebad98c78d200f91f7d92619df2bdda811d5ae80838596f91fcba08f352aa33ffe0206ce5d2e7b6b2b3bdafca56187c5ef5b1 WHIRLPOOL 3df45d615bd840587e7d5e06e049b816382c4456dad79fde88c9e14a992049a1b276f9217bad1269ae5d30d141d25b2cd764fe4fc838e3838ea72763704151e6 diff --git a/app-emacs/multi-term/files/50multi-term-gentoo.el b/app-emacs/multi-term/files/50multi-term-gentoo.el new file mode 100644 index 0000000..75447e2 --- /dev/null +++ b/app-emacs/multi-term/files/50multi-term-gentoo.el @@ -0,0 +1,6 @@ +(add-to-list 'load-path "@SITELISP@") + +(autoload 'multi-term + "multi-term" "Create a new terminal buffer." t) +(autoload 'multi-term-dedicated-open + "multi-term" "Open a dedicated terminal buffer." t) diff --git a/app-emacs/multi-term/multi-term-1.2.ebuild b/app-emacs/multi-term/multi-term-1.2.ebuild index 6ef9754..4117514 100644 --- a/app-emacs/multi-term/multi-term-1.2.ebuild +++ b/app-emacs/multi-term/multi-term-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,10 +7,12 @@ EAPI=5 inherit elisp DESCRIPTION="Manage multiple terminal buffers in Emacs" -HOMEPAGE="http://www.emacswiki.org/MultiTerm" -# taken from http://www.emacswiki.org/emacs/download/${PN}.el +HOMEPAGE="http://www.emacswiki.org/emacs/MultiTerm" +# Taken from http://www.emacswiki.org/emacs/download/${PN}.el SRC_URI="http://dev.gentoo.org/~mjo/distfiles/${P}.el.xz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" + +SITEFILE="50${PN}-gentoo.el" -- 2.43.2 From 65c2faf55a4887a3c1dc49ba2f1f1b84a82ce0e8 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 10 Jan 2015 14:46:23 -0500 Subject: [PATCH 08/16] app-emacs/multi-term: remove package (in gx86). --- app-emacs/multi-term/Manifest | 4 ---- .../multi-term/files/50multi-term-gentoo.el | 6 ------ app-emacs/multi-term/metadata.xml | 9 --------- app-emacs/multi-term/multi-term-1.2.ebuild | 18 ------------------ 4 files changed, 37 deletions(-) delete mode 100644 app-emacs/multi-term/Manifest delete mode 100644 app-emacs/multi-term/files/50multi-term-gentoo.el delete mode 100644 app-emacs/multi-term/metadata.xml delete mode 100644 app-emacs/multi-term/multi-term-1.2.ebuild diff --git a/app-emacs/multi-term/Manifest b/app-emacs/multi-term/Manifest deleted file mode 100644 index 899bb5a..0000000 --- a/app-emacs/multi-term/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 50multi-term-gentoo.el 202 SHA256 ca0c03ce349a0b6823c946633acd29fc5b3ae4b42a3ca670a2bf6c32de4664b6 SHA512 33dd7ea311104f461551f349b36bd86aae95181da912cbdadaf26e309a983ad9e1b20025dcd7ea779aa7a071bfa14f8751adce23c0c5d7232999773c5116e336 WHIRLPOOL af7fcd8de816e471da311f7fb1387a81316874a08653cdf61620b7f3ccc92b3a80e00de42c87a4848a5d34314a707cc732d8ca120b63a7625830f3d194c6b740 -DIST multi-term-1.2.el.xz 7876 SHA256 8fbc1b1f08b4905eab33187d6a2eb82399308a98092f39eeb4f4c12849bce3b3 SHA512 4041c7fa61aa6840aaad67d13a3e73717c2f9cbb4df68c4ba450c454d65aa4f3b3da749c346d0b06ac1ccf0c43b52dde771335148e03f66bbc561d84ba452180 WHIRLPOOL 02beb9b6d64ea4bda1fcb1a40e0f994c4bc50f4e80ad1f9fc4a448f9da2e3f6efa82e6931447478d09cc2695e3f719a5119435f01ad0149131a17506b387fd25 -EBUILD multi-term-1.2.ebuild 452 SHA256 6cb7da3d584a3a2af7ae5fd35f5ac6887a7e617d28af696d1478fadf2679e862 SHA512 2b525272fcaf1f0520e195491d6f7161ab1372c276b0bb57caf956e76bf09252945e5516a30b57949ba30b5aae1f81188a9eb0f6a80cd43b9558e9f157457059 WHIRLPOOL 4fdf65e5373f443d66f8f59d2ce4891877e5aefdc680cfa998f5c4f83365d0c80d5b7c4006af6d30d8f1350948627cf80b315f47fc38d1326e76b9da021b54d8 -MISC metadata.xml 259 SHA256 2af72b5ef9cc6595c20559a2b67094d0c86beaac45660285f3441ceeae198e98 SHA512 bf756188b6d70c59cf5427917dbebad98c78d200f91f7d92619df2bdda811d5ae80838596f91fcba08f352aa33ffe0206ce5d2e7b6b2b3bdafca56187c5ef5b1 WHIRLPOOL 3df45d615bd840587e7d5e06e049b816382c4456dad79fde88c9e14a992049a1b276f9217bad1269ae5d30d141d25b2cd764fe4fc838e3838ea72763704151e6 diff --git a/app-emacs/multi-term/files/50multi-term-gentoo.el b/app-emacs/multi-term/files/50multi-term-gentoo.el deleted file mode 100644 index 75447e2..0000000 --- a/app-emacs/multi-term/files/50multi-term-gentoo.el +++ /dev/null @@ -1,6 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") - -(autoload 'multi-term - "multi-term" "Create a new terminal buffer." t) -(autoload 'multi-term-dedicated-open - "multi-term" "Open a dedicated terminal buffer." t) diff --git a/app-emacs/multi-term/metadata.xml b/app-emacs/multi-term/metadata.xml deleted file mode 100644 index f381dd4..0000000 --- a/app-emacs/multi-term/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - emacs - - mjo@gentoo.org - Michael Orlitzky - - diff --git a/app-emacs/multi-term/multi-term-1.2.ebuild b/app-emacs/multi-term/multi-term-1.2.ebuild deleted file mode 100644 index 4117514..0000000 --- a/app-emacs/multi-term/multi-term-1.2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit elisp - -DESCRIPTION="Manage multiple terminal buffers in Emacs" -HOMEPAGE="http://www.emacswiki.org/emacs/MultiTerm" -# Taken from http://www.emacswiki.org/emacs/download/${PN}.el -SRC_URI="http://dev.gentoo.org/~mjo/distfiles/${P}.el.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -SITEFILE="50${PN}-gentoo.el" -- 2.43.2 From 15005b00acc089b4c7cec4bdaaf3d58f0aef444c Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 22 Jan 2015 15:16:26 -0500 Subject: [PATCH 09/16] media-gfx/textext: new package. --- media-gfx/textext/Manifest | 3 +++ media-gfx/textext/metadata.xml | 8 +++++++ media-gfx/textext/textext-0.4.4.ebuild | 29 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 media-gfx/textext/Manifest create mode 100644 media-gfx/textext/metadata.xml create mode 100644 media-gfx/textext/textext-0.4.4.ebuild diff --git a/media-gfx/textext/Manifest b/media-gfx/textext/Manifest new file mode 100644 index 0000000..d9cc06a --- /dev/null +++ b/media-gfx/textext/Manifest @@ -0,0 +1,3 @@ +DIST textext-0.4.4.tar.gz 9475 SHA256 4d3d262efc8b199dff407b6d153c8822ac9b30d46357e0cdc191c2c0f5fea077 SHA512 359ffd8a79e54da1bb8bd5e5190ad2d55b3f59b8566cece1f3b968be818175e3eed20bfb50becf5bdaffe35f5d6b80e4af8291b516a4ddd7c96f82e92d2bd8f7 WHIRLPOOL 8c8e3bcd14efdaba5c0f2ed25fe38f6e01571fcb88007a8e055ae99511d3697617be09548ed1d0b411b43c550b14727d0146f778b08d67c2e63ef5bdf5d3c5a5 +EBUILD textext-0.4.4.ebuild 660 SHA256 978494922cf9740a038b1b1f785e951f62fe313077fc4cc227d41833275336b5 SHA512 707f1a03102b8ea5f4458c7358f4591edaa8591fd710c23379d50dab73ad3b689b9d915aa8ad69bd66d4fe0cab27fa69cfd93a6f58cc67f568ba0077cd2f2483 WHIRLPOOL 9990f6e96f5f2f357769bc72d8550f51aae5443059cc17478d48cbb0e1f1b1e7a1cf754c887d15f6443bd205300b50bc444711025ceb70b397b1d446d9c91483 +MISC metadata.xml 238 SHA256 73c41bfe4a4e049013ddbc6405247621edf2d1e621f76e8a8d747cba88a16c9a SHA512 83522e45fe89c9f1cf0afb2e2d1764c11fb4e77508c31d022f27a034799b0a218bcbf17a5b7fd60fb829e4992b780de7eac5e124f1d8735a7b1af459884c9154 WHIRLPOOL a3004b8f128f1686100c895ede8af30e0f8b3149974544529d02803860e4ec85b3ded4c23f9e5d2ea31deecac9139a92649e646bfe12903b2020bc96be866df3 diff --git a/media-gfx/textext/metadata.xml b/media-gfx/textext/metadata.xml new file mode 100644 index 0000000..df7fdbe --- /dev/null +++ b/media-gfx/textext/metadata.xml @@ -0,0 +1,8 @@ + + + + + mjo@gentoo.org + Michael Orlitzky + + diff --git a/media-gfx/textext/textext-0.4.4.ebuild b/media-gfx/textext/textext-0.4.4.ebuild new file mode 100644 index 0000000..65429b3 --- /dev/null +++ b/media-gfx/textext/textext-0.4.4.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="Editable LaTeX text objects for Inkscape" +HOMEPAGE="http://pav.iki.fi/software/textext/" +SRC_URI="http://pav.iki.fi/software/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# Do we want to complicate our dependencies by adding +# media-gfx/inkscape? +DEPEND="" +RDEPEND="app-text/dvipsk + dev-python/lxml + dev-texlive/texlive-latex + || ( media-gfx/pdf2svg media-gfx/pstoedit[plotutils] )" + +S="${WORKDIR}" + +src_install() { + insinto /usr/share/inkscape/extensions/ + doins textext.inx textext.py +} -- 2.43.2 From e9b6003551af59f6957afa8e076c2433c3778166 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 13:38:27 -0500 Subject: [PATCH 10/16] Add dev-lang/php::gentoo. --- dev-lang/php/Manifest | 21 + dev-lang/php/files/20php5-envd | 2 + dev-lang/php/files/70_mod_php5.conf-apache2 | 14 + .../all_mysql_socket_location-gentoo.patch | 13 + dev-lang/php/files/all_strict_aliasing.patch | 14 + dev-lang/php/files/bison_any_version.patch | 16 + dev-lang/php/files/bison_build_2.patch | 29 + dev-lang/php/files/bison_build_2a.patch | 30 + .../files/fix-libstdc++-underlinking.patch | 10 + .../files/freetype-2.5.1-linking-fix.patch | 64 ++ dev-lang/php/files/iodbc-pkgconfig-r1.patch | 52 ++ dev-lang/php/files/iodbc-pkgconfig.patch | 52 ++ .../php/files/missing-openssl-include.patch | 14 + dev-lang/php/files/php-fpm-r1.conf | 311 +++++++ dev-lang/php/files/php-fpm-r4.init | 47 ++ dev-lang/php/files/php-fpm_at-simple.service | 13 + dev-lang/php/files/php-fpm_at.service | 14 + dev-lang/php/files/php5-ldvs | 1 + .../stricter-libc-client-symlink-check.patch | 15 + dev-lang/php/metadata.xml | 29 + dev-lang/php/php-5.6.4.ebuild | 784 ++++++++++++++++++ 21 files changed, 1545 insertions(+) create mode 100644 dev-lang/php/Manifest create mode 100644 dev-lang/php/files/20php5-envd create mode 100644 dev-lang/php/files/70_mod_php5.conf-apache2 create mode 100644 dev-lang/php/files/all_mysql_socket_location-gentoo.patch create mode 100644 dev-lang/php/files/all_strict_aliasing.patch create mode 100644 dev-lang/php/files/bison_any_version.patch create mode 100644 dev-lang/php/files/bison_build_2.patch create mode 100644 dev-lang/php/files/bison_build_2a.patch create mode 100644 dev-lang/php/files/fix-libstdc++-underlinking.patch create mode 100644 dev-lang/php/files/freetype-2.5.1-linking-fix.patch create mode 100644 dev-lang/php/files/iodbc-pkgconfig-r1.patch create mode 100644 dev-lang/php/files/iodbc-pkgconfig.patch create mode 100644 dev-lang/php/files/missing-openssl-include.patch create mode 100644 dev-lang/php/files/php-fpm-r1.conf create mode 100755 dev-lang/php/files/php-fpm-r4.init create mode 100644 dev-lang/php/files/php-fpm_at-simple.service create mode 100644 dev-lang/php/files/php-fpm_at.service create mode 100644 dev-lang/php/files/php5-ldvs create mode 100644 dev-lang/php/files/stricter-libc-client-symlink-check.patch create mode 100644 dev-lang/php/metadata.xml create mode 100644 dev-lang/php/php-5.6.4.ebuild diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest new file mode 100644 index 0000000..af42ae6 --- /dev/null +++ b/dev-lang/php/Manifest @@ -0,0 +1,21 @@ +AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd +AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441 +AUX all_mysql_socket_location-gentoo.patch 633 SHA256 d1c0fcea4509cdb7504701e5b1996661483c3b5eea194c07fdaef91a1ce18a27 SHA512 cc55b3c1cd2e9fe4d4aa887146de9306afbbc44a3bd652225982cc04b9aefa8ca094448a765f52bc36e49726034cc702d9ef41e6da518946813103920f5ccf4e WHIRLPOOL e06c83a8852fcb1387a38774e91377464086a4908aee379d7196bc9ce2a76c6850399266aa0390e8f9885f6812c1ea717c8d98a4eb9949c3d86db357f95c18ac +AUX all_strict_aliasing.patch 463 SHA256 9be7ef7f2727b48b0416ccc613430da95a92b59158bc7dd77f16bb8fa879efdd SHA512 6c9aacb2175a4ca3169360fd33bc9c3cb6a3631e316f7d834e8a0711248e38a90e3eb7b482e0ec79ba1971384f352ac1b88ec4caf2a6e412caf144d767cc7bed WHIRLPOOL 6e24b92eee6463f7f58e136c66bf5c0f3b2b3cfcffdecb0fe42e81fe3ee3a23b3451d933cc4ba5d9e04f819776d3d00b1eb496e5efa7786f399b88fec25ecf88 +AUX bison_any_version.patch 569 SHA256 251065c4e721180942fa89bb039c3eae74153bac8c7685f270715fc9822be590 SHA512 de8a39d84f67f3787dfa52fbdb17e2d32ef23be2a6f910c046640be3208a58cba9352bc0235f7c67a103e1bb5012806341b914fe8a456c90ec4b7c6608a9068d WHIRLPOOL fb2501e1c7a8fe7228f9f7abc86935544af6661b4d8a39ed0b29652551da627803038d459af2190664b19cc938fefd55d8f2a388b4e3ee1032f1dc3ee3c69ef3 +AUX bison_build_2.patch 652 SHA256 6821e773183d12c5e9f94df929f50561fbb885192fbff071bd931fc643c5bd44 SHA512 01ebb99e7ea922a56e925ea9cd7b9edfa31b34d63069e7f418c1bcae86c9f927f835646855537af37519d1b0d2558d43e3eee5a4a1622605349ab1e2314d2142 WHIRLPOOL 45efdda59efb1eaf1a7c8a3b955e8a0401390e48e1941c0eacf55b725680a037e8057495341cb22f00c8eae55d13f1bb4db7a3a2507bd6dceb52764c0ad82604 +AUX bison_build_2a.patch 584 SHA256 a4abbb9ae4a7e29b3c5d099929fd4041c810d061dd2bb6c6c94cb9542d727bd2 SHA512 fb3c1a7ce77b8f0241dd519fc5de97a193c195e0a04f82f56444d6822298bf049f9232eceff678816f480d184e2a02d0161bdc2cf42f42c1b88c462833b3ce28 WHIRLPOOL 8585552b0a4eda2c45003e8ce148ce8dfe8bb78a1f81eb517260db91b84e61d337a50ba089b5b8e4248081af6ad33dca3fe097d19999663792353954e9b40815 +AUX fix-libstdc++-underlinking.patch 264 SHA256 c174fbe838373d3fad9536c621685426c71ccfea73371889f60d7bed07efc230 SHA512 3b91b6917c8d452cbeaf98c445b989f1e0d2c86a02598b5e6647625289868eaf51eee253db8909fb5faada3b588f22b3bfee44b679d6257bcc00c067a80938d6 WHIRLPOOL b7024c2f478e79967e81f938d36689c2cd968b3db2a05f9ce3a57721cd3727046b300d1b436e73cd0ae31393d3e572164743ffe139d36798f41a3e88e86c4239 +AUX freetype-2.5.1-linking-fix.patch 2513 SHA256 feb2957ddebe50e4ea06d9a5686a0502246f87809678ad2271c9a128718c5cd8 SHA512 b1f94d5bbc42c6b321bfb5160820ec6e71a04e6ed38f482edf446d5d0988f2154a4f43e11443b5123960b49d9a00e29a3d62e3558cd2ebe271a7520f303e677d WHIRLPOOL dcdbd97def1f026970f7b594b99452ac409c5d4f77dfdba09a459b9a3ad14de820c1e56de54c2c84766166d091e3ef3c9b27292fe1a142a845c8e73605827e37 +AUX iodbc-pkgconfig-r1.patch 1824 SHA256 c832037a42bf0b3e8e0e478a91e103520d10e65769382f8261987cb5a1cdcc4e SHA512 4030b7a06e6dc8f6e18dd53853e503b46428935bdb1e5b49c0471d942daf41ba7b563d2a88012497eae4392cbf74d659ff321e481aad8d17d622485e46b4bc40 WHIRLPOOL cbf678c30c55c1a076400dc32b7551cdc3cddb77aae401c93f6395ee9fe0a4f6c6bc4acf98b394e1993d16bcb1f94978149ce3a16cb9e64b6cd8b899b5223180 +AUX iodbc-pkgconfig.patch 1820 SHA256 11c4e2f1d0c34bd5a7264fed11bb1786af0341e9756649d842ef90eadc815be8 SHA512 283c06aaa01aac76b71cd30bc5a1e882f14c02c63696c4a349a3338163a216e1adcc1149c9c5be8fbcb40554717406c8a9d6c5f8f8aa5c01a155b9993f280966 WHIRLPOOL 2057400bfeac10b115b5705eefb824e945305594ade2536c3d88c29b988a841bda29a4f0b41895df10e4696204c08327d4d2da33c6596a43ab798f83eabdcc95 +AUX missing-openssl-include.patch 456 SHA256 40d7a7de8dfde9844c12a03f96c2b4c78b08b776505f94abdddb6f5c7617454c SHA512 e6c663e508772e403e540fc900f752f18d12eef35526154716728da0ba89a8eb48f12bbb7611c0672f22a1d0b6814365e90ecabb8b8e78411816b8b8889f03ea WHIRLPOOL 258448576333077c14ba5181ab4e6de2ecc75d4811aeac5fc2e71ba22e8f4644db43998c50db6423cda55c82039c1f6cf5ee16ef79b84bd4c3161b33776b9936 +AUX php-fpm-r1.conf 12966 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c SHA512 3d421c1e8b8f6ecffbf8284a7f79a1e5cc3f0893b1a47f5ccd980d554b058c363c1e236aa3157c2b66791b3291c6e98981cc527d501328ccc3ccb34eee2950ef WHIRLPOOL 1f591597698e28fc47197e02ba680728363c50781d146cf2598403f4678781eabc4f4d2abe2c0bfe9a25065491d3cb514cc5a9dcee4edd9d9438f51181f43b2a +AUX php-fpm-r4.init 1157 SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 SHA512 3555a2210104185b93b3805400995ed987076429c47b0950f58396c535d7ea99a5d2e7eedde071e2de06f4e248e0cb9bd27ccbf01b5606152a2f559fe874afbe WHIRLPOOL 6f5f0e45004275c7c984e68c293282db23461a64965b7d7c4a0ded682140177989ed50217aea6253178cc18fa9f9d202a69383400dc1a53271f00e85884849a1 +AUX php-fpm_at-simple.service 316 SHA256 c11d3bb213993ad27642abf2fb13ab8d9bd3fd8ffb6c863ca0baa057555a2fa6 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd WHIRLPOOL bf78a0e1bc22525de1bfa6896ceeb39932f4a1507820667f5216af10f8de205436a82abefe55d4776d911de99070e6f6ed3dacc1708288323d8ad789dab57fb9 +AUX php-fpm_at.service 317 SHA256 6bbbbd7b6501305c17b7290bb2a83b0ebe492d421adaac8f394e387ed52e0d25 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 WHIRLPOOL c101ad8eb7446a6fcb3dba6ec6caae12bd6c0a9d251e222c392abb37314fbc252321bdc7db1696480050ce543a154b7257e503d3065d9e238d1c5c76a74d65ff +AUX php5-ldvs 22 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 SHA512 689a0a12b3527741d2e47870c125e93be73a127e5e798c4b685ccb11653be5a8615faf3178c71a6346fe264d3c4ec76601bc05878fef67b9dbd2e45be59a344d WHIRLPOOL b24f193a1067f699c8efb199ba4e3f1fdd22c13dff98655206b30072ce8c8035fb4ed9288f694856f9978bd9935d3a5589cd968316920e712779c45b44897634 +AUX stricter-libc-client-symlink-check.patch 786 SHA256 bc80d286ce3b2805ce41e46580f24c5ba8f613b670757f81e6b2b638aecbf0df SHA512 db94207a3fd883f78b20fd9261720c39ad097566ae4dd913fe33a12adcedaab943ca0975a4f6a4917d40f6fde61e9b5928378ad91f3afe62d84aba3c9351db03 WHIRLPOOL 1ee44c69658d844614b31d09b8ce945075c9491703c04cb57aceec2469a97db65bf80871e4cf2ba6c9d9fe19a4305906e09d0cc474a635c9a1a6001a4d8c982a +DIST php-5.6.4.tar.bz2 13498882 SHA256 576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1 SHA512 855f885c2d8ad6393a8fb1bfacdb83f8eef910966e6ab50cb3fc4bcbd5800d4f69a6c866623b517a0163ab1984402206f7a32c54acddcd5f9bcdcf77eb04abdf WHIRLPOOL b93d618f54e32ce838ecede0cd1c7afd7bf00a50dfac0ac79827f4364142d2ad0433f6cc7325ee870961afb32ad827ddc4f5190301c20c038e720bdb7ee5d0cb +EBUILD php-5.6.4.ebuild 22318 SHA256 27aa7ce3432dca3ab4f7f78081109858f370de55380c273c8418355bce899bd9 SHA512 393d7aa225d3e0579994c963a668f71d54030f603d867c1e9a54a9cb1ed175b9dee5ce3052e01e2513efaf6ad5b20111a84aaee7217186b2467224e8c1f434d4 WHIRLPOOL 95522df7cfa84cd58976e27f2a06087360a68125b10e17b6e1d79051af2a59fde34807d3eafe4f6675595f24d4070c983d27075139805d7e83ad436237eb202b +MISC metadata.xml 1601 SHA256 0f0d69832d7bf8ca13c940247d67e184d866ae48f4f77167b3b6a508f4c0ebfe SHA512 744b80efb645e7c6e632101c98cb7bcaf2a6530d948e5cb320050cfe4ca3733e29b995e2b1e4677b648c7a9e051a8056c6f38ae03ae18656a9583b24c32b6056 WHIRLPOOL 8ba9c5edf403759541ea1aad65138f48ddc4e4bef73c3a43744e1d0513031ab431fe1e742a39125257c3545ae0a091118d1b36d04a28bdf96e9989185764ae50 diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd new file mode 100644 index 0000000..f6033ae --- /dev/null +++ b/dev-lang/php/files/20php5-envd @@ -0,0 +1,2 @@ +MANPATH="/usr/lib/php5/man/" +CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/" diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2 new file mode 100644 index 0000000..7ec8739 --- /dev/null +++ b/dev-lang/php/files/70_mod_php5.conf-apache2 @@ -0,0 +1,14 @@ + + # Load the module first + + LoadModule php5_module modules/libphp5.so + + + # Set it to handle the files + + AddHandler application/x-httpd-php .php .php5 .phtml + AddHandler application/x-httpd-php-source .phps + + + DirectoryIndex index.php index.phtml + diff --git a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch new file mode 100644 index 0000000..bd17998 --- /dev/null +++ b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch @@ -0,0 +1,13 @@ +diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c +--- a/ext/mysqlnd/mysqlnd.c 2010-10-22 17:46:26.000000000 +0200 ++++ b/ext/mysqlnd/mysqlnd.c 2010-12-08 21:54:47.000000000 +0100 +@@ -619,7 +619,8 @@ + if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) { + DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a"); + if (!socket_or_pipe) { +- socket_or_pipe = "/tmp/mysql.sock"; ++ // gentoo mysql default socket location ++ socket_or_pipe = "/var/run/mysqld/mysqld.sock"; + } + transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe); + unix_socket = TRUE; diff --git a/dev-lang/php/files/all_strict_aliasing.patch b/dev-lang/php/files/all_strict_aliasing.patch new file mode 100644 index 0000000..cfa6090 --- /dev/null +++ b/dev-lang/php/files/all_strict_aliasing.patch @@ -0,0 +1,14 @@ +upstream bug: http://bugs.php.net/bug.php?id=46311 +The current patch follows a suggestion from Siarhei Siamashka +Adapted for php 5.5 +--- Zend/zend_execute.h.old 2013-01-01 13:49:04.587825704 +0100 ++++ Zend/zend_execute.h 2013-01-01 13:53:28.762958578 +0100 +@@ -293,7 +293,7 @@ + void **end = p - (int)(zend_uintptr_t)*p; + + while (p != end) { +- zval *q = *(zval **)(--p); ++ zval *q = (zval *)*(--p); + *p = NULL; + i_zval_ptr_dtor(q ZEND_FILE_LINE_CC); + } diff --git a/dev-lang/php/files/bison_any_version.patch b/dev-lang/php/files/bison_any_version.patch new file mode 100644 index 0000000..94271e5 --- /dev/null +++ b/dev-lang/php/files/bison_any_version.patch @@ -0,0 +1,16 @@ +--- ./Zend/acinclude.m4 2013-03-20 15:09:27.000000000 +0100 ++++ ./Zend/acinclude.m4.new 2013-03-25 21:35:27.654016588 +0100 +@@ -17,12 +17,7 @@ + if test -n "$bison_version_vars"; then + set $bison_version_vars + bison_version="${1}.${2}" +- for bison_check_version in $bison_version_list; do +- if test "$bison_version" = "$bison_check_version"; then +- php_cv_bison_version="$bison_check_version (ok)" +- break +- fi +- done ++ php_cv_bison_version="$bison_version (ok)" + fi + ]) + fi diff --git a/dev-lang/php/files/bison_build_2.patch b/dev-lang/php/files/bison_build_2.patch new file mode 100644 index 0000000..dd2481d --- /dev/null +++ b/dev-lang/php/files/bison_build_2.patch @@ -0,0 +1,29 @@ +diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y +index ccbc9b1..6a9a24a 100644 +--- a/Zend/zend_language_parser.y ++++ b/Zend/zend_language_parser.y +@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); + + #define YYERROR_VERBOSE + #define YYSTYPE znode +-#ifdef ZTS +-# define YYPARSE_PARAM tsrm_ls +-# define YYLEX_PARAM tsrm_ls +-#endif +- + + %} + + %pure_parser + %expect 3 + ++%code requires { ++#ifdef ZTS ++# define YYPARSE_PARAM tsrm_ls ++# define YYLEX_PARAM tsrm_ls ++#endif ++} ++ + %token END 0 "end of file" + %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE + %token T_INCLUDE "include (T_INCLUDE)" diff --git a/dev-lang/php/files/bison_build_2a.patch b/dev-lang/php/files/bison_build_2a.patch new file mode 100644 index 0000000..7dedd03 --- /dev/null +++ b/dev-lang/php/files/bison_build_2a.patch @@ -0,0 +1,30 @@ +Gentoo bug: #494240 +Upstream: #64503 + +--- Zend/zend_language_parser.y.orig 2013-12-14 12:25:43.528989017 +0100 ++++ Zend/zend_language_parser.y 2013-12-14 12:26:30.088988957 +0100 +@@ -38,10 +38,6 @@ + + #define YYERROR_VERBOSE + #define YYSTYPE znode +-#ifdef ZTS +-# define YYPARSE_PARAM tsrm_ls +-# define YYLEX_PARAM tsrm_ls +-#endif + + + %} +@@ -49,6 +45,13 @@ + %pure_parser + %expect 2 + ++%code requires { ++#ifdef ZTS ++# define YYPARSE_PARAM tsrm_ls ++# define YYLEX_PARAM tsrm_ls ++#endif ++} ++ + %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE + %left ',' + %left T_LOGICAL_OR diff --git a/dev-lang/php/files/fix-libstdc++-underlinking.patch b/dev-lang/php/files/fix-libstdc++-underlinking.patch new file mode 100644 index 0000000..a35305a --- /dev/null +++ b/dev-lang/php/files/fix-libstdc++-underlinking.patch @@ -0,0 +1,10 @@ +--- acinclude.m4 2013-04-02 09:58:33.069274096 +0200 ++++ acinclude.m4.new 2013-04-02 09:58:25.221240142 +0200 +@@ -762,6 +762,7 @@ + if test -z "$php_cxx_done"; then + AC_PROG_CXX + AC_PROG_CXXCPP ++ PHP_ADD_LIBRARY(stdc++) + php_cxx_done=yes + fi + ]) diff --git a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch b/dev-lang/php/files/freetype-2.5.1-linking-fix.patch new file mode 100644 index 0000000..3b78f9b --- /dev/null +++ b/dev-lang/php/files/freetype-2.5.1-linking-fix.patch @@ -0,0 +1,64 @@ +From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001 +From: Adam Harvey +Date: Sat, 7 Dec 2013 19:39:40 -0800 +Subject: [PATCH] Switch to using freetype-config for freetype detection. + +This fixes GD compilation against libfreetype 2.5.1 and later after they made +the rather interesting decision to change their include directory layout in a +point release. + +The original suggestion in the bug was to use pkg-config, but my inclination is +to use freetype-config instead: we should be able to get the same configuration +information without actually needing pkg-config installed, since pkg-config is +by no means guaranteed to exist on many Unices and distros, whereas +freetype-config should always be present if a libfreetype build environment is +installed. Let's try it out and see what happens. + +Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)). + +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index 0e35ece..732e14c 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/bin/freetype-config"; then + FREETYPE2_DIR=$i +- FREETYPE2_INC_DIR=$i/include/freetype2 ++ FREETYPE2_CONFIG="$i/bin/freetype-config" + break + fi + done + + if test -z "$FREETYPE2_DIR"; then +- AC_MSG_ERROR([freetype.h not found.]) ++ AC_MSG_ERROR([freetype-config not found.]) + fi + +- PHP_CHECK_LIBRARY(freetype, FT_New_Face, +- [ +- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) +- PHP_ADD_INCLUDE($FREETYPE2_DIR/include) +- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) +- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) +- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) +- AC_DEFINE(ENABLE_GD_TTF,1,[ ]) +- ],[ +- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.]) +- ],[ +- -L$FREETYPE2_DIR/$PHP_LIBDIR +- ]) ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ ++ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) ++ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) ++ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) ++ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) ++ AC_DEFINE(ENABLE_GD_TTF,1,[ ]) + else + AC_MSG_RESULT([If configure fails try --with-freetype-dir=]) + fi diff --git a/dev-lang/php/files/iodbc-pkgconfig-r1.patch b/dev-lang/php/files/iodbc-pkgconfig-r1.patch new file mode 100644 index 0000000..b215984 --- /dev/null +++ b/dev-lang/php/files/iodbc-pkgconfig-r1.patch @@ -0,0 +1,52 @@ +--- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200 ++++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200 +@@ -366,22 +366,37 @@ + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(iodbc,, +-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) ++[ --with-iodbc[=DIR] Include iODBC support]) + + if test "$PHP_IODBC" != "no"; then + AC_MSG_CHECKING(for iODBC support) +- if test "$PHP_IODBC" = "yes"; then +- PHP_IODBC=/usr/local ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ++ ODBC_TYPE=iodbc ++ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc` ++ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc` ++ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc` ++ PHP_EVAL_INCLINE($ODBC_INCLUDE) ++ AC_DEFINE(HAVE_IODBC,1,[ ]) ++ AC_DEFINE(HAVE_ODBC2,1,[ ]) ++ AC_MSG_RESULT([$ext_output]) ++ else ++ if test "$PHP_IODBC" = "yes"; then ++ PHP_IODBC=/usr/local ++ fi ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ++ PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ++ ODBC_TYPE=iodbc ++ ODBC_INCLUDE=-I$PHP_IODBC/include ++ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR ++ ODBC_LIBS=-liodbc ++ AC_DEFINE(HAVE_IODBC,1,[ ]) ++ AC_DEFINE(HAVE_ODBC2,1,[ ]) ++ AC_MSG_RESULT([$ext_output]) + fi +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) +- PHP_ADD_INCLUDE($PHP_IODBC/include, 1) +- ODBC_TYPE=iodbc +- ODBC_INCLUDE=-I$PHP_IODBC/include +- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR +- ODBC_LIBS=-liodbc +- AC_DEFINE(HAVE_IODBC,1,[ ]) +- AC_DEFINE(HAVE_ODBC2,1,[ ]) +- AC_MSG_RESULT([$ext_output]) + fi + fi + diff --git a/dev-lang/php/files/iodbc-pkgconfig.patch b/dev-lang/php/files/iodbc-pkgconfig.patch new file mode 100644 index 0000000..f32f8eb --- /dev/null +++ b/dev-lang/php/files/iodbc-pkgconfig.patch @@ -0,0 +1,52 @@ +--- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200 ++++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200 +@@ -366,22 +366,37 @@ + + if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH(iodbc,, +-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) ++[ --with-iodbc[=DIR] Include iODBC support]) + + if test "$PHP_IODBC" != "no"; then + AC_MSG_CHECKING(for iODBC support) +- if test "$PHP_IODBC" = "yes"; then +- PHP_IODBC=/usr/local ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ++ ODBC_TYPE=iodbc ++ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc` ++ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc` ++ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc` ++ PHP_EVAL_INCLINE($ODBC_INCLUDE) ++ AC_DEFINE(HAVE_IODBC,1,[ ]) ++ AC_DEFINE(HAVE_ODBC2,1,[ ]) ++ AC_MSG_RESULT([$ext_output]) ++ else ++ if test "$PHP_IODBC" = "yes"; then ++ PHP_IODBC=/usr/local ++ fi ++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ++ PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ++ ODBC_TYPE=iodbc ++ ODBC_INCLUDE=-I$PHP_IODBC/include ++ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR ++ ODBC_LIBS=-liodbc ++ AC_DEFINE(HAVE_IODBC,1,[ ]) ++ AC_DEFINE(HAVE_ODBC2,1,[ ]) ++ AC_MSG_RESULT([$ext_output]) + fi +- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) +- PHP_ADD_INCLUDE($PHP_IODBC/include, 1) +- ODBC_TYPE=iodbc +- ODBC_INCLUDE=-I$PHP_IODBC/include +- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR +- ODBC_LIBS=-liodbc +- AC_DEFINE(HAVE_IODBC,1,[ ]) +- AC_DEFINE(HAVE_ODBC2,1,[ ]) +- AC_MSG_RESULT([$ext_output]) + fi + fi + diff --git a/dev-lang/php/files/missing-openssl-include.patch b/dev-lang/php/files/missing-openssl-include.patch new file mode 100644 index 0000000..28cc7dd --- /dev/null +++ b/dev-lang/php/files/missing-openssl-include.patch @@ -0,0 +1,14 @@ +--- acinclude.m4 2012-11-17 21:53:06.346408695 +0100 ++++ acinclude.m4.new 2013-03-18 11:37:09.253432820 +0100 +@@ -2331,8 +2331,10 @@ + AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) + fi + +- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then ++ if test -n "$OPENSSL_LIBS" ; then + PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1) ++ fi ++ if test -n "$OPENSSL_INCS" ; then + PHP_EVAL_INCLINE($OPENSSL_INCS) + fi + fi diff --git a/dev-lang/php/files/php-fpm-r1.conf b/dev-lang/php/files/php-fpm-r1.conf new file mode 100644 index 0000000..0b0a7f8 --- /dev/null +++ b/dev-lang/php/files/php-fpm-r1.conf @@ -0,0 +1,311 @@ +;;;;;;;;;;;;;;;;;;;;; +; FPM Configuration ; +;;;;;;;;;;;;;;;;;;;;; + +; All relative paths in this configuration file are relative to PHP's install +; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the +; '-p' argument from the command line. + +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +; Relative path can also be used. They will be prefixed by: +; - the global prefix if it's been set (-p arguement) +; - /usr/lib/php5.3 otherwise +;include=/etc/php/fpm-php5.3/fpm.d/*.conf + +;;;;;;;;;;;;;;;;;; +; Global Options ; +;;;;;;;;;;;;;;;;;; + +[global] +; Pid file +; Note: the default prefix is /var/lib +; Default Value: none +; Warning: pid file is overriden by the Gentoo init script. +; FPM will refuse to start if you uncomment this settingi and make use of the +; init script. +; pid = /var/run/php-fpm.pid + +; Error log file +; Note: the default prefix is /var/lib +; Default Value: log/php-fpm.log +error_log = /var/log/php-fpm.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +;log_level = notice + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +;emergency_restart_threshold = 0 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;emergency_restart_interval = 0 + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;process_control_timeout = 0 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +;daemonize = yes + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; Multiple pools of child processes may be started with different listening +; ports and different management options. The name of the pool will be +; used in logs and stats. There is no limitation on the number of pools which +; FPM can handle. Your system will tell you anyway :) + +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr/lib/php5.3) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = nobody +group = nobody + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +;pm.start_servers = 20 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 35 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic') +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; max children reached: 1 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = /var/log/php-fpm-$pool.log.slow + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/lib/php5.3) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init new file mode 100755 index 0000000..a186d83 --- /dev/null +++ b/dev-lang/php/files/php-fpm-r4.init @@ -0,0 +1,47 @@ +#!/sbin/runscript + +set_phpvars() { + PHPSLOT=${SVCNAME#php-fpm-} + [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)" + + PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" + PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid" +} + +extra_commands="depend" +extra_started_commands="reload" + +depend() { + need net + use apache2 lighttpd nginx +} + +start() { + ebegin "Starting PHP FastCGI Process Manager" + set_phpvars + start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \ + /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}" + local i=0 + local timeout=5 + while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do + sleep 1 + i=$(($i + 1)) + done + + [ $timeout -gt $i ] + eend $? +} + +stop() { + ebegin "Stopping PHP FastCGI Process Manager" + set_phpvars + start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID} + eend $? +} + +reload() { + ebegin "Reloading PHP FastCGI Process Manager" + set_phpvars + [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID}) + eend $? +} diff --git a/dev-lang/php/files/php-fpm_at-simple.service b/dev-lang/php/files/php-fpm_at-simple.service new file mode 100644 index 0000000..5f0482e --- /dev/null +++ b/dev-lang/php/files/php-fpm_at-simple.service @@ -0,0 +1,13 @@ +[Unit] +Description=The PHP FastCGI Process Manager +After=network.target + +[Service] +Type=simple +PIDFile=/run/php-fpm/php-fpm-%I.pid +ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize +ExecReload=/bin/kill -USR2 $MAINPID +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/dev-lang/php/files/php-fpm_at.service b/dev-lang/php/files/php-fpm_at.service new file mode 100644 index 0000000..152c1ab --- /dev/null +++ b/dev-lang/php/files/php-fpm_at.service @@ -0,0 +1,14 @@ +[Unit] +Description=The PHP FastCGI Process Manager +After=network.target + +[Service] +Type=notify +PIDFile=/run/php-fpm/php-fpm-%I.pid +ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize +ExecReload=/bin/kill -USR2 $MAINPID +PrivateTmp=true + +[Install] +WantedBy=multi-user.target + diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs new file mode 100644 index 0000000..783b0f6 --- /dev/null +++ b/dev-lang/php/files/php5-ldvs @@ -0,0 +1 @@ +PHP_5 { global: *; }; diff --git a/dev-lang/php/files/stricter-libc-client-symlink-check.patch b/dev-lang/php/files/stricter-libc-client-symlink-check.patch new file mode 100644 index 0000000..7cf3664 --- /dev/null +++ b/dev-lang/php/files/stricter-libc-client-symlink-check.patch @@ -0,0 +1,15 @@ +Gentoo bugs: 88944 463800 +--- ext/imap/config.m4 2013-03-27 19:31:13.000000000 +0100 ++++ ext/imap/config.m4.new 2013-03-30 18:34:17.581557062 +0100 +@@ -198,9 +198,9 @@ + AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) + fi + +- if test -r "$IMAP_DIR/c-client/c-client.a"; then ++ if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then + ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then ++ elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then + ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 + fi + diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml new file mode 100644 index 0000000..75bdf54 --- /dev/null +++ b/dev-lang/php/metadata.xml @@ -0,0 +1,29 @@ + + + + php + + Enable CLI SAPI + Enable embed SAPI + Add supports Enchant spelling library. + Add fileinfo extension support + Add filter extension support + Enable the FastCGI Process Manager SAPI + Adds support for gd (bundled with PHP) + Enable the hash extension + Enable JSON support + Add SASL support for the PHP LDAP extension + Use native driver for mysql, mysqli, PDO_Mysql + Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended) + Enables the intl extension for extended internalization support + Enables built-in opcode cache, replacing pecl-apc et.al + Enable the bundled PDO extensions + Enables the phar extension to provide phar archive support + Add sqlite2 support. Will be removed + Enable XMLReader support + Enable XMLWriter support + Enable the XSL extension + Enable webp suppoprt for GD + Enable ZIP file support + + diff --git a/dev-lang/php/php-5.6.4.ebuild b/dev-lang/php/php-5.6.4.ebuild new file mode 100644 index 0000000..5b3b76b --- /dev/null +++ b/dev-lang/php/php-5.6.4.ebuild @@ -0,0 +1,784 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.4.ebuild,v 1.2 2014/12/28 15:27:17 titanofold Exp $ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/dsp/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql libmysqlclient mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + =dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + libmysqlclient? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + libmysqlclient? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path + # ([empty session.save_path]/session_mm_[sapi][gid].sem) + # there is no easy way to circumvent that, all php calls during + # install use -n, so no php.ini file will be used. + # As such, this is the easiest way to get around + addpredict /session_mm_cli250.sem + addpredict /session_mm_cli0.sem + + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf="${my_conf} --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + use libmysqlclient && mysqllib="${EPREFIX}/usr" + use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" + + my_conf+=" $(use_with mysql mysql $mysqllib)" + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc ${EPREFIX}/usr)" + fi + + # Oracle support + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client oci8)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib ) + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci)" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf="${my_conf} --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf="${my_conf} ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog +} + +pkg_prerm() { + eselect php cleanup +} -- 2.43.2 From 127ec29f9230f2bffb2cd8f0bd9ca3f12a015a8f Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:31:30 -0500 Subject: [PATCH 11/16] Revbump the ebuild. --- dev-lang/php/{php-5.6.4.ebuild => php-5.6.4-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-lang/php/{php-5.6.4.ebuild => php-5.6.4-r1.ebuild} (100%) diff --git a/dev-lang/php/php-5.6.4.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild similarity index 100% rename from dev-lang/php/php-5.6.4.ebuild rename to dev-lang/php/php-5.6.4-r1.ebuild -- 2.43.2 From 0f5e779403b03ae578d68d086b183e16c4093c0e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:31:58 -0500 Subject: [PATCH 12/16] Update copyright and CVS header. --- dev-lang/php/php-5.6.4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index 5b3b76b..7526e6a 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.4.ebuild,v 1.2 2014/12/28 15:27:17 titanofold Exp $ +# $Header: $ EAPI=5 -- 2.43.2 From f391b3349fda5faaa2d78917881c105e4277adad Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:32:50 -0500 Subject: [PATCH 13/16] Alphabetize main use_enable/use_with stanza. --- dev-lang/php/php-5.6.4-r1.ebuild | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index 7526e6a..c883738 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -342,63 +342,63 @@ src_configure() { # extension USE flag shared my_conf+=" $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) $(use_enable calendar calendar ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable debug debug ) + $(use_with enchant enchant "${EPREFIX}"/usr) $(use_enable exif exif ) $(use_enable fileinfo fileinfo ) $(use_enable filter filter ) $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr)) + $(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr)) $(use_enable intl intl ) $(use_enable ipv6 ipv6 ) $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_enable opcache opcache ) $(use_enable pcntl pcntl ) - $(use_enable phar phar ) $(use_enable pdo pdo ) - $(use_enable opcache opcache ) - $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable phar phar ) $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_with snmp snmp "${EPREFIX}"/usr) $(use_enable soap soap ) $(use_enable sockets sockets ) - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_with systemd fpm-systemd) $(use_enable sysvipc sysvmsg ) $(use_enable sysvipc sysvsem ) $(use_enable sysvipc sysvshm ) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_with tidy tidy "${EPREFIX}"/usr) $(use_enable tokenizer tokenizer ) + $(use_enable unicode mbstring ) + $(use_with unicode onig "${EPREFIX}"/usr) $(use_enable wddx wddx ) + $(use_enable xml dom ) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) $(use_enable xml xml ) $(use_enable xmlreader xmlreader ) + $(use_with xmlrpc xmlrpc) $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_with xslt xsl "${EPREFIX}"/usr) $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" + $(use_with zlib zlib "${EPREFIX}"/usr)" # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ -- 2.43.2 From a7c76483853462a46896bd5feb979022972756d1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:40:16 -0500 Subject: [PATCH 14/16] Remove redundant "if use odbc" check. --- dev-lang/php/php-5.6.4-r1.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index c883738..6bff755 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -363,6 +363,7 @@ src_configure() { $(use_with mhash mhash "${EPREFIX}"/usr) $(use_with mssql mssql "${EPREFIX}"/usr) $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with odbc unixODBC "${EPREFIX}"/usr) $(use_enable opcache opcache ) $(use_enable pcntl pcntl ) $(use_enable pdo pdo ) @@ -465,12 +466,6 @@ src_configure() { my_conf+="${mysqlsock}" fi - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - if use iodbc ; then my_conf+=" $(use_with iodbc iodbc ${EPREFIX}/usr)" -- 2.43.2 From dd563773ce0c672a3d9fa5841e118b902ecbc692 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:41:01 -0500 Subject: [PATCH 15/16] Remove redundant "if use iodbc" check. --- dev-lang/php/php-5.6.4-r1.ebuild | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index 6bff755..79be81f 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -357,6 +357,7 @@ src_configure() { $(use_enable hash hash ) $(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr)) $(use_enable intl intl ) + $(use_with iodbc iodbc "${EPREFIX}"/usr) $(use_enable ipv6 ipv6 ) $(use_enable json json ) $(use_with kerberos kerberos "${EPREFIX}"/usr) @@ -466,11 +467,6 @@ src_configure() { my_conf+="${mysqlsock}" fi - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - # Oracle support if use oci8-instant-client ; then my_conf+=" -- 2.43.2 From 3f4090e21a05ece928af991533c430bd02ef70e5 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 12 Jan 2015 14:41:58 -0500 Subject: [PATCH 16/16] Remove redundant "if use firebird" check. --- dev-lang/php/php-5.6.4-r1.ebuild | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild index 79be81f..9dfc351 100644 --- a/dev-lang/php/php-5.6.4-r1.ebuild +++ b/dev-lang/php/php-5.6.4-r1.ebuild @@ -352,6 +352,7 @@ src_configure() { $(use_enable exif exif ) $(use_enable fileinfo fileinfo ) $(use_enable filter filter ) + $(use_with firebird interbase "${EPREFIX}"/usr) $(use_enable ftp ftp ) $(use_with gmp gmp "${EPREFIX}"/usr) $(use_enable hash hash ) @@ -437,13 +438,6 @@ src_configure() { $(use_with ssl imap-ssl ${EPREFIX}/usr)" fi - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - # LDAP support if use ldap ; then my_conf+=" -- 2.43.2