summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2015-12-10 17:15:08 -0500
committerMichael Orlitzky <mjo@gentoo.org>2015-12-10 17:15:08 -0500
commit0a14910c4b819a4200e37ab0ffbc7dc126451be6 (patch)
tree4372de17ca4edcc5a443d79f3be9557daca26878
parentAdd the get_apache2_active_symlink_path() function. (diff)
downloadeselect-php-0a14910c4b819a4200e37ab0ffbc7dc126451be6.tar.gz
eselect-php-0a14910c4b819a4200e37ab0ffbc7dc126451be6.tar.bz2
eselect-php-0a14910c4b819a4200e37ab0ffbc7dc126451be6.zip
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.
-rw-r--r--src/php.eselect.in16
1 files 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