[popfile-commit] windows getssl.nsh,1.6.2.8,1.6.2.9

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31672

Modified Files:
      Tag: b0_22_2
	getssl.nsh 
Log Message:
Update the SSL Setup wizard to use the latest Inetc plugin. Stop trying
to apply the SSL.pm "downgrade" patch when using the built-in SSL files.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -d -r1.6.2.8 -r1.6.2.9
*** getssl.nsh	14 Sep 2006 13:55:38 -0000	1.6.2.8
--- getssl.nsh	19 Nov 2006 20:35:50 -0000	1.6.2.9
***************
*** 43,49 ****
  #--------------------------------------------------------------------------

!   ; This version of the script has been tested with the "NSIS v2.19" compiler,
!   ; released 6 August 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download

    ;------------------------------------------------
--- 43,49 ----
  #--------------------------------------------------------------------------

!   ; This version of the script has been tested with the "NSIS v2.21" compiler,
!   ; released 20 October 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download

    ;------------------------------------------------
***************
*** 61,65 ****
    ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional.
    ;
!   ; Tested with the inetc.dll plugin timestamped 24 June 2006 12:40

    ;------------------------------------------------
--- 61,65 ----
    ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional.
    ;
!   ; Tested with the inetc.dll plugin timestamped 12 November 2006 15:32:16

    ;------------------------------------------------
***************
*** 85,91 ****
    ;------------------------------------------------

!   ; The patch used to downgrade either SSL.pm v0.99 or SSL.pm v0.999 to v0.97 was created
!   ; using the VPATCH package which is supplied with NSIS. This special patch was made using
!   ; the commands:
    ;
    ;   GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat
--- 85,91 ----
    ;------------------------------------------------

!   ; The patch used to downgrade SSL.pm v0.99, SSL.pm v0.999 or SSL.pm v1.01 to v0.97 was
!   ; created using the VPATCH package which is supplied with NSIS. The following commands
!   ; were used to create the patch:
    ;
    ;   GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat
***************
*** 150,153 ****
--- 150,157 ----
    !ifdef ADDSSL

+       ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases
+ 
+       StrCpy $G_SSL_SOURCE "${C_BUILTIN}"
+ 
        ; For POPFile 0.22.3 (and later) releases this stand-alone utility will download and,
        ; if necessary, patch the SSL support files from the University of Winnipeg repository.
***************
*** 195,201 ****
        DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder"

!       ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher
! 
!       StrCpy ${L_RESULT} "built-in"

        IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag
--- 199,203 ----
        DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder"

!       ; Only download the SSL files if the minimal Perl version is 5.8.7 or higher

        IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag
***************
*** 204,208 ****

      set_download_flag:
!       StrCpy ${L_RESULT} "download"

      restore_vars:
--- 206,210 ----

      set_download_flag:
!       StrCpy $G_SSL_SOURCE "${C_INTERNET}"

      restore_vars:
***************
*** 215,223 ****
        !undef L_VER_Z

!       StrCmp ${L_RESULT} "download" download_ssl

      assume_pre_0_22_3:

!       ; Pretend we've just downloaded these files from the repository

        DetailPrint "therefore built-in SSL files used instead of downloading the latest versions"
--- 217,225 ----
        !undef L_VER_Z

!       StrCmp $G_SSL_SOURCE "${C_INTERNET}" download_ssl

      assume_pre_0_22_3:

!       ; Pretend we've just downloaded the SSL archives and OpenSSL DLLs from the Internet

        DetailPrint "therefore built-in SSL files used instead of downloading the latest versions"
***************
*** 235,239 ****
    !endif

!   ; Download the archives and OpenSSL DLLs

    Push "${C_UWR_IO_SOCKET_SSL}"
--- 237,241 ----
    !endif

!   ; Download the SSL archives and OpenSSL DLLs

    Push "${C_UWR_IO_SOCKET_SSL}"
***************
*** 282,287 ****
    StrCmp ${L_RESULT} "success" 0 error_exit

!   ; If IO::Socket::SSL v0.99 has been downloaded and installed, apply the patch which
!   ; downgrades the SSL.pm file from v0.99 to v0.97 to make it compatible with POPFile

    DetailPrint ""
--- 284,296 ----
    StrCmp ${L_RESULT} "success" 0 error_exit

!   !ifdef ADDSSL
! 
!       ; If the built-in SSL Support files are being used then there is no need to patch SSL.pm
! 
!       StrCmp $G_SSL_SOURCE "${C_BUILTIN}" extract_Net_SSLeay_files
!   !endif
! 
!   ; If IO::Socket::SSL v0.99 (or v0.999 or v1.01) has been downloaded and installed, apply
!   ; the patch which downgrades the SSL.pm file to v0.97 to make it compatible with POPFile

    DetailPrint ""
***************
*** 290,296 ****
    SetDetailsPrint none
    !ifdef INSTALLER
!     File "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat"
    !else
!     File "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat"
    !endif
    SetDetailsPrint listonly
--- 299,305 ----
    SetDetailsPrint none
    !ifdef INSTALLER
!       File "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat"
    !else
!       File "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat"
    !endif
    SetDetailsPrint listonly
***************
*** 315,319 ****
    SetDetailsPrint both
    DetailPrint "$(PFI_LANG_SSLPATCHFAILED)"
!   Goto label_a

  downgrade_success:
--- 324,328 ----
    SetDetailsPrint both
    DetailPrint "$(PFI_LANG_SSLPATCHFAILED)"
!   Goto extract_Net_SSLeay_files

  downgrade_success:
***************
*** 324,331 ****
  show_downgrade_status:
    !ifdef ADDSSL
!     MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_SSLPATCHSTATUS)"
    !endif

! label_a:
    DetailPrint ""
    StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net"
--- 333,340 ----
  show_downgrade_status:
    !ifdef ADDSSL
!       MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_SSLPATCHSTATUS)"
    !endif

! extract_Net_SSLeay_files:
    DetailPrint ""
    StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net"
***************
*** 407,413 ****
    IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done
    !ifdef INSTALLER
!     File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file"
    !else
!     File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "..\zerobyte.file"
    !endif

--- 416,422 ----
    IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done
    !ifdef INSTALLER
!       File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file"
    !else
!       File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "..\zerobyte.file"
    !endif

***************
*** 469,473 ****
    EnableWindow ${L_DLG_ITEM} 0

!   inetc::get /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END
    Pop $G_PLS_FIELD_2

--- 478,482 ----
    EnableWindow ${L_DLG_ITEM} 0

!   inetc::get /CAPTION "Internet Download" /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END
    Pop $G_PLS_FIELD_2