Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect-php:master commit in: /, src/
Date: Thu, 23 Jan 2020 15:06:40
Message-Id: 1579733055.5e69b74fc8c9542faa6891c56b736f1d73da3202.mjo@gentoo
1 commit: 5e69b74fc8c9542faa6891c56b736f1d73da3202
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 22 17:19:33 2020 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 22 22:44:15 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=5e69b74f
7
8 src/php-fpm.conf: move the php-fpm tmpfiles.d entry "upstream."
9
10 The tmpfiles.d entry for php-fpm creates one "runstate" directory for
11 all slots of php-fpm. Since none of that depends on the currently
12 selected slot, we ship it as part of eselect-php rather than
13 dev-lang/php which would either install one copy for each slot.
14
15 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
16
17 Makefile.am | 3 +++
18 src/php-fpm.conf | 5 +++++
19 2 files changed, 8 insertions(+)
20
21 diff --git a/Makefile.am b/Makefile.am
22 index fbca127..f544739 100644
23 --- a/Makefile.am
24 +++ b/Makefile.am
25 @@ -21,6 +21,9 @@ if FPM
26 nodist_conf_DATA = $(srcdir)/openrc/conf.d/php-fpm
27
28 nodist_libexec_SCRIPTS = $(srcdir)/src/php-fpm-launcher
29 +
30 + tmpfilesdir = $(prefix)/lib/tmpfiles.d
31 + dist_tmpfiles_DATA = $(srcdir)/src/php-fpm.conf
32 endif
33
34 # The next few rules allow us to replace bindir, libdir, etc.
35
36 diff --git a/src/php-fpm.conf b/src/php-fpm.conf
37 new file mode 100644
38 index 0000000..a49ba7b
39 --- /dev/null
40 +++ b/src/php-fpm.conf
41 @@ -0,0 +1,5 @@
42 +# tmpfiles.d entry for php-fmp
43 +#
44 +# When autoconf-2.70 is released and --runstatedir is supported,
45 +# we should change this /run to @RUNSTATEDIR@.
46 +d /run/php-fpm 755 root root