[arch-commits] Commit in php/trunk (4 files)

[Pierre Schmitz]

    Date: Sunday, January 3, 2016 @ 09:04:07
  Author: pierre
Revision: 257477

Reduce noise in generated patches

Modified:
  php/trunk/apache.patch
  php/trunk/generate_patches
  php/trunk/php-fpm.patch
  php/trunk/php.ini.patch

------------------+
 apache.patch     |    8 ++++----
 generate_patches |   14 +++++++-------
 php-fpm.patch    |   16 ++++++++--------
 php.ini.patch    |    4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

Modified: apache.patch
===================================================================
--- apache.patch	2016-01-03 07:58:10 UTC (rev 257476)
+++ apache.patch	2016-01-03 08:04:07 UTC (rev 257477)
@@ -1,5 +1,5 @@
---- sapi/apache2handler/config.m4.orig	2015-12-16 11:41:55.000000000 +0100
-+++ sapi/apache2handler/config.m4	2016-01-01 18:56:23.530338559 +0100
+--- sapi/apache2handler/config.m4.orig
++++ sapi/apache2handler/config.m4
 @@ -122,7 +122,6 @@
        PHP_BUILD_THREAD_SAFE
      fi
@@ -8,8 +8,8 @@
      if test -n "$APACHE_THREADED_MPM"; then
        PHP_BUILD_THREAD_SAFE
      fi
---- configure.orig	2015-12-16 11:41:54.000000000 +0100
-+++ configure	2016-01-01 18:56:23.793665417 +0100
+--- configure.orig
++++ configure
 @@ -6875,7 +6875,6 @@
  
      fi

Modified: generate_patches
===================================================================
--- generate_patches	2016-01-03 07:58:10 UTC (rev 257476)
+++ generate_patches	2016-01-03 08:04:07 UTC (rev 257477)
@@ -35,14 +35,14 @@
 	-e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
 	-i php.ini-production
 
-diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 > ../../apache.patch
-diff -u configure.orig configure >> ../../apache.patch
+diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
+diff -u configure.orig configure | filterdiff --clean --remove-timestamps >> ../../apache.patch
 
-diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag > ../../php-fpm.patch
-diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in >> ../../php-fpm.patch
-diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in >> ../../php-fpm.patch
-diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in >> ../../php-fpm.patch
+diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch
+diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
+diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
+diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
 
-diff -u php.ini-production.orig php.ini-production > ../../php.ini.patch
+diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch
 
 popd

Modified: php-fpm.patch
===================================================================
--- php-fpm.patch	2016-01-03 07:58:10 UTC (rev 257476)
+++ php-fpm.patch	2016-01-03 08:04:07 UTC (rev 257477)
@@ -1,5 +1,5 @@
---- sapi/fpm/Makefile.frag.orig	2015-12-16 11:41:54.000000000 +0100
-+++ sapi/fpm/Makefile.frag	2016-01-01 18:56:23.796998669 +0100
+--- sapi/fpm/Makefile.frag.orig
++++ sapi/fpm/Makefile.frag
 @@ -12,8 +12,8 @@
  
  	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
@@ -11,8 +11,8 @@
  
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
  	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
---- sapi/fpm/php-fpm.conf.in.orig	2015-12-16 11:41:54.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.in	2016-01-01 18:56:23.800331920 +0100
+--- sapi/fpm/php-fpm.conf.in.orig
++++ sapi/fpm/php-fpm.conf.in
 @@ -14,14 +14,14 @@
  ; Pid file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -30,8 +30,8 @@
  
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
---- sapi/fpm/www.conf.in.orig	2015-12-16 11:41:54.000000000 +0100
-+++ sapi/fpm/www.conf.in	2016-01-01 18:56:23.803665171 +0100
+--- sapi/fpm/www.conf.in.orig
++++ sapi/fpm/www.conf.in
 @@ -33,7 +33,7 @@
  ;                            (IPv6 and IPv4-mapped) on a specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
@@ -61,8 +61,8 @@
  
  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  ; stderr will be redirected to /dev/null according to FastCGI specs.
---- sapi/fpm/php-fpm.service.in.orig	2015-12-16 11:41:54.000000000 +0100
-+++ sapi/fpm/php-fpm.service.in	2016-01-01 18:56:23.803665171 +0100
+--- sapi/fpm/php-fpm.service.in.orig
++++ sapi/fpm/php-fpm.service.in
 @@ -4,7 +4,7 @@
  
  [Service]

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2016-01-03 07:58:10 UTC (rev 257476)
+++ php.ini.patch	2016-01-03 08:04:07 UTC (rev 257477)
@@ -1,5 +1,5 @@
---- php.ini-production.orig	2015-12-16 11:41:54.000000000 +0100
-+++ php.ini-production	2016-01-01 18:56:23.820331428 +0100
+--- php.ini-production.orig
++++ php.ini-production
 @@ -720,7 +720,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.