svn commit: r418746 - in head/www/apache22: . files

[Olli Hauer]

Author: ohauer
Date: Mon Jul 18 20:26:26 2016
New Revision: 418746
URL: https://svnweb.freebsd.org/changeset/ports/418746

Log:
  - allow reproducible build
  - set EXPIRATION_DATE to 2017-07-01 [1]
  
  [1] Upstream propose EoL of apache 2.2.x during the next 12 months
      See discussion on dev at apache list.

Added:
  head/www/apache22/files/extra-patch-server_buildmark.c   (contents, props changed)
Modified:
  head/www/apache22/Makefile

Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile	Mon Jul 18 20:26:08 2016	(r418745)
+++ head/www/apache22/Makefile	Mon Jul 18 20:26:26 2016	(r418746)
@@ -19,6 +19,9 @@ CONFLICTS_INSTALL=	caudium14-1.* \
 		apache-*-2.2.* apache22-*-2.2.* \
 		apache-*-2.4.* apache24-*-2.4.*
 
+DEPRECATED=		Upstream propose EoL of apache 2.2.x during the next 12 months
+EXPIRATION_DATE=	2017-07-01
+
 USE_APACHE=	common22
 USES=		autoreconf cpe iconv libtool perl5 tar:bzip2
 USE_PERL5=	run

Added: head/www/apache22/files/extra-patch-server_buildmark.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/apache22/files/extra-patch-server_buildmark.c	Mon Jul 18 20:26:26 2016	(r418746)
@@ -0,0 +1,15 @@
+# disable build time stamp in favor of reproducible build
+# except building with DEBUG
+==============================================================
+--- server/buildmark.c.orig	2016-07-03 16:09:18 UTC
++++ server/buildmark.c
+@@ -17,6 +17,9 @@
+ #include "ap_config.h"
+ #include "httpd.h"
+ 
++/* Allow Reproducible build, do not include build time information */
++#undef __DATE__
++
+ #if defined(__DATE__) && defined(__TIME__)
+ static const char server_built[] = __DATE__ " " __TIME__;
+ #else