diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2005-04-14 10:00:47 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2005-04-14 10:00:47 +0000 |
| commit | 68815e9945fc2d3163f755fc6f2c9a3aba14e350 (patch) | |
| tree | 930b8ba7e9e89b2e8a2cc3e26d6d5741029975e1 /net | |
| parent | - Update to 1.3.3 (diff) | |
Update to 2.2.24
PR: ports/79335
Submitted by: skv
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=133309
Diffstat (limited to 'net')
| -rw-r--r-- | net/openldap22-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap22-server/distinfo | 4 | ||||
| -rw-r--r-- | net/openldap22-server/files/patch-libraries::libldap::os-ip.c | 23 | ||||
| -rw-r--r-- | net/openldap22-server/files/patch-servers::slapd::back-ldap::search.c | 11 |
4 files changed, 3 insertions, 37 deletions
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 9fb728906ee4..7f778a8cfb77 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 2.2.23 +PORTVERSION= 2.2.24 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo index 8734504e934e..e4d8d548c521 100644 --- a/net/openldap22-server/distinfo +++ b/net/openldap22-server/distinfo @@ -1,2 +1,2 @@ -MD5 (openldap-2.2.23.tgz) = 51d1cf0a8f77f5cd27a5aa2b82a344ec -SIZE (openldap-2.2.23.tgz) = 2600908 +MD5 (openldap-2.2.24.tgz) = 383691dbabe05ee2b72a3e9db2042a82 +SIZE (openldap-2.2.24.tgz) = 2624959 diff --git a/net/openldap22-server/files/patch-libraries::libldap::os-ip.c b/net/openldap22-server/files/patch-libraries::libldap::os-ip.c deleted file mode 100644 index 32df40c91e11..000000000000 --- a/net/openldap22-server/files/patch-libraries::libldap::os-ip.c +++ /dev/null @@ -1,23 +0,0 @@ ---- libraries/libldap/os-ip.c Thu Jan 20 18:01:01 2005 -+++ libraries/libldap/os-ip.c Mon Jan 31 16:53:39 2005 -@@ -258,15 +258,15 @@ - if ( async ) return ( -2 ); - #endif - -- FD_ZERO(&wfds); -- FD_SET(s, &wfds ); -+ do { -+ FD_ZERO(&wfds); -+ FD_SET(s, &wfds ); - - #ifdef HAVE_WINSOCK -- FD_ZERO(&efds); -- FD_SET(s, &efds ); -+ FD_ZERO(&efds); -+ FD_SET(s, &efds ); - #endif - -- do { - rc = select(ldap_int_tblsize, z, &wfds, - #ifdef HAVE_WINSOCK - &efds, diff --git a/net/openldap22-server/files/patch-servers::slapd::back-ldap::search.c b/net/openldap22-server/files/patch-servers::slapd::back-ldap::search.c deleted file mode 100644 index a519d2de3781..000000000000 --- a/net/openldap22-server/files/patch-servers::slapd::back-ldap::search.c +++ /dev/null @@ -1,11 +0,0 @@ ---- servers/slapd/back-ldap/search.c Thu Jan 20 18:01:12 2005 -+++ servers/slapd/back-ldap/search.c Wed Feb 2 14:51:05 2005 -@@ -681,7 +681,7 @@ - - retry: - rc = ldap_search_ext_s(lc->ld, mdn.bv_val, LDAP_SCOPE_BASE, filter, -- gattr, 0, NULL, NULL, LDAP_NO_LIMIT, -+ at ? gattr : NULL, 0, NULL, NULL, LDAP_NO_LIMIT, - LDAP_NO_LIMIT, &result); - if ( rc != LDAP_SUCCESS ) { - if ( rc == LDAP_SERVER_DOWN && do_retry ) { |