Return to releng

diff --git a/CHANGES b/CHANGES
index fbe9a6365c8ca322b6b5f5a0f5e7aab36e8a5445..b7df1ac2700c6799de8417ae3d7506f9f9dd6974 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 OpenLDAP 2.1 Change Log
 
+OpenLDAP 2.1.25 Engineering
+       Build Environment
+               Update Berkeley DB detection
+
 OpenLDAP 2.1.24 Release
        Fixed slapd "exact" v "base" handling (ITS#2782)
        Fixed slapd running as NT service (ITS#2769)

diff --git a/build/version.var b/build/version.var
index ba72abe868ae1446604b8de94ae5d1852e5a7c67..29321e2a9b266db13b9de3f199ecd685be0da9cd 100644 (file)
--- a/build/version.var
+++ b/build/version.var
@@ -7,7 +7,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=24
+ol_patch=X
 ol_api_inc=20124
 ol_api_lib=2:124:0
 ol_release_date="2003-12-04"