pkgsrc/www/php4/patches/patch-ak

$NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $

--- ext/imap/php_imap.c.orig	2005-01-25 15:23:37.000000000 +0100
+++ ext/imap/php_imap.c	2005-04-22 01:37:25.000000000 +0200
@@ -415,6 +415,11 @@
 
 	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
 
+/*
+ * Optionally use the installed c-client linkage.c to determine which drivers
+ * are authenticators are linked in. Otherwise use this fixed list.
+ */
+#ifndef HAVE_IMAP_LINKAGE
 #ifndef PHP_WIN32
 	mail_link(&unixdriver);		/* link in the unix driver */
 	mail_link(&mhdriver);		/* link in the mh driver */
@@ -430,6 +435,10 @@
 	mail_link(&tenexdriver);	/* link in the tenex driver */
 	mail_link(&mtxdriver);		/* link in the mtx driver */
 	mail_link(&dummydriver);	/* link in the dummy driver */
+#else /* HAVE_IMAP_LINKAGE */
+        /* link in the c-client mail and auth drivers */
+#include "linkage.c"
+#endif /* HAVE_IMAP_LINKAGE */
 
 #ifndef PHP_WIN32
 	auth_link(&auth_log);		/* link in the log authenticator */
Apply cleanly after update to 4.3.11 2005-04-22 01:47:46 +02:00			$NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $
Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. 2001-10-16 07:39:57 +02:00
Apply cleanly after update to 4.3.11 2005-04-22 01:47:46 +02:00			`--- ext/imap/php_imap.c.orig 2005-01-25 15:23:37.000000000 +0100`
			`+++ ext/imap/php_imap.c 2005-04-22 01:37:25.000000000 +0200`
			`@@ -415,6 +415,11 @@`
Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. 2001-10-16 07:39:57 +02:00
Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. 2002-01-01 00:57:39 +01:00			`ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)`
Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. 2001-10-16 07:39:57 +02:00
			`+/*`
Adapt the imap-uw c-client linkage file use patches, so that they are more acceptabtable for inclusion in master PHP sources. No externally visible change, so pkg revision not bumped. 2004-01-16 16:04:54 +01:00			`+ * Optionally use the installed c-client linkage.c to determine which drivers`
			`+ * are authenticators are linked in. Otherwise use this fixed list.`
Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. 2001-10-16 07:39:57 +02:00			`+ */`
Adapt the imap-uw c-client linkage file use patches, so that they are more acceptabtable for inclusion in master PHP sources. No externally visible change, so pkg revision not bumped. 2004-01-16 16:04:54 +01:00			`+#ifndef HAVE_IMAP_LINKAGE`
Update php4-imap to the version from the php-4.0.6 distribution. There is no list of changes from version 4.0.5. Also move from the www category. 2001-10-16 07:39:57 +02:00			`#ifndef PHP_WIN32`
			`mail_link(&unixdriver); /* link in the unix driver */`
Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. 2002-01-01 00:57:39 +01:00			`mail_link(&mhdriver); /* link in the mh driver */`
Apply cleanly after update to 4.3.11 2005-04-22 01:47:46 +02:00			`@@ -430,6 +435,10 @@`
Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. 2002-01-01 00:57:39 +01:00			`mail_link(&tenexdriver); /* link in the tenex driver */`
			`mail_link(&mtxdriver); /* link in the mtx driver */`
			`mail_link(&dummydriver); /* link in the dummy driver */`
Adapt the imap-uw c-client linkage file use patches, so that they are more acceptabtable for inclusion in master PHP sources. No externally visible change, so pkg revision not bumped. 2004-01-16 16:04:54 +01:00			`+#else /* HAVE_IMAP_LINKAGE */`
Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. 2002-01-01 00:57:39 +01:00			`+ /* link in the c-client mail and auth drivers */`
			`+#include "linkage.c"`
Adapt the imap-uw c-client linkage file use patches, so that they are more acceptabtable for inclusion in master PHP sources. No externally visible change, so pkg revision not bumped. 2004-01-16 16:04:54 +01:00			`+#endif /* HAVE_IMAP_LINKAGE */`
Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6; simply update to version from php-4.1.0 distribution, but add back "--with-imap-ssl" to configure options as the IMAP client library does both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the PHP4 client unless this option is specified. 2002-01-01 00:57:39 +01:00
Updated php to 4.2.3 * lots of bug fixes * experimental apache2 support * added IPv6 support to gethostbyaddr() ATTENTION!! register_globals defaults to 'off' now 2002-10-14 08:21:05 +02:00			`#ifndef PHP_WIN32`
			`auth_link(&auth_log); /* link in the log authenticator */`