Attachment 19624 Details for Bug 34841 – file.diff

[patch] file.diff

file.diff (text/plain), 2.81 KB, created by Mathieu Arnold on 2002-02-11 18:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2002-02-11 18:40:03 UTC

Size: 2.81 KB

patch

obsolete

>diff -ur --new-file mod_php4.old/files/patch-ext_cyrus_config.m4 mod_php4/files/patch-ext_cyrus_config.m4
>--- mod_php4.old/files/patch-ext_cyrus_config.m4	Thu Jan  1 01:00:00 1970
>+++ mod_php4/files/patch-ext_cyrus_config.m4	Mon Feb 11 16:38:57 2002
>@@ -0,0 +1,11 @@
>+--- ext/cyrus/config.m4~	Mon Feb 11 16:37:17 2002
>++++ ext/cyrus/config.m4	Mon Feb 11 16:37:29 2002
>+@@ -14,7 +14,7 @@
>+ 			PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/lib, CYRUS_SHARED_LIBADD)
>+ 			found_cyrus=yes
>+ 		fi
>+-		if test -r $i/include/sasl.h && test "$found_sasl" = "no"; then
>++		if test -r $i/include/sasl/sasl.h && test "$found_sasl" = "no"; then
>+ 			PHP_ADD_INCLUDE($i/include)
>+ 			PHP_SUBST(SASL_SHARED_LIBADD)
>+ 			PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, SASL_SHARED_LIBADD)
>diff -ur --new-file mod_php4.old/files/patch-ext_cyrus_cyrus.c mod_php4/files/patch-ext_cyrus_cyrus.c
>--- mod_php4.old/files/patch-ext_cyrus_cyrus.c	Thu Jan  1 01:00:00 1970
>+++ mod_php4/files/patch-ext_cyrus_cyrus.c	Mon Feb 11 19:25:04 2002
>@@ -0,0 +1,23 @@
>+--- ext/cyrus/cyrus.c~	Fri Oct 12 01:51:14 2001
>++++ ext/cyrus/cyrus.c	Mon Feb 11 17:27:13 2002
>+@@ -86,8 +86,8 @@
>+ 	                                             le_cyrus_name, module_number);
>+ 
>+ 	REGISTER_LONG_CONSTANT("CYRUS_CONN_NOSYNCLITERAL", 
>+-	                       IMCLIENT_CONN_NOSYNCLITERAL,
>+-	                       CONST_CS_ | CONST_PERSISTENT);
>++	                       IMCLIENT_CONN_NONSYNCLITERAL,
>++	                       CONST_CS | CONST_PERSISTENT);
>+ 	REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE", 
>+ 	                       IMCLIENT_CONN_INITIALRESPONSE,
>+ 	                       CONST_CS | CONST_PERSISTENT);
>+@@ -464,8 +464,7 @@
>+ 	ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus);
>+ 	convert_to_string_ex(query);
>+ 
>+-	if (imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)) != 0) 
>+-		RETURN_FALSE;
>++	imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query))
>+ 
>+ 	RETURN_TRUE;
>+ }
>diff -ur --new-file mod_php4.old/scripts/configure.php mod_php4/scripts/configure.php
>--- mod_php4.old/scripts/configure.php	Fri Feb  1 13:05:19 2002
>+++ mod_php4/scripts/configure.php	Mon Feb 11 19:12:34 2002
>@@ -37,6 +37,7 @@
> XML		"XML support" OFF \
> XSLT		"Sablotron support (implies XML and iconv)" OFF \
> DOMXML		"DOM support" OFF \
>+CYRUS		"Cyrus admin support" OFF \
> FTP		"File Transfer Protocol support" OFF \
> CURL		"CURL support" OFF \
> gettext		"gettext library support" OFF \
>@@ -228,6 +229,11 @@
> 		\"DOMXML\")
> 			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
> 			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
>+			;;
>+		\"CYRUS\")
>+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/include/cyrus/imclient.h:\${PORTSDIR}/mail/cyrus-imapd"
>+			echo "CFLAGS+=	-I/usr/local/include/sasl"
>+			echo "CONFIGURE_ARGS+=--with-cyrus"
> 			;;
> 		\"FTP\")
> 			echo "CONFIGURE_ARGS+=--enable-ftp"

Actions: View | Diff

Attachments on bug 34841: 19624