Update to 2.4.33.

Feature safe:	yes

4 files changed, 11 insertions, 129 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 2356a64331e6..7aed2e9bfcca 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.32
+DISTVERSION=		2.4.33
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -42,8 +42,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	1
-PORTREVISION_SERVER=	2
+PORTREVISION_CLIENT=	0
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	8
 
 OPTIONS_DEFINE=	SASL FETCH
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index 068d653a8aa0..9aab3b2cfc95 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.32.tgz) = 9ee413c6a816cb41f71826759b78001d04e747ede9dde302d6ba94ab16f0b82e
-SIZE (openldap-2.4.32.tgz) = 5450134
+SHA256 (openldap-2.4.33.tgz) = 81e9eca20f17a69a5d15ebc4c66a323106da4f4f80a32105bc7cdea333aca14c
+SIZE (openldap-2.4.33.tgz) = 5463850
diff --git a/net/openldap24-server/files/patch-ITS-7363 b/net/openldap24-server/files/patch-ITS-7363
deleted file mode 100644
index 2396ac98f3a1..000000000000
--- a/net/openldap24-server/files/patch-ITS-7363
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git libraries/libmdb/mdb.c libraries/libmdb/mdb.c
-index d1184d1..0e02685 100644
---- libraries/libmdb/mdb.c
-+++ libraries/libmdb/mdb.c
-@@ -61,9 +61,13 @@
- #include <resolv.h>	/* defines BYTE_ORDER on HPUX and Solaris */
- #endif
- 
-+#if defined(__APPLE__) || defined (BSD)
-+#define USE_POSIX_SEM
-+#endif
-+
- #ifndef _WIN32
- #include <pthread.h>
--#ifdef __APPLE__
-+#ifdef USE_POSIX_SEM
- #include <semaphore.h>
- #endif
- #endif
-@@ -150,7 +154,7 @@
- #define	close(fd)	CloseHandle(fd)
- #define	munmap(ptr,len)	UnmapViewOfFile(ptr)
- #else
--#ifdef __APPLE__
-+#ifdef USE_POSIX_SEM
- #define LOCK_MUTEX_R(env)	sem_wait((env)->me_rmutex)
- #define UNLOCK_MUTEX_R(env)	sem_post((env)->me_rmutex)
- #define LOCK_MUTEX_W(env)	sem_wait((env)->me_wmutex)
-@@ -175,7 +179,7 @@
- 	/** Unlock the writer mutex.
- 	 */
- #define UNLOCK_MUTEX_W(env)	pthread_mutex_unlock(&(env)->me_txns->mti_wmutex)
--#endif	/* __APPLE__ */
-+#endif	/* USE_POSIX_SEM */
- 
- 	/** Get the error code for the last failed system function.
- 	 */
-@@ -200,7 +204,7 @@
- #define	GET_PAGESIZE(x)	((x) = sysconf(_SC_PAGE_SIZE))
- #endif
- 
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(USE_POSIX_SEM)
- #define MNAME_LEN	32
- #else
- #define MNAME_LEN	(sizeof(pthread_mutex_t))
-@@ -464,7 +468,7 @@ typedef struct MDB_txbody {
- 	uint32_t	mtb_magic;
- 		/** Version number of this lock file. Must be set to #MDB_VERSION. */
- 	uint32_t	mtb_version;
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(USE_POSIX_SEM)
- 	char	mtb_rmname[MNAME_LEN];
- #else
- 		/** Mutex protecting access to this table.
-@@ -497,7 +501,7 @@ typedef struct MDB_txninfo {
- 		char pad[(sizeof(MDB_txbody)+CACHELINE-1) & ~(CACHELINE-1)];
- 	} mt1;
- 	union {
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(USE_POSIX_SEM)
- 		char mt2_wmname[MNAME_LEN];
- #define	mti_wmname	mt2.mt2_wmname
- #else
-@@ -914,7 +918,7 @@ struct MDB_env {
- 	HANDLE		me_rmutex;		/* Windows mutexes don't reside in shared mem */
- 	HANDLE		me_wmutex;
- #endif
--#ifdef __APPLE__
-+#ifdef USE_POSIX_SEM
- 	sem_t		*me_rmutex;		/* Apple doesn't support shared mutexes */
- 	sem_t		*me_wmutex;
- #endif
-@@ -2644,7 +2648,7 @@ mdb_env_share_locks(MDB_env *env)
- 	}
- #endif
- }
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(USE_POSIX_SEM)
- /*
-  * hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code
-  *
-@@ -2883,7 +2887,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
- 			goto fail;
- 		}
- #else	/* _WIN32 */
--#ifdef __APPLE__
-+#ifdef USE_POSIX_SEM
- 		struct stat stbuf;
- 		struct {
- 			dev_t dev;
-@@ -2920,7 +2924,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
- 			rc = ErrCode();
- 			goto fail;
- 		}
--#else	/* __APPLE__ */
-+#else	/* USE_POSIX_SEM */
- 		pthread_mutexattr_t mattr;
- 
- 		pthread_mutexattr_init(&mattr);
-@@ -2930,7 +2934,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
- 		}
- 		pthread_mutex_init(&env->me_txns->mti_mutex, &mattr);
- 		pthread_mutex_init(&env->me_txns->mti_wmutex, &mattr);
--#endif	/* __APPLE__ */
-+#endif	/* USE_POSIX_SEM */
- #endif	/* _WIN32 */
- 		env->me_txns->mti_version = MDB_VERSION;
- 		env->me_txns->mti_magic = MDB_MAGIC;
-@@ -2965,7 +2969,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
- 			goto fail;
- 		}
- #endif
--#ifdef __APPLE__
-+#ifdef USE_POSIX_SEM
- 		env->me_rmutex = sem_open(env->me_txns->mti_rmname, 0);
- 		if (!env->me_rmutex) {
- 			rc = ErrCode();
diff --git a/net/openldap24-server/files/patch-shlib-version b/net/openldap24-server/files/patch-shlib-version
index e2baca8a27bb..2c534c85dfd7 100644
--- a/net/openldap24-server/files/patch-shlib-version
+++ b/net/openldap24-server/files/patch-shlib-version
@@ -1,14 +1,14 @@
 # I have checked all headers and don't think the shared library
 # bump is a needed one.  We patch it back to prevent large
 # rebuild need.
---- build/version.var.orig	2012-07-31 09:39:26.000000000 -0700
-+++ build/version.var	2012-07-31 12:03:12.618025612 -0700
+--- build/version.var.orig	2012-10-08 14:35:43.000000000 -0700
++++ build/version.var	2012-10-08 14:40:08.046064513 -0700
 @@ -17,7 +17,7 @@
  ol_minor=4
- ol_patch=32
- ol_api_inc=20432
+ ol_patch=33
+ ol_api_inc=20433
 -ol_api_current=10
 +ol_api_current=8
- ol_api_revision=4
+ ol_api_revision=5
  ol_api_age=8
- ol_release_date="2012/07/31"
+ ol_release_date="2012/10/13"