From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 58FDE1384B4 for ; Fri, 11 Dec 2015 00:40:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6947421C022; Fri, 11 Dec 2015 00:40:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94E7921C00B for ; Fri, 11 Dec 2015 00:40:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A598340976 for ; Fri, 11 Dec 2015 00:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 146BDE5B for ; Fri, 11 Dec 2015 00:40:30 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1449785708.0a14910c4b819a4200e37ab0ffbc7dc126451be6.mjo@gentoo> Subject: [gentoo-commits] proj/eselect-php:master commit in: src/ X-VCS-Repository: proj/eselect-php X-VCS-Files: src/php.eselect.in X-VCS-Directories: src/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0a14910c4b819a4200e37ab0ffbc7dc126451be6 X-VCS-Branch: master Date: Fri, 11 Dec 2015 00:40:30 +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: 478fcd35-fc92-412d-b49e-5ee5684b5bd6 X-Archives-Hash: f52dc0cad5781d7b69d6563bec106d2e commit: 0a14910c4b819a4200e37ab0ffbc7dc126451be6 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Dec 10 22:15:08 2015 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Dec 10 22:15:08 2015 +0000 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=0a14910c Rename our active DSO symlink to mod_php.so. Our DSO symlink used to be called libphp5.so or libphp7.so. This was very recently changed to an unversioned libphp.so, but at that point, we might as well just call it mod_php.so for consistency. Note that our 70_mod_php5.conf currently points directly to the libphp file and doesn't use the symlink, no matter its name. That will need to be changed. An unused cleanup() function was removed in the process, because the function that is actually used was updated to remove the obsolete libphp* symlinks. src/php.eselect.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/php.eselect.in b/src/php.eselect.in index d882095..e77b86a 100644 --- a/src/php.eselect.in +++ b/src/php.eselect.in @@ -34,6 +34,12 @@ cleanup_sapi() { return fi fi + + if [[ "${1}" == "apache2" ]]; then + rm -f "${EROOT}$(get_active_libdir)/apache2/modules/libphp[57].so" \ + || die "failed to remove old libphp.so symlink" + fi + return 1 } @@ -65,12 +71,6 @@ get_active_libdir() { echo /usr/lib } -cleanup() { - local target=$(find_targets_$1 | tail -n 1) - [[ -z $target ]] && - set_$1 $target -} - find_targets() { local dir dirs libdir for libdir in $(get_libdirs); do @@ -170,11 +170,11 @@ get_active_fpm() { # # OUTPUT: # -# The path to our libphp.so symlink, which should (but is not +# The path to our mod_php.so symlink, which should (but is not # guaranteed to) point to a real apache DSO. # get_apache2_active_symlink_path() { - echo "${EROOT}$(get_active_libdir)/apache2/modules/libphp.so" + echo "${EROOT}$(get_active_libdir)/apache2/modules/mod_php.so" } # Find the active (selected) version of the apache2 module. Used to