Author: stsp
Date: Mon Sep 14 13:46:16 2015
New Revision: 1702952
URL: http://svn.apache.org/r1702952
Log:
* tools/dev/unix-build/Makefile.svn: In the bb-openbsd bot build script,
fix complation of httpd without SSL3 support in openssl.
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=1702952&r1=1702951&r2=1702952&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Sep 14 13:46:16 2015
@@ -597,6 +597,8 @@ httpd-reset:
httpd-clean:
-(cd $(HTTPD_OBJDIR) && env MAKEFLAGS= make clean)
+ -rm ${HTTPD_OBJDIR}/chil-engine.diff
+ -rm ${HTTPD_OBJDIR}/ssl3.diff
# fetch distfile for httpd
$(DISTDIR)/$(HTTPD_DIST):
@@ -620,14 +622,31 @@ $(HTTPD_OBJDIR)/chil-engine.diff:
echo >>[email protected] ' ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,'
mv -f [email protected] $@
+$(HTTPD_OBJDIR)/ssl3.diff:
+ mkdir -p $(dir $@)
+ echo >[email protected] '--- support/ab.c.orig Mon Sep 14 15:33:46 2015'
+ echo >>[email protected] '+++ support/ab.c Mon Sep 14 15:34:15 2015'
+ echo >>[email protected] '@@ -2232,8 +2232,10 @@'
+ echo >>[email protected] ' } else if (strncasecmp(optarg, "SSL2",
4) == 0) {'
+ echo >>[email protected] ' meth = SSLv2_client_method();'
+ echo >>[email protected] ' #endif'
+ echo >>[email protected] '+#ifndef OPENSSL_NO_SSL3'
+ echo >>[email protected] ' } else if (strncasecmp(optarg, "SSL3",
4) == 0) {'
+ echo >>[email protected] ' meth = SSLv3_client_method();'
+ echo >>[email protected] '+#endif'
+ echo >>[email protected] ' #ifdef HAVE_TLSV1_X'
+ echo >>[email protected] ' } else if (strncasecmp(optarg,
"TLS1.1", 6) == 0) {'
+ echo >>[email protected] ' meth = TLSv1_1_client_method();'
+ mv -f [email protected] $@
# retrieve httpd
$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \
- $(HTTPD_OBJDIR)/chil-engine.diff
+ $(HTTPD_OBJDIR)/chil-engine.diff $(HTTPD_OBJDIR)/ssl3.diff
$(call do_check_sha256,$(HTTPD_DIST))
[ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(HTTPD_DIST)
cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/chil-engine.diff
+ cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/ssl3.diff
cp $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h \
$(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig
sed '/^#define HAVE_SSL_RAND_EGD/d' \
