[popfile-commit] windows/add-ons addssl.nsi,1.3.4.4,1.3.4.5

[Brian S. <xue...@us...>]

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

Modified Files:
      Tag: b0_22_2
	addssl.nsi 
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: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.3.4.4
retrieving revision 1.3.4.5
diff -C2 -d -r1.3.4.4 -r1.3.4.5
*** addssl.nsi	14 Sep 2006 13:53:35 -0000	1.3.4.4
--- addssl.nsi	19 Nov 2006 20:35:50 -0000	1.3.4.5
***************
*** 53,68 ****
  #--------------------------------------------------------------------------
  
!   ; 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
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef v2.19_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.19 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
--- 53,68 ----
  #--------------------------------------------------------------------------
  
!   ; 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
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef v2.21_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.21 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
***************
*** 87,91 ****
    ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional.
    ;
!   ; Tested with the inetc.dll plugin timestamped 8 September 2006 10:13:18
  
    ;------------------------------------------------
--- 87,91 ----
    ; 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
  
    ;------------------------------------------------
***************
*** 233,237 ****
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.2.1"
  
    ; Mention the wizard's version number in the window title
--- 233,237 ----
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.2.2"
  
    ; Mention the wizard's version number in the window title
***************
*** 243,246 ****
--- 243,251 ----
    !define C_OUTFILE      "addssl.exe"
  
+   ; Values used for the $G_SSL_SOURCE flag which indicates where we get the SSL files from
+   ; (to make maintenance easier, constants are used for these values)
+ 
+   !define C_BUILTIN      "built-in"    ; use old SSL files compatible with pre-0.22.3 releases
+   !define C_INTERNET     "internet"    ; download latest SSL Support files from the Internet
  
  #--------------------------------------------------------------------------
***************
*** 253,256 ****
--- 258,264 ----
    Var G_MPLIBDIR           ; full path to the folder used for most of the minimal Perl files
  
+   Var G_SSL_SOURCE         ; indicates the source of the SSL files we are to install
+                            ; (the possible values are either ${C_BUILTIN} or ${C_INTERNET})
+ 
    Var G_PLS_FIELD_1        ; used to customize some language strings