Author: jfrederic.clere(a)jboss.com Date: 2012-01-13 03:39:41 -0500 (Fri, 13 Jan 2012) New Revision: 2901 Added: trunk/build/patch/httpd-2.2.21.patch Log: Add the patch for 2.2.21 (from 2.2.15). Added: trunk/build/patch/httpd-2.2.21.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.patch (rev 0) +++ trunk/build/patch/httpd-2.2.21.patch 2012-01-13 08:39:41 UTC (rev 2901) @@ -0,0 +1,174 @@ +--- modules/ssl/config.m4 (revision 793871) ++++ modules/ssl/config.m4 (working copy) +@@ -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/file_io/win32/open.c (revision 920862) ++++ srclib/apr/file_io/win32/open.c (working copy) +@@ -610,8 +610,8 @@ + #endif + #if APR_HAS_ANSI_FS + ELSE_WIN_OS_IS_ANSI { +- if (!CreateHardLinkA(wto_path, wfrom_path)) +- return apr_get_os_error() ++ if (!CreateHardLinkA(to_path, from_path, NULL)) ++ return apr_get_os_error(); + } + #endif + return rv; +--- srclib/apr/NMAKEmakefile (revision 2617) ++++ srclib/apr/NMAKEmakefile (working copy) +@@ -110,7 +110,8 @@ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ +- $(WORKDIR)\userinfo.obj ++ $(WORKDIR)\userinfo.obj \ ++ $(WORKDIR)\pollset.obj + + !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) + OBJECTS = $(OBJECTS) \ +--- srclib/apr-util/buildconf (original) ++++ srclib/apr-util/buildconf Thu Nov 12 23:20:30 2009 +@@ -17,6 +17,11 @@ + # + # + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # Default place to look for apr source. Can be overridden with + # --with-apr=[directory] + apr_src_dir=../apr +@@ -67,11 +72,11 @@ + # Generate the autoconf header (include/apu_config.h) and ./configure + # + echo "Creating include/private/apu_config.h ..." +-${AUTOHEADER:-autoheader} ++${AUTOHEADER:-autoheader} $verbose + + echo "Creating configure ..." + ### do some work to toss config.cache? +-if ${AUTOCONF:-autoconf}; then ++if ${AUTOCONF:-autoconf} $verbose; then + : + else + echo "autoconf failed" +@@ -82,14 +87,14 @@ + # Generate build-outputs.mk for the build system + # + echo "Generating 'make' outputs ..." +-$apr_src_dir/build/gen-build.py make ++$apr_src_dir/build/gen-build.py $verbose make + + # + # If Expat has been bundled, then go and configure the thing + # + if [ -f xml/expat/buildconf.sh ]; then + echo "Invoking xml/expat/buildconf.sh ..." +- (cd xml/expat; ./buildconf.sh) ++ (cd xml/expat; ./buildconf.sh $verbose) + fi + + # Remove autoconf cache again + +--- srclib/apr-util/xml/expat/buildconf.sh (original) ++++ srclib/apr-util/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009 +@@ -1,5 +1,10 @@ + #! /bin/sh + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # + # Find libtoolize + # +@@ -25,7 +30,7 @@ + (cd conftools ; rm -f ltconfig ltmain.sh) + rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache + +-$libtoolize --copy --automake ++$libtoolize --copy --automake --force $verbose + + # + # Build aclocal.m4 from libtool's libtool.m4 +@@ -42,12 +47,12 @@ + cat $ltfile >> aclocal.m4 + + if [ -f ltsugar.m4 ]; then +- echo "Incorporating ltsugar.m4 into aclocal.m4 ..." +- cat ltsugar.m4 >> aclocal.m4 ++ rm -f conftools/ltsugar.m4 ++ mv ltsugar.m4 conftools/ltsugar.m4 + fi + +-# Clean up again +-rm -f libtool.m4 ltsugar.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" + +@@ -55,11 +60,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 + +--- srclib/apr-util/xml/expat/configure.in (original) ++++ srclib/apr-util/xml/expat/configure.in Thu Nov 12 23:20:30 2009 +@@ -12,6 +12,14 @@ + + AC_INIT(Makefile.in) + AC_CONFIG_AUX_DIR(conftools) ++AC_CONFIG_MACRO_DIR(conftools) ++ ++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) + + dnl + dnl Follow the GNU/Linux convention of odd number minor version for + + + +--- srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:23:25.616783000 -0400 ++++ srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:38:00.551126000 -0400 +@@ -50,6 +50,9 @@ + rm -f conftools/ltsugar.m4 + mv ltsugar.m4 conftools/ltsugar.m4 + fi ++if [ ! -f conftools/libtool.m4 ]; then ++ mv aclocal.m4 conftools/libtool.m4 ++fi + + # Clean up any leftovers + rm -f aclocal.m4 libtool.m4