From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 863C8138330 for ; Tue, 11 Oct 2016 13:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9CC1E0881; Tue, 11 Oct 2016 13:37:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A4BFE0881 for ; Tue, 11 Oct 2016 13:37:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 100BD341652 for ; Tue, 11 Oct 2016 13:37:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FD842FA for ; Tue, 11 Oct 2016 13:37:35 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1476193047.db258b5062a86633f4746f4b8d7e2d0470334501.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/files/, app-eselect/eselect-php/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-eselect/eselect-php/Manifest app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild app-eselect/eselect-php/eselect-php-0.7.1-r7.ebuild app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild app-eselect/eselect-php/eselect-php-0.8.5.ebuild app-eselect/eselect-php/eselect-php-0.9.1.ebuild app-eselect/eselect-php/files/70_mod_php.conf app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 app-eselect/eselect-php/files/php-fpm-r1.init app-eselect/eselect-php/files/php-fpm.init-r4 app-eselect/eselect-php/files/php-fpm_at.service X-VCS-Directories: app-eselect/eselect-php/files/ app-eselect/eselect-php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: db258b5062a86633f4746f4b8d7e2d0470334501 X-VCS-Branch: master Date: Tue, 11 Oct 2016 13:37:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 588020a7-b51b-4a5d-b158-8407f3eaae13 X-Archives-Hash: ceeeee1b9b71792d012f017317715e0a commit: db258b5062a86633f4746f4b8d7e2d0470334501 Author: Brian Evans gentoo org> AuthorDate: Tue Oct 11 13:35:51 2016 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Oct 11 13:37:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db258b50 app-eselect/eselect-php: Drop old Package-Manager: portage-2.3.1 app-eselect/eselect-php/Manifest | 4 -- .../eselect-php/eselect-php-0.7.1-r4.ebuild | 48 --------------- .../eselect-php/eselect-php-0.7.1-r7.ebuild | 41 ------------- .../eselect-php/eselect-php-0.8.2-r1.ebuild | 58 ------------------ app-eselect/eselect-php/eselect-php-0.8.5.ebuild | 58 ------------------ app-eselect/eselect-php/eselect-php-0.9.1.ebuild | 66 -------------------- app-eselect/eselect-php/files/70_mod_php.conf | 26 -------- .../eselect-php/files/70_mod_php5.conf-apache2-r1 | 18 ------ app-eselect/eselect-php/files/php-fpm-r1.init | 50 ---------------- app-eselect/eselect-php/files/php-fpm.init-r4 | 70 ---------------------- app-eselect/eselect-php/files/php-fpm_at.service | 14 ----- 11 files changed, 453 deletions(-) diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index be9c960..ca18cbf 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1,5 +1 @@ -DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b -DIST eselect-php-0.8.2.tar.xz 51832 SHA256 3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512 da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d WHIRLPOOL dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4 -DIST eselect-php-0.8.5.tar.xz 45800 SHA256 73b1dfab538dad971644ae9542e311cd9160e5dff3947086fc7691f0fedb835d SHA512 dbb97ddca2cd031e57e1efccc2a92dcb7aa3c4a4813c72dc5ad688b8e32e4e2ec8083781c450e9c439a9e70f04c26249e335a4eb814ac944dfc6e2d06ca724f6 WHIRLPOOL 00d8a1b6e065962105b704e8a6ab806c6f8181a4ec4c266902854ce61cb4532063412449c623ea7288e49dd64c4a8b762b9771abb89664071ff81b7b9728a8e5 -DIST eselect-php-0.9.1.tar.xz 47548 SHA256 0c9768c9dd361dd3910f26e11956fc2121467ab56c52ba80d7620b1d757bc143 SHA512 bea84b4ae386d60cea2703d1b1c2a91bdc19188dfe151619750a1979dcfbdf2a2ada05d87faa7e0f371ab003e05be6fc7dd15f96459ae6e998c62e6d5caeb64a WHIRLPOOL 3d74edfa6962942836aa3823e9901b461433ce57f2fcb624eb1652b36245599a1bc076db5cb902b675747f2255f00ac887a5e35859dbcf62279944595ea02d6c DIST eselect-php-0.9.2.tar.xz 48356 SHA256 8b2acfccb3d2e3d7cad137fc4306711371ebd544cbcdad8e9d46c5dacf8ed889 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf WHIRLPOOL 5ca0673a80b5e88522ff1ca82c4b4f842a63439cd47562c72048a4d66dc88d2dcc7070c28c0b8ff50a75bdb1a9056ee5391b37f4dc34cc9eda3652c6791a276c diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild deleted file mode 100644 index bb6b500..00000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 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" -IUSE="fpm apache2" - -DEPEND=">=app-admin/eselect-1.2.4 - ! - # The mod_php.so symlink is controlled by - # eselect-php. However, the module name changed from - # php5_module to php7_module so we can't blindly load whatever - # is there. Instead we let eselect-php manage a small - # configuration file that loads the appropriate module. - # - # This is relative to ServerRoot (see httpd.conf). - Include ../../../var/lib/eselect-php/mod_php.conf - - # Tell apache that mod_php should handle PHP files. - # - # NOTE: Avoiding AddHandler/AddType for security (bug - # #538822). Please read the related news item! - - SetHandler application/x-httpd-php - - - # PHP source files which are meant to be displayed as - # syntax-highlighted source code. - - SetHandler application/x-httpd-php-source - - - DirectoryIndex index.php index.phtml - diff --git a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 deleted file mode 100644 index 05deeb6..00000000 --- a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 +++ /dev/null @@ -1,18 +0,0 @@ - - # Load the module first - - LoadModule php5_module modules/libphp5.so - - - # Set it to handle the files - # NOTE: Avoiding AddHandler/AddType for security (bug #538822) - # NOTE: Please read the related news item! - - SetHandler application/x-httpd-php - - - SetHandler application/x-httpd-php-source - - - DirectoryIndex index.php index.phtml - diff --git a/app-eselect/eselect-php/files/php-fpm-r1.init b/app-eselect/eselect-php/files/php-fpm-r1.init deleted file mode 100644 index 54c8e98..00000000 --- a/app-eselect/eselect-php/files/php-fpm-r1.init +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/openrc-run - -set_phpvars() { - PHPSLOT=${SVCNAME#php-fpm-} - PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid" - if [ ${PHPSLOT} = 'php-fpm' ] ; then - PHPSLOT="$(eselect php show fpm)" - PHP_FPM_PID="/run/php-fpm.pid" - fi - - PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" -} - -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/app-eselect/eselect-php/files/php-fpm.init-r4 b/app-eselect/eselect-php/files/php-fpm.init-r4 deleted file mode 100644 index 6502ab9..00000000 --- a/app-eselect/eselect-php/files/php-fpm.init-r4 +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/openrc-run - -extra_started_commands="reload" -extra_commands="configtest" - -set_phpvars() { - PHPSLOT="${SVCNAME#php-fpm-}" - PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid" - if [ "${PHPSLOT}" = "php-fpm" ] ; then - PHPSLOT="$(eselect php show fpm)" - PHP_FPM_PID="/run/php-fpm.pid" - fi - - PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" - PHP_FPM_BIN="/usr/lib/${PHPSLOT}/bin/php-fpm" -} - -start() { - # If configtest fails, we don't have to sit around for five - # seconds waiting for a pid to show up. - configtest || return $? - ebegin "Starting PHP FastCGI Process Manager" - set_phpvars - start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \ - --exec "${PHP_FPM_BIN}" \ - -- \ - --fpm-config "${PHP_FPM_CONF}" \ - --pid "${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 "${PHP_FPM_BIN}" \ - --pidfile "${PHP_FPM_PID}" - eend $? -} - -reload() { - configtest || return $? - ebegin "Reloading PHP FastCGI Process Manager" - set_phpvars - [ -f "${PHP_FPM_PID}" ] && kill -USR2 $(cat "${PHP_FPM_PID}") - eend $? -} - -configtest() { - ebegin "Testing PHP FastCGI Process Manager configuration" - set_phpvars - # Hide the "test is successful" message (which goes to stderr) if - # the test passed, but show the entire output if the test failed - # because it may contain hints about the problem. - OUTPUT=$( "${PHP_FPM_BIN}" --fpm-config "${PHP_FPM_CONF}" --test 2>&1 ) - - # Save this so `echo` doesn't clobber it. - local exit_code=$? - [ $exit_code -ne 0 ] && echo "${OUTPUT}" >&2 - eend $exit_code -} diff --git a/app-eselect/eselect-php/files/php-fpm_at.service b/app-eselect/eselect-php/files/php-fpm_at.service deleted file mode 100644 index 152c1ab..00000000 --- a/app-eselect/eselect-php/files/php-fpm_at.service +++ /dev/null @@ -1,14 +0,0 @@ -[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 -