From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-eselect/eselect-php/Manifest | 9 ++++ .../eselect-php/eselect-php-0.9.4-r5.ebuild | 44 +++++++++++++++++++ app-eselect/eselect-php/eselect-php-0.9.5.ebuild | 44 +++++++++++++++++++ app-eselect/eselect-php/eselect-php-9999.ebuild | 49 ++++++++++++++++++++++ app-eselect/eselect-php/files/php-fpm-launcher | 7 ++++ app-eselect/eselect-php/files/php-fpm-launcher-r3 | 11 +++++ app-eselect/eselect-php/files/php-fpm.conf | 1 + app-eselect/eselect-php/metadata.xml | 13 ++++++ 8 files changed, 178 insertions(+) create mode 100644 app-eselect/eselect-php/Manifest create mode 100644 app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild create mode 100644 app-eselect/eselect-php/eselect-php-0.9.5.ebuild create mode 100644 app-eselect/eselect-php/eselect-php-9999.ebuild create mode 100644 app-eselect/eselect-php/files/php-fpm-launcher create mode 100644 app-eselect/eselect-php/files/php-fpm-launcher-r3 create mode 100644 app-eselect/eselect-php/files/php-fpm.conf create mode 100644 app-eselect/eselect-php/metadata.xml (limited to 'app-eselect/eselect-php') diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest new file mode 100644 index 000000000000..6007e43c50d3 --- /dev/null +++ b/app-eselect/eselect-php/Manifest @@ -0,0 +1,9 @@ +AUX php-fpm-launcher 134 BLAKE2B fdbb99bbbd0d171975aff6f55ba7c41fe152c330cfb05dff81ab033d2490af27c52b8e43e5ed1ae80ee3c6ba8a1471adb01778d6b76bdd7776845f7c93e12428 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29 +AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d9691b6c3179df4f05631d904c1c3e5647dd080ff2080c346bffcb71bee96d4d4123f6c4d3be0120161c960 SHA512 9dfd36f88457a57a31c17cb251a8aeeef505f811f9ac59c5715532c3780b543034a6a9d356f4111fab1998883299ece0a68508dd3e154bc54de84ce6805bf351 +AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f +DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e +DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119 +EBUILD eselect-php-0.9.4-r5.ebuild 1384 BLAKE2B 1b0897342edf83455aec8da3beb5dcc34c7bda36af5f810940f7dd9bef307ebab7f7462ef4b6d6dbd88daea25eeb5571975623e43471263b8c40d2091920137a SHA512 d98d4b84cea9fe34f4a0e7ea03e7ad3e135f07e447c148e1c025292ca2a684d75a005a9376c93f54299aedc925ade090f70de72d7060d6b08ee76a5ff3354754 +EBUILD eselect-php-0.9.5.ebuild 1392 BLAKE2B 453096b9bc1e6e624220bb93457ad8740a2a1e2b544f3f1588b48048cf9b86875689ce826ffe53638956513f21368e33b99d432a510af8e999c1370f748b3bfc SHA512 c441ff53824454e2ec2639a64b59b85e54afd876d936a61395ad49e5eeb92392e9528de1f8816d3c3a314e36dfa4afff37cb0138a33ecf1f471bd74d187da04c +EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7 +MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5 diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild new file mode 100644 index 000000000000..b1278cc79505 --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + apache2? ( www-servers/apache[apache2_modules_dir] )" + +src_configure(){ + # We expect localstatedir to be "var"ish, not "var/lib"ish, because + # that's what PHP upstream expects. See for example the FPM + # configuration where they put logs in @localstatedir@/log. + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) +} + +src_install() { + default + + if use fpm ; then + systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" + sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die + exeinto /usr/libexec + doexe "${T}"/php-fpm-launcher + fi +} diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild new file mode 100644 index 000000000000..7e467246c7d8 --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + apache2? ( www-servers/apache[apache2_modules_dir] )" + +src_configure(){ + # We expect localstatedir to be "var"ish, not "var/lib"ish, because + # that's what PHP upstream expects. See for example the FPM + # configuration where they put logs in @localstatedir@/log. + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) +} + +src_install() { + default + + if use fpm ; then + systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" + sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die + exeinto /usr/libexec + doexe "${T}"/php-fpm-launcher + fi +} diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild new file mode 100644 index 000000000000..e6b5ef3d8804 --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd git-r3 autotools + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect-php.git" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + apache2? ( www-servers/apache[apache2_modules_dir] )" + +src_prepare() { + eapply_user + eautoreconf +} + +src_configure(){ + # We expect localstatedir to be "var"ish, not "var/lib"ish, because + # that's what PHP upstream expects. See for example the FPM + # configuration where they put logs in @localstatedir@/log. + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) +} + +src_install() { + default + + if use fpm ; then + systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" + sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die + exeinto /usr/libexec + doexe "${T}"/php-fpm-launcher + fi +} diff --git a/app-eselect/eselect-php/files/php-fpm-launcher b/app-eselect/eselect-php/files/php-fpm-launcher new file mode 100644 index 000000000000..7a1c1c9f918b --- /dev/null +++ b/app-eselect/eselect-php/files/php-fpm-launcher @@ -0,0 +1,7 @@ +#!/bin/sh + +PHPSLOT="${1}" +[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)" +shift + +exec /usr/lib/${PHPSLOT}/bin/php-fpm "${@}" diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3 new file mode 100644 index 000000000000..a2b6eabc4da5 --- /dev/null +++ b/app-eselect/eselect-php/files/php-fpm-launcher-r3 @@ -0,0 +1,11 @@ +#!/bin/sh + +# If there are no arguments, then "shift" will fail (bug 626496). +if [ $# -eq 0 ]; then + PHP_SLOT=$(eselect php show fpm) +else + PHP_SLOT=$1 + shift +fi + +exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}" diff --git a/app-eselect/eselect-php/files/php-fpm.conf b/app-eselect/eselect-php/files/php-fpm.conf new file mode 100644 index 000000000000..801e74f1e620 --- /dev/null +++ b/app-eselect/eselect-php/files/php-fpm.conf @@ -0,0 +1 @@ +d /run/php-fpm 755 root root diff --git a/app-eselect/eselect-php/metadata.xml b/app-eselect/eselect-php/metadata.xml new file mode 100644 index 000000000000..be945bac7771 --- /dev/null +++ b/app-eselect/eselect-php/metadata.xml @@ -0,0 +1,13 @@ + + + + + php-bugs@gentoo.org + PHP + + PHP eselect module + + + Enable the FastCGI Process Manager SAPI + + -- cgit v1.2.3