[popfile-commit] windows 0.22.5.pcf, NONE, 1.1.2.1 getssl.nsh, 1.6.2.12, 1.6.2.13

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

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

Modified Files:
      Tag: b0_22_2
	getssl.nsh 
Added Files:
      Tag: b0_22_2
	0.22.5.pcf 
Log Message:
Use release-specific PCF files for greater flexibility.

--- NEW FILE: 0.22.5.pcf ---
; POPFILE PATCH CONTROL FILE

[PCF]
Format=1

[Settings]
POPFileVersion=0.22.5
PatchIssue=1
NumberOfPatches=0
Comment=The current SSL Support files are compatible (13 Jun 2007 @ 19:08 GMT)

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.12
retrieving revision 1.6.2.13
diff -C2 -d -r1.6.2.12 -r1.6.2.13
*** getssl.nsh	28 Jan 2007 21:17:35 -0000	1.6.2.12
--- getssl.nsh	13 Jun 2007 23:26:35 -0000	1.6.2.13
***************
*** 21,24 ****
--- 21,28 ----
  #                will be applied to downgrade the SSL.pm file to the compatible v0.97 version.
  #
+ #                POPFile 0.22.5 uses a new minimal Perl and at the time of its release there
+ #                was no need to patch any of the SSL Support files from the University of
+ #                Winnipeg repository.
+ #
  #                Starting with the 0.22.5 release any patches required to make the SSL Support
  #                files compatible with POPFile will be downloaded from the POPFile web site.
***************
*** 145,149 ****
  
    !define C_PATCH_WEBSITE     "http://getpopfile.org/ssl-patch"
!   !define C_PATCH_CTRL_FILE   "0.22.x.pcf"
    !define C_MD5SUMS_FILE      "MD5SUMS"
  
--- 149,157 ----
  
    !define C_PATCH_WEBSITE     "http://getpopfile.org/ssl-patch"
!   !ifdef INSTALLER
!       !define C_PATCH_CTRL_FILE   "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf"
!   !else
!       !define C_PATCH_CTRL_FILE   "0.22.x.pcf"
!   !endif
    !define C_MD5SUMS_FILE      "MD5SUMS"
  
***************
*** 242,246 ****
  
        ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases
!       ; (these SSL support files do not require any patches to make them POPFIle-compatible)
  
          StrCpy $G_SSL_SOURCE "${C_BUILTIN}"
--- 250,254 ----
  
        ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases
!       ; (these SSL support files do not require any patches to make them POPFile-compatible)
  
          StrCpy $G_SSL_SOURCE "${C_BUILTIN}"
***************
*** 536,540 ****
  
    ; Failed to download POPFile's SSL Patch Control file or the MD5 sums
! 
    StrCpy $G_PATCH_SOURCE "${C_BUILTIN}"
    DetailPrint "Unable to download data from POPFile website, using built-in SSL patches instead"
--- 544,548 ----
  
    ; Failed to download POPFile's SSL Patch Control file or the MD5 sums
!   
    StrCpy $G_PATCH_SOURCE "${C_BUILTIN}"
    DetailPrint "Unable to download data from POPFile website, using built-in SSL patches instead"
***************
*** 543,548 ****
    SetDetailsPrint none
    !ifdef INSTALLER
!       File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "0.22.x.pcf"
!       File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat"
    !else
        File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "..\0.22.x.pcf"
--- 551,558 ----
    SetDetailsPrint none
    !ifdef INSTALLER
!       File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "${C_PATCH_CTRL_FILE}"
!       
!       ; 0.22.5 release does not need any SSL patches so "SSL_pm.pat" is not needed here
!       
    !else
        File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "..\0.22.x.pcf"
***************
*** 684,688 ****
  # (b) column 33 is a space character
  # (c) column 34 is the text/binary flag (' ' = text, '*' = binary)
! # (d) column 35 is the first character of the filename (fiename terminates with end-of-line)
  #
  # Inputs:
--- 694,698 ----
  # (b) column 33 is a space character
  # (c) column 34 is the text/binary flag (' ' = text, '*' = binary)
! # (d) column 35 is the first character of the filename (filename terminates with end-of-line)
  #
  # Inputs:
***************
*** 833,837 ****
  
    !define L_FILENAME    $R9   ; name of input file (assumed to be in $PLUGINSDIR)
!   !define L_SOURCE      $R8   ; handle used ot access the input file
    !define L_TARGET      $R7   ; handle used to access the output file
    !define L_TEMP        $R6
--- 843,847 ----
  
    !define L_FILENAME    $R9   ; name of input file (assumed to be in $PLUGINSDIR)
!   !define L_SOURCE      $R8   ; handle used to access the input file
    !define L_TARGET      $R7   ; handle used to access the output file
    !define L_TEMP        $R6
***************
*** 997,1004 ****
--- 1007,1019 ----
    DetailPrint ""
    DetailPrint ""
+   StrCmp ${L_LISTSIZE} "0" no_patches
    StrCmp ${L_LISTSIZE} "1" single_patch
    DetailPrint "Apply ${L_LISTSIZE} SSL patches..."
    Goto start_patching
  
+ no_patches:
+   DetailPrint "No POPFile SSL patches are required"
+   Goto all_done
+ 
  single_patch:
    DetailPrint "Apply the SSL patch..."