passwordsync/build.bat passwordsync/passhook passwordsync/passsync passwordsync/wix usersync/build.bat usersync/wrapper

[Noriko Hosoi]

passwordsync/build.bat             |    6 +++---
 passwordsync/passhook/passhook.mak |    2 +-
 passwordsync/passsync/passsync.dsp |    2 +-
 passwordsync/passsync/passsync.mak |    2 +-
 passwordsync/wix/PassSync.wxs      |    6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 012c6ecea3f9670217014ad0e83941eaa683042d
Author: Noriko Hosoi 
Date:   Thu Jan 15 17:20:00 2015 -0800

Ticket #47987 - Support TLS1.1 and newer SSL versions

Description:
    Adjusting PassSync to the latest libraries.
    . NSPR: nspr-win-4.10.6-1
    . NSS: nss-win-3.16.2.3-2
    . MOZLDAP: ldap-c-sdk-win-6.0.7-7

By default, PassSync uses TLS1.1 and newer SSL versions supported
    by the NSS.  To force to enable SSLv3.0, an environment variable
    LDAPSSL_ALLOW_OLD_SSL_VERSION has to be set with some non NULL
    value in Computer | Properties | Advanced system settings |
    Environment Variables | System variables, add
      variable: LDAPSSL_ALLOW_OLD_SSL_VERSION
      value: 1
    It will allow PassSync with this patch to connect to the server
    that runs only accept SSLv3.0.
    [...] conn=17 SSL3 128-bit AES

Note: bumped the PassSync version to 1.1.6.

https://fedorahosted.org/389/ticket/47987

Reviewed by [e-mail] (Thank you, Rich!!)

diff --git a/passwordsync/build.bat b/passwordsync/build.bat
old mode 100644
new mode 100755
index daf95b4..7aa861a
--- a/passwordsync/build.bat
+++ b/passwordsync/build.bat
@@ -50,7 +50,7 @@ set DOWNLOAD=%BITSADMIN% /wrap /transfer passsyncbuild /download /priority norma
 @rem HACK HACK HACK
 @rem unzip.vbs just stopped working - gives File or Folder exists
 @rem which is clearly not true
-@ren so, fall back on MozillaTools
+@rem so, fall back on MozillaTools
 set UZCMD=C:\mozilla-build\info-zip\unzip.exe -q
 @rem set UZCMD=cscript //nologo "%CD%\unzip.vbs"
 @rem set DOWNLOAD=wget --no-directories
@@ -170,7 +170,7 @@ if [%BRANDNOSPACE%] == [] (
    set BRANDNOSPACE=389
 )
 if [%VERSION%] == [] (
-   set VERSION=1.1.5
+   set VERSION=1.1.6
 )

rem ======== Set Various Build Directories ========
@@ -273,7 +273,7 @@ pushd "%CD%"

rem ======== Build ========
 rem   ------ Set Build Paths ------
-set INCLUDE=%INCLUDE%;%LIBROOT%\ldapsdk\public\ldap;%LIBROOT%\nspr\include;%LIBROOT%\nss\include
+set INCLUDE=%INCLUDE%;%LIBROOT%\ldapsdk\include\ldap;%LIBROOT%\nspr\include\nspr;%LIBROOT%\nss\include
 set LIB=%LIB%;%LIBROOT%\ldapsdk\lib;%LIBROOT%\nspr\lib;%LIBROOT%\nss\lib

rem   ------ PassSync ------
diff --git a/passwordsync/passhook/passhook.mak b/passwordsync/passhook/passhook.mak
index 46ed160..318746c 100644
--- a/passwordsync/passhook/passhook.mak
+++ b/passwordsync/passhook/passhook.mak
@@ -85,7 +85,7 @@ OPT_CPPFLAGS=/MT /O2 /D "NDEBUG" $(COMMON_CPPFLAGS)
 DBG_CPPFLAGS=/MTd /Gm /Zi /D "_DEBUG" /RTC1 $(COMMON_CPPFLAGS)

