cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply two vendor fixes for older OpenLDAP versions.

Browse Source 
Obtained from:	python-ldap CVS
Requested by:	Andrew J. Gillis <fbsdboy gmail com>
This commit is contained in:
Xin LI 2009-11-24 19:40:21 +00:00
parent d03900e9c3
commit 929cfb0e2a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=244728
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/py-ldap2/files/patch-Modules__constants.c Normal file
View File

@ -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

30
net/py-ldap2/files/patch-Modules__options.c Normal file
View File

@ -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