diff options
-rw-r--r-- | www/apache22/Makefile | 9 | ||||
-rw-r--r-- | www/apache22/files/extra-patch-server_buildmark.c | 15 |
2 files changed, 23 insertions, 1 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 496d4a0..315bae7 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -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, itk, peruser 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 diff --git a/www/apache22/files/extra-patch-server_buildmark.c b/www/apache22/files/extra-patch-server_buildmark.c new file mode 100644 index 0000000..a39774d --- /dev/null +++ b/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 |