SYS_LIBS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-MOZ_LIBS=nss3.lib nssutil3.lib libplc4.lib libnspr4.lib
+MOZ_LIBS=nss3.lib nssutil3.lib plc4.lib nspr4.lib
 LIBS=$(SYS_LIBS) $(MOZ_LIBS)

DEF_FILE= \
diff --git a/passwordsync/passsync/passsync.dsp b/passwordsync/passsync/passsync.dsp
index 3219da9..622687c 100644
--- a/passwordsync/passsync/passsync.dsp
+++ b/passwordsync/passsync/passsync.dsp
@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 nss3.lib plc4.lib nspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

!ENDIF

diff --git a/passwordsync/passsync/passsync.mak b/passwordsync/passsync/passsync.mak
index 1a44fbd..f54c48f 100644
--- a/passwordsync/passsync/passsync.mak
+++ b/passwordsync/passsync/passsync.mak
@@ -74,7 +74,7 @@ OPT_CPPFLAGS=/MT /O2 /D "NDEBUG" $(COMMON_CPPFLAGS)
 DBG_CPPFLAGS=/MTd /Gm /Zi /D "_DEBUG" /RTC1 $(COMMON_CPPFLAGS)

SYS_LIBS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-MOZ_LIBS=nss3.lib nssutil3.lib libplc4.lib libnspr4.lib nsldappr32v60.lib nsldapssl32v60.lib nsldap32v60.lib
+MOZ_LIBS=nss3.lib nssutil3.lib plc4.lib nspr4.lib nsldappr32v60.lib nsldapssl32v60.lib nsldap32v60.lib
 LIBS=$(SYS_LIBS) $(MOZ_LIBS)

COMMON_LDFLAGS=$(MACH) /MANIFEST /nologo /subsystem:console /pdb:"$(OUTDIR)\passsync.pdb" /out:$@ dssynchmsg.res
diff --git a/passwordsync/wix/PassSync.wxs b/passwordsync/wix/PassSync.wxs
index 6200643..55b3c56 100644
--- a/passwordsync/wix/PassSync.wxs
+++ b/passwordsync/wix/PassSync.wxs
@@ -202,15 +202,15 @@
         </Component>

<Component Id='NSPRLibrary' Guid='7DFF5449-F38C-4C3B-9876-E32A123F1EA5' Win64='$(var.Property_Win64)'>
-          <File Id='NSPR' Name='libnspr4.dll' DiskId='1' Source='libnspr4.dll' Vital='yes' />
+          <File Id='NSPR' Name='nspr4.dll' DiskId='1' Source='nspr4.dll' Vital='yes' />
         </Component>

<Component Id='NSPRpldsLibrary' Guid='50C89341-754F-4092-8307-129DB119B42E' Win64='$(var.Property_Win64)'>
-          <File Id='NSPRPLDS' Name='libplds4.dll' DiskId='1' Source='libplds4.dll' Vital='yes' />
+          <File Id='NSPRPLDS' Name='plds4.dll' DiskId='1' Source='plds4.dll' Vital='yes' />
         </Component>

<Component Id='NSPRplcLibrary' Guid='1B8B1D78-E2C1-4F3A-A841-C79FFE26E6E0' Win64='$(var.Property_Win64)'>
-          <File Id='NSPRPLC' Name='libplc4.dll' DiskId='1' Source='libplc4.dll' Vital='yes' />
+          <File Id='NSPRPLC' Name='plc4.dll' DiskId='1' Source='plc4.dll' Vital='yes' />
         </Component>

<Component Id='NSSLibrary' Guid='5E122346-6B77-456D-BCC5-76D7FA8AF258' Win64='$(var.Property_Win64)'>
diff --git a/usersync/build.bat b/usersync/build.bat
old mode 100644
new mode 100755
diff --git a/usersync/wrapper/usersync.bat b/usersync/wrapper/usersync.bat
old mode 100644
new mode 100755