From ea6c7b8b5f67d4081fe0ec7b0f8d7c57cf6fafeb Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 22 Jan 2015 17:32:27 +0000 Subject: [PATCH] Merge r1652929, r1652931 from trunk: Fix --enable-v4-mapped configuration on *BSD. PR 53824. Submitted by: olli hauer Committed by: ylavic Submitted by: ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1653962 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 6 ------ configure.in | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index ace79a7341..dff6440998 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,9 @@ Changes with Apache 2.4.12 *) mpm_winnt: Normalize the error and status messages emitted by service.c, the service control interface for Windows. [William Rowe] + *) configure: Fix --enable-v4-mapped configuration on *BSD. PR 53824. + [ olli hauer , Yann Ylavic ] + Changes with Apache 2.4.11 *) SECURITY: CVE-2014-3583 (cve.mitre.org) diff --git a/STATUS b/STATUS index 09c9648970..1056bf73dd 100644 --- a/STATUS +++ b/STATUS @@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * configure: Fix --enable-v4-mapped configuration on *BSD. PR 53824. - trunk patch: http://svn.apache.org/r1652929 - http://svn.apache.org/r1652931 (CHANGES) - 2.4.x patch: trunks works (modulo CHANGES) - +1: ylavic, rjung, wrowe - * configure: Fix detection of old Solaris platforms. Autotools need double square brackets. Inspired by checking PR 53824 patch above for consistency. diff --git a/configure.in b/configure.in index 864d7c7c0e..d2767aebe2 100644 --- a/configure.in +++ b/configure.in @@ -774,7 +774,7 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets ], [ case $host in - *freebsd[1234].*) + *freebsd[[1234]].*) v4mapped=yes ;; *freebsd*|*netbsd*|*openbsd*) -- 2.50.1