You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/18 17:30:05 UTC
svn commit: r1543068 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 18 16:30:04 2013
New Revision: 1543068
URL: http://svn.apache.org/r1543068
Log:
* tools/dev/unix-build/Makefile.svn: Update my build script, and hence the
bb-openbsd bot, to HTTPD 2.2.26. Should fix test failures on bb-openbsd.
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=1543068&r1=1543067&r2=1543068&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 18 16:30:04 2013
@@ -70,7 +70,7 @@ APR_VER = 1.4.6
APR_ICONV_VER = 1.2.1
GNU_ICONV_VER = 1.14
APR_UTIL_VER = 1.4.1
-HTTPD_VER = 2.2.25
+HTTPD_VER = 2.2.26
NEON_VER = 0.29.6
SERF_VER = 1.3.2
SERF_OLD_VER = 0.3.1
@@ -548,35 +548,15 @@ httpd-reset:
httpd-clean:
-(cd $(HTTPD_OBJDIR) && make clean)
- rm -f $(HTTPD_OBJDIR)/no_ssl_v2.diff
# fetch distfile for httpd
$(DISTDIR)/$(HTTPD_DIST):
cd $(DISTDIR) && $(FETCH_CMD) $(HTTPD_URL)
-$(HTTPD_OBJDIR)/no_ssl_v2.diff:
- mkdir -p $(dir $@)
- echo > $@.tmp '--- modules/ssl/ssl_engine_io.c.orig Sat Jul 13 16:49:52 2013'
- echo >> $@.tmp '+++ modules/ssl/ssl_engine_io.c Sat Jul 13 16:50:10 2013'
- echo >> $@.tmp '@@ -1079,7 +1079,9 @@'
- echo >> $@.tmp ' * IPv4 and IPv6 addresses are not permitted".)'
- echo >> $@.tmp ' */'
- echo >> $@.tmp ' if (hostname_note &&'
- echo >> $@.tmp '+#ifndef OPENSSL_NO_SSL2'
- echo >> $@.tmp ' sc->proxy->protocol != SSL_PROTOCOL_SSLV2 &&'
- echo >> $@.tmp '+#endif'
- echo >> $@.tmp ' sc->proxy->protocol != SSL_PROTOCOL_SSLV3 &&'
- echo >> $@.tmp ' apr_ipsubnet_create(&ip, hostname_note, NULL,'
- echo >> $@.tmp ' c->pool) != APR_SUCCESS) {'
- mv -f $@.tmp $@
-
# retrieve httpd
-$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \
- $(HTTPD_OBJDIR)/no_ssl_v2.diff
+$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST)
[ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR)
tar -C $(SRCDIR) -jxf $(DISTDIR)/$(HTTPD_DIST)
- cd $(SRCDIR)/httpd-$(HTTPD_VER) && \
- patch -p0 < $(HTTPD_OBJDIR)/no_ssl_v2.diff
touch $@
# configure httpd