diff options
| author | delphij <delphij@FreeBSD.org> | 2009-11-25 03:40:21 +0800 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-11-25 03:40:21 +0800 |
| commit | 922dfaf0dc3960eee6f11fe28015a81f4afcedbc (patch) | |
| tree | 603ddc7e52f342e70af90c2cb3301a68a61321a5 /net | |
| parent | 2a43c1f29deeac8f88c5885a5ceb4fd7005dfa97 (diff) | |
| download | freebsd-ports-gnome-922dfaf0dc3960eee6f11fe28015a81f4afcedbc.tar.gz freebsd-ports-gnome-922dfaf0dc3960eee6f11fe28015a81f4afcedbc.tar.zst freebsd-ports-gnome-922dfaf0dc3960eee6f11fe28015a81f4afcedbc.zip | |
Apply two vendor fixes for older OpenLDAP versions.
Obtained from: python-ldap CVS
Requested by: Andrew J. Gillis <fbsdboy gmail com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-ldap2/files/patch-Modules__constants.c | 32 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-Modules__options.c | 30 |
2 files changed, 62 insertions, 0 deletions
diff --git a/net/py-ldap2/files/patch-Modules__constants.c b/net/py-ldap2/files/patch-Modules__constants.c new file mode 100644 index 000000000000..2b9c2cc524e3 --- /dev/null +++ b/net/py-ldap2/files/patch-Modules__constants.c @@ -0,0 +1,32 @@ +--- ./Modules/constants.c.orig 2009-10-30 06:20:47.000000000 -0700 ++++ ./Modules/constants.c 2009-11-24 11:36:43.304856749 -0800 +@@ -1,6 +1,6 @@ + /* constants defined for LDAP + * See http://www.python-ldap.org/ for details. +- * $Id: constants.c,v 1.43 2009/10/23 09:09:37 stroeder Exp $ */ ++ * $Id: constants.c,v 1.45 2009/11/13 08:44:07 stroeder Exp $ */ + + #include "common.h" + #include "constants.h" +@@ -162,7 +162,9 @@ + add_int(d,OPT_URI); + #ifdef HAVE_TLS + add_int(d,OPT_X_TLS); ++#ifdef LDAP_OPT_X_TLS_NEWCTX + add_int(d,OPT_X_TLS_CTX); ++#endif + add_int(d,OPT_X_TLS_CACERTFILE); + add_int(d,OPT_X_TLS_CACERTDIR); + add_int(d,OPT_X_TLS_CERTFILE); +@@ -181,8 +183,10 @@ + add_int(d,OPT_X_TLS_CRL_NONE); + add_int(d,OPT_X_TLS_CRL_PEER); + add_int(d,OPT_X_TLS_CRL_ALL); ++#ifdef LDAP_OPT_X_TLS_NEWCTX + add_int(d,OPT_X_TLS_NEWCTX); +-#ifdef OPT_X_TLS_PROTOCOL_MIN ++#endif ++#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN + add_int(d,OPT_X_TLS_PROTOCOL_MIN); + #endif + #endif diff --git a/net/py-ldap2/files/patch-Modules__options.c b/net/py-ldap2/files/patch-Modules__options.c new file mode 100644 index 000000000000..ce738e3de4be --- /dev/null +++ b/net/py-ldap2/files/patch-Modules__options.c @@ -0,0 +1,30 @@ +--- ./Modules/options.c.orig 2009-10-30 06:20:47.000000000 -0700 ++++ ./Modules/options.c 2009-11-24 11:36:43.305856626 -0800 +@@ -1,5 +1,5 @@ + /* See http://www.python-ldap.org/ for details. +- * $Id: options.c,v 1.33 2009/10/23 09:09:37 stroeder Exp $ */ ++ * $Id: options.c,v 1.35 2009/11/13 08:45:50 stroeder Exp $ */ + + #include "common.h" + #include "errors.h" +@@ -79,8 +79,10 @@ + #ifdef HAVE_TLS + case LDAP_OPT_X_TLS: + case LDAP_OPT_X_TLS_REQUIRE_CERT: ++#ifdef LDAP_OPT_X_TLS_NEWCTX + case LDAP_OPT_X_TLS_NEWCTX: +-#ifdef OPT_X_TLS_PROTOCOL_MIN ++#endif ++#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN + case LDAP_OPT_X_TLS_PROTOCOL_MIN: + #endif + #endif +@@ -218,7 +220,7 @@ + #ifdef HAVE_TLS + case LDAP_OPT_X_TLS: + case LDAP_OPT_X_TLS_REQUIRE_CERT: +-#ifdef OPT_X_TLS_PROTOCOL_MIN ++#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN + case LDAP_OPT_X_TLS_PROTOCOL_MIN: + #endif + #endif |