Author: jfrederic.clere(a)jboss.com Date: 2013-06-11 07:43:40 -0400 (Tue, 11 Jun 2013) New Revision: 3092 Modified: trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch Log: try to arrange the patch. Modified: trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:40:01 UTC (rev 3091) +++ trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:43:40 UTC (rev 3092) @@ -15,3 +15,120 @@ !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) OBJECTS = $(OBJECTS) \ +--- modules/ssl/config.m4 2006-04-22 03:53:06.000000000 +0200 ++++ modules/ssl/config.m4 2013-06-11 13:36:18.828481185 +0200 +@@ -120,7 +120,13 @@ + if test "x$enable_ssl" = "xshared"; then + # The only symbol which needs to be exported is the module + # structure, so ask libtool to hide everything else: +- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) ++ case $host in ++ *-apple-darwin*) ++ ;; ++ *) ++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) ++ ;; ++ esac + fi + ]) + +--- srclib/apr/buildconf 2010-03-05 13:38:36.000000000 +0100 ++++ srclib/apr/buildconf 2013-06-11 13:36:22.922531224 +0200 +@@ -50,7 +50,7 @@ + lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` + IFS=.; set $lt_version; IFS=' ' + if test "$1" = "1"; then +- $libtoolize --copy --automake --force $verbose ++ $libtoolize --copy --automake --force --install $verbose + if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 + else +@@ -72,7 +72,7 @@ + cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 + fi + if test "$1" = "2"; then +- $libtoolize --copy --force $verbose ++ $libtoolize --copy --force --install $verbose + fi + + # Clean up any leftovers +--- srclib/apr/network_io/unix/multicast.c 2008-01-03 04:37:18.000000000 +0100 ++++ srclib/apr/network_io/unix/multicast.c 2013-06-11 13:36:22.922531224 +0200 +@@ -214,6 +214,7 @@ + } + } + else if (sock_is_ipv6(sock)) { ++ unsigned int hopsopt = value; + if (type == IP_MULTICAST_TTL) { + type = IPV6_MULTICAST_HOPS; + } +@@ -222,7 +223,7 @@ + } + + if (setsockopt(sock->socketdes, IPPROTO_IPV6, type, +- &value, sizeof(value)) == -1) { ++ (const void *) &hopsopt, sizeof(hopsopt)) == -1) { + rv = errno; + } + } +--- srclib/apr-util/xml/expat/buildconf.sh 2010-09-29 18:57:31.000000000 +0200 ++++ srclib/apr-util/xml/expat/buildconf.sh 2013-06-11 13:36:22.923531236 +0200 +@@ -1,5 +1,10 @@ + #! /bin/sh + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # + # Find libtoolize. Prefer 1.x versions. + # +@@ -27,7 +32,7 @@ + (cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files) + rm -rf autom4te*.cache aclocal.m4 + +-$libtoolize --copy --automake ++$libtoolize --copy --automake --force $verbose + + # + # find libtool.m4 +@@ -43,6 +48,9 @@ + exit 1 + fi + fi ++if [ ! -f conftools/libtool.m4 ]; then ++ mv aclocal.m4 conftools/libtool.m4 ++fi + + # + # Build aclocal.m4 from libtool's m4 files +@@ -66,11 +74,11 @@ + # Generate the autoconf header template (config.h.in) and ./configure + # + echo "Creating config.h.in ..." +-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning" + + echo "Creating configure ..." + ### do some work to toss config.cache? +-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning" + + # Remove autoconf caches + rm -rf autom4te*.cache aclocal.m4 +--- srclib/apr-util/xml/expat/configure.in 2010-09-29 16:00:14.000000000 +0200 ++++ srclib/apr-util/xml/expat/configure.in 2013-06-11 13:36:22.923531236 +0200 +@@ -39,6 +39,12 @@ + AC_CONFIG_HEADER(expat_config.h) + + sinclude(conftools/ac_c_bigendian_cross.m4) ++sinclude(conftools/libtool.m4) ++sinclude(conftools/ltsugar.m4) ++sinclude(conftools/argz.m4) ++sinclude(conftools/ltoptions.m4) ++sinclude(conftools/ltversion.m4) ++sinclude(conftools/lt~obsolete.m4) + + AC_CANONICAL_SYSTEM +