From a2d8a8e765ace83d10161bf99bb50439f5814343 Mon Sep 17 00:00:00 2001
From: "bugzilla@standard8.demon.co.uk" <bugzilla@standard8.demon.co.uk>
Date: Thu, 12 Apr 2007 04:18:00 -0700
Subject: [PATCH] Test landing bug 359716 again now that we've hopefully got
provisional fixes for the ldap c-sdk code
---
client.mk | 2 +-
configure.in | 8 ++++----
xpinstall/packager/os2/browser.jst | 2 ++
xpinstall/packager/packages-os2 | 9 +++++----
xpinstall/packager/packages-unix | 6 +++---
xpinstall/packager/packages-win | 5 +++--
xpinstall/packager/unix/browser.jst | 3 +++
xpinstall/packager/windows/browser.jst | 2 ++
8 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/client.mk b/client.mk
index 1997b6026051e..26dc6440be555 100644
--- a/client.mk
+++ b/client.mk
@@ -407,7 +407,7 @@ MODULES_all := \
#MOZ_CO_TAG = <tag>
NSPR_CO_TAG = NSPRPUB_PRE_4_2_CLIENT_BRANCH
NSS_CO_TAG = NSS_3_11_5_RTM
-LDAPCSDK_CO_TAG = ldapcsdk_5_17_client_branch
+LDAPCSDK_CO_TAG = LDAPCSDK_6_0_3_CLIENT_BRANCH
LOCALES_CO_TAG =
#######################################################################
diff --git a/configure.in b/configure.in
index a434febf8e7bc..f56f61434cb35 100644
--- a/configure.in
+++ b/configure.in
@@ -7551,14 +7551,14 @@ if test "$MOZ_LDAP_XPCOM"; then
LDAP_CFLAGS='-I${DIST}/public/ldap'
if test "$OS_ARCH" = "WINNT"; then
if test -n "$GNU_CC"; then
- LDAP_LIBS='-L$(DIST)/lib -lnsldap32v50 -lnsldappr32v50'
+ LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
else
- LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v50.${IMPORT_LIB_SUFFIX}'
+ LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
fi
elif test "$VACPP"; then
- LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap50.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap50.${IMPORT_LIB_SUFFIX}'
+ LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
else
- LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap50 -llber50 -lprldap50'
+ LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
fi
fi
diff --git a/xpinstall/packager/os2/browser.jst b/xpinstall/packager/os2/browser.jst
index 2870cd7e6e026..1be465dbccffe 100644
--- a/xpinstall/packager/os2/browser.jst
+++ b/xpinstall/packager/os2/browser.jst
@@ -157,6 +157,8 @@ function upgradeCleanup()
deleteThisFile("Components", "xpinstall.xpt");
deleteThisFile("Components", "xuldoc.xpt");
deleteThisFile("Components", "xultmpl.xpt");
+ deleteThisFile("Program", "ldap50.dll");
+ deleteThisFile("Program", "prldap50.dll");
}
// main
diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2
index 924786afb468e..564a3974e0d08 100644
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -315,10 +315,11 @@ bin/components/spellchecker.xpt
; LDAP components need to be in the browser for AutoConfig
bin/components/mozldap.dll
bin/components/mozldap.xpt
-;bin/nsldap32v50.dll
-bin/ldap50.dll
-;bin/nsldappr32v50.dll
-bin/prldap50.dll
+;bin/nsldap32v60.dll
+bin/ldap60.dll
+;bin/nsldappr32v60.dll
+bin/prldap60.dll
+bin/ldif60.dll
; p3p
bin/components/p3p.xpt
diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix
index 0e6c9ce8eccac..a1fd6589b80d6 100644
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -313,9 +313,9 @@ bin/components/libwebsrvcs.so
bin/components/websrvcs.xpt
; LDAP components need to be in the browser for AutoConfig
-bin/libldap50.so
-bin/libprldap50.so
-bin/liblber50.so
+bin/libldap60.so
+bin/libprldap60.so
+bin/libldif60.so
bin/components/libmozldap.so
bin/components/mozldap.xpt
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index 40ead5c6f9de1..098263b6f810c 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -193,8 +193,9 @@ bin\components\spellchecker.xpt
; LDAP components need to be in the browser for AutoConfig
bin\components\mozldap.dll
bin\components\mozldap.xpt
-bin\nsldap32v50.dll
-bin\nsldappr32v50.dll
+bin\nsldap32v60.dll
+bin\nsldappr32v60.dll
+bin\nsldif32v60.dll
;PSM related files
bin\components\pippki.dll
diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst
index 85a3f901f3370..47703cda9b09c 100644
--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@@ -49,6 +49,9 @@ function upgradeCleanup()
deleteThisFile("Program", "libcmt.so");
deleteThisFile("Program", "libjpeg.so");
deleteThisFile("Program", "libprotocol.so");
+ deleteThisFile("Program", "libldap50.so");
+ deleteThisFile("Program", "libprldap50.so");
+ deleteThisFile("Program", "liblber50.so");
}
var srDest = $SpaceRequired$;
diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst
index 0887d1b846c47..cd59442bf3a3b 100644
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@@ -389,6 +389,8 @@ function upgradeCleanup()
deleteThisFile("Program", "gkwidget.dll");
deleteThisFile("Program", "jpeg3250.dll");
deleteThisFile("Program", "mozreg.dll");
+ deleteThisFile("Program", "nsldap32v50.dll");
+ deleteThisFile("Program", "nsldappr32v50.dll");
deleteThisFile("Program", "ISimpleDOMNodeMarshal.dll");
deleteThisFile("Program", "ISimpleDOMDocumentMarshal.dll");
deleteThisFile("Program", "defaults/pref/config.js");
--
GitLab