summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* configure.ac: update to version 0.9.5.HEAD0.9.5masterMichael Orlitzky2018-04-131-1/+1
|
* src/php.eselect.in.in: use "-f" option to "ln" for POSIX compatibility.Michael Orlitzky2018-04-111-1/+2
| | | | | | | | | | | | | | | | | On FreeBSD, we're getting an error: ln: illegal option -- - usage: ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file] ... !!! Error: failed to create active php symlink This is due to our use of the "--force" flag, which is not POSIX. In the latest standard (IEEE Std 1003.1-2017), only the short "-f" flag is guaranteed to exist, and FreeBSD's "ln" seems to mostly support the flag as specified there. So, I've changed "--force" to "-f", and left a warning to future generations in a nearby comment. Bug: https://bugs.gentoo.org/649270
* configure.ac: update to version 0.9.4.0.9.4Michael Orlitzky2017-07-261-1/+1
|
* Use "init.d" and "conf.d" subdirectories of "openrc".Michael Orlitzky2017-07-265-7/+7
| | | | | | | OpenRC's init and conf files need to be named the same, and so we hit problems trying to store them both in the "openrc" directory. This commit puts the conf file in a "conf.d" subdirectory and the init script in an "init.d" subdirectory.
* Install the php-fpm init scripts conditional on --enable-fpm.0.9.3Michael Orlitzky2017-07-252-4/+21
|
* Makefile.am: mark openrc/php-fpm as a script and not as data.Michael Orlitzky2017-07-251-2/+2
|
* Makefile.am: install the php-fpm.conf file with "make install".Michael Orlitzky2017-07-251-0/+2
|
* Rename OpenRC init script and config file.Michael Orlitzky2017-07-255-6/+6
| | | | | | | | | The OpenRC init script is now installed by the Makefile, so to be useful it needs to be called "php-fpm". To that end, I've renamed both the init script and the config file to lack the word "example". Moreover, now that these files are code-like and not documentation-like, I've renamed the directory containing them from "doc" to "openrc".
* configure.ac: update the version to 0.9.3.Michael Orlitzky2017-07-251-1/+1
|
* Add comments to the php-fpm init script's start/stop_pre functions.Michael Orlitzky2017-07-241-0/+9
| | | | | | Had a mid-air collision with Brian there where we both tried to implement exactly the same thing. I had some extra comments explaining the RC_CMD tests that happily apply right on top of the last commit.
* Don't allow restart with a bad configBrian Evans2017-07-241-1/+9
|
* Add a --with-piddir configure flag.Michael Orlitzky2017-07-242-1/+8
| | | | | | | Our php-fpm init script defaulted to using /run for its pid file, but now that is configurable via the --with-piddir flag. Its value defaults to @LOCALSTATEDIR@ and the variable substitution should work whether or not --with-piddir is set explicitly.
* Rewrite the php-fpm init script to be more declarative.Michael Orlitzky2017-07-241-54/+43
| | | | | | | | Modern OpenRC can start/stop a well-behaved daemon on its own, provided the right command and parameters. This commit updates the init script to use those OpenRC variables like "command", "command_args", and "pidfile", and the resulting init script is much more concise.
* Add intermediate file doc/php-fpm.example.init.in to gitignore.Michael Orlitzky2017-07-191-0/+1
|
* Rename the init script input file to facilitate the two-phase replacement.Michael Orlitzky2017-07-192-1/+1
| | | | | | | | We perform variable substitution twice in the main eselect script -- once through autotools, and the other manually in the resulting Makefile. As a result, the script has a double "in.in" suffix. To make substitution work the same way in the init script, this commit renames it with an "in.in" suffix, and mentions it in configure.ac.
* php-fpm.example.init.in: use @SYSCONFDIR@ from autotools.Michael Orlitzky2017-07-192-5/+6
|
* Add .gitignoreBrian Evans2017-07-111-0/+13
|
* Make the init script directory depend on LIBDIRBrian Evans2017-07-112-2/+5
| | | | | | | | We cannot rely on the assumption that /usr/lib will always point to the right location, Bug 624528 demonstrates this. There is talk in Bug 506276 of making /usr/lib a generic target for all arches and stop supporting the symlink.
* Bump version to 0.9.2 in configure.ac.0.9.2Michael Orlitzky2016-07-261-1/+1
|
* Add OpenRC init and conf files.Michael Orlitzky2016-07-263-2/+81
|
* Bump to v0.9.1 in configure.ac.0.9.1Michael Orlitzky2016-01-221-1/+1
|
* Move the apache conf file writing into set_sapi().Michael Orlitzky2016-01-221-8/+11
| | | | | | | When the apache conf file was being written in do_set(), it was avoidable by e.g. update_sapi(). That could prevent apache2 from restarting. Since do_set() calls set_sapi() anyway, we just move the conf file writing to the end of set_sapi().
* Add 70_mod_php.conf.in to EXTRA_DIST in Makefile.am.0.9.0Michael Orlitzky2016-01-221-0/+3
| | | | | Without the extra hint, automake was omitting 70_mod_php.conf.in from the tarball.
* Bump to v0.9.0 in configure.ac.Michael Orlitzky2016-01-221-1/+1
|
* Add --enable-apache2 flag to the configure script.Michael Orlitzky2016-01-222-2/+19
| | | | | | | | The latest eselect-php ebuild allows users to avoid 70_mod_php.conf by setting USE="-apache2". Now that the conf file is part of eselect-php, we replicate that ability with --enable-apache2=no, or in fact by default. To install the apache conf file, one passes --enable-apache2 to the configure script.
* Don't inherit config or multilib.Michael Orlitzky2016-01-221-3/+0
| | | | | | These two inherit commands are no longer needed. We don't use list_libdirs() anymore thanks to autotools, and I don't think the config functions were ever needed recently.
* Rename the "modules" action to "list-modules".Michael Orlitzky2016-01-221-3/+3
| | | | | The name "list-modules" was always more appropriate; it just took a moment to realize that "-" is valid in bash function names.
* Cosmetic changes to help text.Michael Orlitzky2016-01-221-12/+12
|
* Add a "modules" action to list all valid modules (requested in bug 491866).Michael Orlitzky2016-01-221-0/+10
| | | | Gentoo-Bug: 491866
* Remove useless describe_cleanup_parameters() and describe_cleanup_options().Michael Orlitzky2016-01-221-8/+0
|
* Document and fix the update functionality.Michael Orlitzky2016-01-221-11/+35
| | | | | | | | The update_sapi() function was not working due to a call to set_$sapi that was never caught. Some of the logic in both do_update() and update_sapi() was clarified, and the update_sapi() function was documented. The "update" action and "cleanup" (which uses it) now work as expected.
* Remove the word "automatically" from the cleanup description.Michael Orlitzky2016-01-221-1/+1
|
* Clean up and document the cleanup_sapi() function.Michael Orlitzky2016-01-221-14/+33
|
* Remove cleanup_sapis() and ensmarten the libphp[57].so symlink removal.Michael Orlitzky2016-01-221-14/+14
| | | | | | | The cleanup_sapis() function was only called in one place, so it was a pointless layer of indirection. Move it into do_cleanup(). Also, make sure we don't remove libphp[57].so symlinks unless they're actually symlinks and in fact dead.
* Add a TODO to find_targets() about an error condition.Michael Orlitzky2016-01-211-0/+3
|
* Use uppercase @BINDIR@, @LIBDIR@, etc. for autotools substitution.Michael Orlitzky2016-01-213-13/+13
| | | | | | | | | | The last few commits introduced a problem: by passing php.eselect.in.in through autoconf, we unwittingly replace things like @bindir@ with ${exec_prefix}. This is because lowercase @bindir@ gets defined for automake and is intended to be based on the other directory variables like @exec_prefix@. Since we're replacing them after the fact in the Makefile, this commit avoids the autoconf mangling by making them all uppercase.
* Clean up and document find_targets().Michael Orlitzky2016-01-211-8/+10
|
* Replace get_libdirs() and get_active_libdir() with autotools magic.Michael Orlitzky2016-01-211-34/+13
| | | | | | | | | | | | The get_libdirs() function is a heuristic to determine which libdirs are available on the system. The get_active_libdir() function then chose the first one as the "active" libdir. In a few places we either chose the "active" libdir, or looped through all of them to find some other thing of interest (like the valid targets). Now that we compute @libdir@ at build time, we can replace all of that with the one correct value of @libdir@. The functions get_libdirs() and get_active_libdir() are removed entirely.
* Add 70_mod_php.conf.in to the project source.Michael Orlitzky2016-01-213-2/+30
| | | | | | | | | | | | | | | | | | | | We are currently shipping 70_mod_php.conf as part of the Gentoo ebuild for eselect-php. This introduces a potential disconnect between the path in php.eselect and the path in 70_mod_php.conf. By adding the conf file to the project, we are able to ensure that they are both set to the same value. Moreover, the new autotools directory magic lets us set them both based on @localstatedir@. So, for example, in the conf file we have "@localstatedir@/lib/eselect-php/mod_php.conf" and in php.eselect we have "@localstatedir@/lib/eselect-php". We have followed the PHP project's lead in assuming that $localstatedir will be set to (for example) /var and not /var/lib. See Gentoo bug 572002. For testing, you should now use something like, ./configure --bindir=/usr/bin --sysconfdir=/etc --localstatedir=/var Of course, the ebuild for eselect-php will automatically pass the correct values to ./configure.
* Replace custom bindir handling with the new autotools magic.Michael Orlitzky2016-01-211-5/+4
| | | | | | | | | As a first test of the new directory substitution, replace one instance of custom bindir handling. Use @bindir@ instead of "${EROOT}/usr/bin" sapi_active_link_dir(). The results should coincide when configured with, ./configure --bindir="${EROOT}"/usr/bin
* Add another layer of indirection to get @bindir@ and friends in the output.Michael Orlitzky2016-01-213-2/+19
| | | | | | | | | | | | | | When we create php.eselect from php.eselect.in using autoconf, we don't have a way to get the full, expanded value of @bindir@, @libdir@, and the other paths that we need. The autoconf documentation suggests a workaround for this: add another layer of indirection, and use the Makefile to substitute those values into the output files. This commit sets the stage by renaming php.eselect.in to php.eselect.in.in. The first round of processing by autoconf takes php.eselect.in.in to php.eselect.in. The Makefile will then generate php.eselect from php.eselect.in after substituting @bindir@, @libdir@, and @localstatedir@.
* Fix cleanup up libphp[57].so symlinks.Michael Orlitzky2016-01-201-1/+1
| | | | | | | | | The cleanup() action is supposed to remove the old links to libphp5.so and libphp7.so, but the pattern was accidentally quoted and thus nothing was removed. Unquote it so that those symlinks will actually be removed. Gentoo-Bug: 572436
* Bump to v0.8.5 in configure.ac.0.8.5Michael Orlitzky2016-01-091-1/+1
|
* Consolidate all of the set_foo() functions.Michael Orlitzky2016-01-091-27/+16
|
* Undo the change from phpdbg -> dbg, using "phpdbg" everywhere makes more sense.Michael Orlitzky2016-01-091-6/+6
|
* Bump to v0.8.4 in configure.ac.0.8.4Michael Orlitzky2016-01-081-1/+1
|
* Fix cleanup and update actions.Michael Orlitzky2016-01-081-10/+13
|
* Clean up check_module() a bit and give it some documentation.Michael Orlitzky2016-01-081-1/+15
|
* Remove superfluous list_foo() functions.Michael Orlitzky2016-01-081-22/+3
|
* Rename "phpdbg" to "dbg" for consistency and to fix its show action.Michael Orlitzky2016-01-081-3/+3
|