diff options
| author | jdolecek <jdolecek> | 2004-10-31 18:23:24 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2004-10-31 18:23:24 +0000 |
| commit | ddaac6391e32b7d4a0e3a238d0abee88719f97fc (patch) | |
| tree | 335a814656ef5809f020993e8ba3b72da213075a /www/php4/patches | |
| parent | 9b72e9760b6ca7f122f228681e0fd7f09d303314 (diff) | |
| download | pkgsrc-ddaac6391e32b7d4a0e3a238d0abee88719f97fc.tar.gz | |
move php4-imap patches into php4/patches and use USE_PHP_EXT_PATCHES
Diffstat (limited to 'www/php4/patches')
| -rw-r--r-- | www/php4/patches/patch-aj | 28 | ||||
| -rw-r--r-- | www/php4/patches/patch-ak | 27 |
2 files changed, 55 insertions, 0 deletions
diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj new file mode 100644 index 00000000000..33836fe0a87 --- /dev/null +++ b/www/php4/patches/patch-aj @@ -0,0 +1,28 @@ +$NetBSD: patch-aj,v 1.8 2004/10/31 18:23:24 jdolecek Exp $ + +--- ext/imap/config.m4.orig 2004-01-17 01:01:06.000000000 +0100 ++++ ext/imap/config.m4 2004-10-31 18:49:03.000000000 +0100 +@@ -54,6 +54,14 @@ + ]) + ]) + ++dsl Must be before --with-kerberos, affects the check ++PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage, ++[ --with-imap-linkage Use IMAP c-client linkage to determine supported items.]) ++ ++if test "$PHP_IMAP_LINKAGE" != "no"; then ++ AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ]) ++fi ++ + AC_DEFUN(PHP_IMAP_KRB_CHK, [ + AC_ARG_WITH(kerberos, + [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[ +@@ -90,7 +98,7 @@ + PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) +- else ++ elif test "$PHP_IMAP_LINKAGE" != "yes"; then + AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ + AC_MSG_ERROR([This c-client library is built with Kerberos support. + diff --git a/www/php4/patches/patch-ak b/www/php4/patches/patch-ak new file mode 100644 index 00000000000..57571907c5a --- /dev/null +++ b/www/php4/patches/patch-ak @@ -0,0 +1,27 @@ +$NetBSD: patch-ak,v 1.3 2004/10/31 18:23:24 jdolecek Exp $ + +--- ext/imap/php_imap.c.orig 2004-08-12 21:32:59.000000000 +0200 ++++ ext/imap/php_imap.c 2004-10-31 18:49:03.000000000 +0100 +@@ -414,6 +414,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 */ +@@ -429,6 +434,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 */ |