From 20ae303f54e0a53d313699ae80fdce671be62b36 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 16 Apr 2017 00:02:45 +0200 Subject: [PATCH] php: fix patch --- srcpkgs/php/patches/php-fpm.patch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/php/patches/php-fpm.patch b/srcpkgs/php/patches/php-fpm.patch index b477fd52183..53edcbc2512 100644 --- a/srcpkgs/php/patches/php-fpm.patch +++ b/srcpkgs/php/patches/php-fpm.patch @@ -1,13 +1,13 @@ ---- ./sapi/fpm/Makefile.frag.orig 2016-02-28 18:32:56.357946535 -0500 -+++ ./sapi/fpm/Makefile.frag 2016-02-28 18:33:05.809945555 -0500 -@@ -12,8 +12,8 @@ - - @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ - $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || : -- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : -- @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || : -+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || : -+ @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf || : - +--- sapi/fpm/Makefile.frag.orig 2017-04-15 23:58:56.965737425 +0200 ++++ sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 +@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH) + else \ + echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ +- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ +- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ ++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ ++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \ + fi + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8