subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1617094 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Sun, 10 Aug 2014 11:26:06 GMT
Author: stsp
Date: Sun Aug 10 11:26:05 2014
New Revision: 1617094

URL: http://svn.apache.org/r1617094
Log:
* tools/dev/unix-build/Makefile.svn: LibreSSL on OpenBSD 5.6 doesn't support
   compression and the httpd code blindly relies on it being present without
   checking the appropriate #define. Patch from OpenBSD"s ports tree.

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1617094&r1=1617093&r2=1617094&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Aug 10 11:26:05 2014
@@ -633,6 +633,11 @@ $(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$
 	sed '/^#define HAVE_SSL_RAND_EGD/d' \
 		< $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig \
 		> $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h
+	cp $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c \
+		$(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c.orig
+	sed 's/^\(#if (OPENSSL_VERSION_NUMBER >= 0x00908000)\)$$/\1 \&\& !defined(OPENSSL_NO_COMP)/'
\
+		< $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c.orig \
+		> $(HTTPD_SRCDIR)/modules/ssl/ssl_engine_vars.c
 	touch $@
 
 # configure httpd



Mime
View raw message