svn commit: r418806 - in branches/2016Q3/www/apache22: . files
Olli Hauer
ohauer at FreeBSD.org
Tue Jul 19 15:41:42 UTC 2016
Author: ohauer
Date: Tue Jul 19 15:41:41 2016
New Revision: 418806
URL: https://svnweb.freebsd.org/changeset/ports/418806
Log:
MFH: r418746 r418748
- 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.
Approved by: ports-secteam (feld@)
Added:
branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c
- copied unchanged from r418746, head/www/apache22/files/extra-patch-server_buildmark.c
Modified:
branches/2016Q3/www/apache22/Makefile
Directory Properties:
branches/2016Q3/ (props changed)
Modified: branches/2016Q3/www/apache22/Makefile
==============================================================================
--- branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:31:44 2016 (r418805)
+++ branches/2016Q3/www/apache22/Makefile Tue Jul 19 15:41:41 2016 (r418806)
@@ -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
@@ -48,6 +51,10 @@ WITH_MPM?= prefork # or worker, event,
WITH_HTTP_PORT?= 80
WITH_SSL_PORT?= 443
+.if !defined(WITH_DEBUG)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-server_buildmark.c
+.endif
+
.include "${APACHEDIR}/Makefile.options"
AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
@@ -59,7 +66,7 @@ LDAP_CONFIGURE_ON= --enable-ldap=shared
SSL_CFLAGS= -I${OPENSSLINC}
SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
SSL_LDFLAGS= -L${OPENSSLLIB}
-SSL_USE= OPENSSL=yes
+SSL_USES= ssl
SUEXEC_RSRCLIMIT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_rsrclimit
SUEXEC_USERDIR_EXTRA_PATCHES= ${FILESDIR}/extra-patch-suexec_userdir
Copied: branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c (from r418746, head/www/apache22/files/extra-patch-server_buildmark.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q3/www/apache22/files/extra-patch-server_buildmark.c Tue Jul 19 15:41:41 2016 (r418806, copy of r418746, head/www/apache22/files/extra-patch-server_buildmark.c)
@@ -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
More information about the svn-ports-all
mailing list