Attachment 149569 Details for Bug 193200 – add support for apache 2.4 (revised)

[patch] add support for apache 2.4 (revised)

20141118-suphp.patch (text/plain), 2.37 KB, created by Daniel Austin on 2014-11-18 23:55:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2014-11-18 23:55:39 UTC

Size: 2.37 KB

patch

obsolete

>diff -ruN www/suphp.orig/Makefile www/suphp/Makefile
>--- www/suphp.orig/Makefile	2014-10-05 15:39:25.000000000 +0100
>+++ www/suphp/Makefile	2014-11-18 23:26:19.696502811 +0000
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	suphp
> PORTVERSION=	0.7.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://www.suphp.org/download/ \
> 		LOCAL/bdrewery/${PORTNAME}/ \
>@@ -16,7 +16,7 @@
> USES=		autoreconf libtool
> SUB_FILES=	pkg-message
> 
>-USE_APACHE=	22
>+USE_APACHE=	22+
> CFLAGS+=	-I${LOCALBASE}/include
> USE_CSTD=	gnu89
> USE_PHP=	yes
>@@ -28,7 +28,7 @@
> 		CONFIG LICENSE \
> 		INSTALL README
> 
>-CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" --with-apxs=${APXS}
>+CONFIGURE_ARGS=	CFLAGS="${CFLAGS} -I`${LOCALBASE}/bin/apr-1-config --includedir`" --with-apxs=${APXS}
> 
> # WITH_SETID_MODE should be a value of "owner", "force", or "paranoid".
> # It's important that you understand the differences between each mode.
>diff -ruN www/suphp.orig/files/patch-configure www/suphp/files/patch-configure
>--- www/suphp.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ www/suphp/files/patch-configure	2014-11-18 23:24:47.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- configure.orig	2014-11-18 23:22:05.349376076 +0000
>++++ configure	2014-11-18 23:22:18.026375597 +0000
>+@@ -15343,7 +15343,7 @@
>+                     | cut -f2 -d"/" \
>+                     | cut -f1 -d" "`
>+     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
>+-    if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
>++    if test "$major_version" = "2.0" -o "$major_version" = "2.2" -o "$major_version" = "2.4"; then
>+       APACHE_VERSION_2=true
>+       APACHE_VERSION_1_3=false
>+     else
>diff -ruN www/suphp.orig/files/patch-configure.ac www/suphp/files/patch-configure.ac
>--- www/suphp.orig/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>+++ www/suphp/files/patch-configure.ac	2014-11-18 23:24:47.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2014-11-18 23:23:58.015368295 +0000
>++++ configure.ac	2014-11-18 23:24:09.983367824 +0000
>+@@ -66,7 +66,7 @@
>+                     | cut -f2 -d"/" \
>+                     | cut -f1 -d" "`
>+     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
>+-    if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
>++    if test "$major_version" = "2.0" -o "$major_version" = "2.2" -o "$major_version" = "2.4"; then
>+       APACHE_VERSION_2=true
>+       APACHE_VERSION_1_3=false
>+     else

Actions: View | Diff

Attachments on bug 193200: 146591 | 149569