Attachment 105631 Details for Bug 146130 – 0006-update-to-httpd-2.2.15.patch

[patch] 0006-update-to-httpd-2.2.15.patch

0006-update-to-httpd-2.2.15.patch (text/plain), 4.73 KB, created by Philip M. Gollucci on 2010-05-01 00:26:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2010-05-01 00:26:27 UTC

Size: 4.73 KB

patch

obsolete

>From ba479a7196035854f5a8a1f27ed5f9828f9b4c91 Mon Sep 17 00:00:00 2001
>From: Philip M. Gollucci <pgollucci@p6m7g8.com>
>Date: Fri, 30 Apr 2010 19:00:49 -0400
>Subject: [PATCH 06/10] update to httpd 2.2.15
>
>
>diff --git a/www/apache22/Makefile b/www/apache22/Makefile
>index b5d084d..d0bb556 100644
>--- a/www/apache22/Makefile
>+++ b/www/apache22/Makefile
>@@ -8,8 +8,7 @@
> #
> 
> PORTNAME=	apache
>-PORTVERSION=	2.2.14
>-PORTREVISION=	6
>+PORTVERSION=	2.2.15
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
> DISTNAME=	httpd-${PORTVERSION}
>@@ -58,7 +57,7 @@ APACHEDIR=	${MASTERDIR}
> 
> .if !defined(WITHOUT_APACHE_OPTIONS)
> OPTIONS=	\
>-	APR_FROM_PORTS "Use devel/apr as APR (preferred)" Off \
>+	APR_FROM_PORTS "Use devel/apr (recommended)" On \
> 	THREADS "Enable threads support in APR" Off \
> 	MYSQL "Enable MySQL support for apr-dbd" Off \
> 	PGSQL "Enable PostgreSQL support for apr-dbd" Off \
>diff --git a/www/apache22/distinfo b/www/apache22/distinfo
>index 9393c29..9575027 100644
>--- a/www/apache22/distinfo
>+++ b/www/apache22/distinfo
>@@ -1,3 +1,3 @@
>-MD5 (apache22/httpd-2.2.14.tar.bz2) = a5226203aaf97e5b941c41a71c112704
>-SHA256 (apache22/httpd-2.2.14.tar.bz2) = b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
>-SIZE (apache22/httpd-2.2.14.tar.bz2) = 5147171
>+MD5 (apache22/httpd-2.2.15.tar.bz2) = 016cec97337eccead2aad6a7c27f2e14
>+SHA256 (apache22/httpd-2.2.15.tar.bz2) = 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
>+SIZE (apache22/httpd-2.2.15.tar.bz2) = 4959582
>diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
>index a419109..9459228 100644
>--- a/www/apache22/pkg-plist
>+++ b/www/apache22/pkg-plist
>@@ -170,7 +170,7 @@ include/apache22/util_xml.h
> %%APR_PORTS%%lib/libapr-1.a
> %%APR_PORTS%%lib/libapr-1.la
> %%APR_PORTS%%lib/libapr-1.so
>-%%APR_PORTS%%lib/libapr-1.so.3
>+%%APR_PORTS%%lib/libapr-1.so.4
> %%APR_PORTS%%lib/libaprutil-1.a
> %%APR_PORTS%%lib/libaprutil-1.la
> %%APR_PORTS%%lib/libaprutil-1.so
>-- 
>1.7.0.6
>
>diff --git a/www/apache22/files/patch-srclib-apr-buildconf b/www/apache22/files/patch-srclib-apr-buildconf
>deleted file mode 100644
>index 6ec934a..0000000
>--- a/www/apache22/files/patch-srclib-apr-buildconf
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- srclib/apr/buildconf.orig	Tue Jun 14 14:11:15 2005
>-+++ srclib/apr/buildconf	Sun Sep 24 15:17:36 2006
>-@@ -23,7 +23,7 @@
>- #
>- build/buildcheck.sh || exit 1
>- 
>--libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
>-+libtoolize="${LIBTOOLIZE}"
>- if [ "x$libtoolize" = "x" ]; then
>-     echo "libtoolize not found in path"
>-     exit 1
>-@@ -60,7 +60,7 @@
>-    # Expecting the code above to be very portable, but just in case...
>-    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
>-      ltpath=`dirname $libtoolize`
>--     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
>-+     ltfile=${LIBTOOL_M4}
>-    fi
>- fi
>-   
>-@@ -95,8 +95,11 @@
>- # Remove autoconf 2.5x's cache directory
>- rm -rf autom4te*.cache
>- 
>-+
>-+if [ "x${FULLBUILD}" = "xon" ] ; then
>- echo "Generating 'make' outputs ..."
>- build/gen-build.py make
>-+fi
>- 
>- # Create RPM Spec file
>- if [ -f `which cut` ]; then
>diff --git a/www/apache22/files/patch-srclib__apr__buildconf b/www/apache22/files/patch-srclib__apr__buildconf
>index c75e4c0..6cc3bc9 100644
>--- a/www/apache22/files/patch-srclib__apr__buildconf
>+++ b/www/apache22/files/patch-srclib__apr__buildconf
>@@ -1,6 +1,24 @@
>---- ./srclib/apr/buildconf.orig	2009-12-12 00:36:35.693177242 +0000
>-+++ ./srclib/apr/buildconf	2009-12-12 00:37:00.222653819 +0000
>-@@ -71,6 +71,7 @@
>+--- srclib/apr/buildconf.orig	2009-11-12 17:19:49.000000000 -0500
>++++ srclib/apr/buildconf	2010-04-30 19:22:40.116834529 -0400
>+@@ -28,7 +28,7 @@
>+ #
>+ build/buildcheck.sh $verbose || exit 1
>+ 
>+-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
>++libtoolize="${LIBTOOLIZE}"
>+ if [ "x$libtoolize" = "x" ]; then
>+     echo "libtoolize not found in path"
>+     exit 1
>+@@ -65,7 +65,7 @@
>+    # Expecting the code above to be very portable, but just in case...
>+    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
>+      ltpath=`dirname $libtoolize`
>+-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
>++     ltfile=${LIBTOOL_M4}
>+    fi
>+ fi
>+   
>+@@ -76,6 +76,7 @@
>  
>  echo "buildconf: Using libtool.m4 at ${ltfile}."
>  
>@@ -8,3 +26,16 @@
>  cat $ltfile | sed -e 's/LIBTOOL=$.*$top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
>  
>  # libtool.m4 from 1.6 requires ltsugar.m4
>+@@ -100,8 +101,10 @@
>+ # Remove autoconf 2.5x's cache directory
>+ rm -rf autom4te*.cache
>+ 
>+-echo "Generating 'make' outputs ..."
>+-build/gen-build.py $verbose make
>++if [ "x${FULLBUILD}" = "xon" ] ; then
>++    echo "Generating 'make' outputs ..."
>++    build/gen-build.py $verbose make
>++fi
>+ 
>+ # Create RPM Spec file
>+ if [ -f `which cut` ]; then
>-- 
>1.7.0.6

Actions: View | Diff

Attachments on bug 146130: 105630 | 105631 | 105632 | 105633 | 105634