From: Brian S. <xue...@us...> - 2008-03-04 14:55:07
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24779/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Update the "POPFile SSL Setup" wizard to make it use the appropriate POPFile Patch Control File if it is used to add or upgrade SSL Support for POPFile 0.22.5 or a later release. Update the history of the SSL patches and the instructions for making them, including the need to pay attention to the end-of-line sequences. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.12 retrieving revision 1.3.4.13 diff -C2 -d -r1.3.4.12 -r1.3.4.13 *** addssl.nsi 14 Feb 2008 17:42:42 -0000 1.3.4.12 --- addssl.nsi 4 Mar 2008 14:55:00 -0000 1.3.4.13 *************** *** 4,24 **** # SSL support for an existing POPFile 0.22.0 (or later) installation. # ! # Normally the SSL support files are downloaded from the University of Winnipeg ! # repository. However these files are no longer compatible with the minimal Perl ! # shipped with POPFile 0.22.0, 0.22.1 or 0.22.2 so this utility includes a set ! # of compatible SSL files which will be installed instead. The minimal Perl's ! # version number (obtained from the 'perl58.dll' file) is used to determine the ! # action to be taken. # ! # The Windows installer for POPFile 0.22.3 (or later) is able to download and ! # install SSL support. Normally SSL support is downloaded at the same time that ! # POPFile is installed, but SSL support can be added or updated later by using ! # the command "setup.exe /SSL" to run the installer (instead of "setup.exe"). # ! # IO::Socket:SSL v0.97 (released 17 July 2005) is the most recent version which ! # is compatible with POPFile 0.22.4. IO::Socket::SSL versions 0.99, 0.999, 1.01 ! # and 1.08 (the most recent, released 31 August 2007) are all incompatible with ! # POPFile 0.22.4 so a patch is applied to downgrade SSL.pm to v0.97 to make it ! # POPFile-compatible (see ..\getssl.nsh for details). # # As a temporary workaround to cope with future "SSL compatibility" issues --- 4,24 ---- # SSL support for an existing POPFile 0.22.0 (or later) installation. # ! # The Windows installer for POPFile 0.22.3 (or later) is able to download ! # and install SSL support. If any patches need to be applied to make the ! # SSL files work with POPFile these will be downloaded from the POPFile ! # website and applied by the 0.22.5 or later installers. # ! # Normally SSL support is downloaded at the same time that POPFile is ! # installed, but SSL support can be added or updated after installation ! # by using the "Add/Remove Programs" entry for POPFile 1.0.0 or later. ! # For POPFile 0.22.3, 0.22.4 or 0.22.5 SSL support can be added or updated ! # later by using the command "setup.exe /SSL" to run the installer. # ! # Normally the SSL support files are downloaded from the University of ! # Winnipeg repository. However these files are no longer compatible with ! # the minimal Perl shipped with POPFile 0.22.0, 0.22.1 or 0.22.2 so this ! # utility includes a set of compatible SSL files which will be installed ! # instead. The minimal Perl's version number (obtained from the 'perl58.dll' ! # file) is used to determine the action to be taken. # # As a temporary workaround to cope with future "SSL compatibility" issues *************** *** 31,36 **** # be backed up as Module.pm.bk1). The patch is only applied if v1.40 is found. # ! # An 'include' file is used to ensure this utility and the main POPFile ! # installer download and install the same SSL support files. # # Copyright (c) 2004-2008 John Graham-Cumming --- 31,37 ---- # be backed up as Module.pm.bk1). The patch is only applied if v1.40 is found. # ! # An 'include' file (getssl.nsh) is used to ensure this utility and the main ! # POPFile installer download and install the same SSL support files and any ! # necessary SSL patches. # # Copyright (c) 2004-2008 John Graham-Cumming *************** *** 196,204 **** # the SSL support files from the University of Winnipeg repository. However there will always # be some delay between the repository being updated with SSL files which are not compatible ! # with POPFile and the generation of an updated version of this wizard. # # The /BUILTIN switch provides an easy way to force the installation of the old SSL support # files normally used only for the POPFile 0.22.0, 0.22.1 and 0.22.2 releases as a workaround ! # until this wizard can be updated to handle the new SSL support files. # # To force the installation of the old SSL support files use the following command: --- 197,205 ---- # the SSL support files from the University of Winnipeg repository. However there will always # be some delay between the repository being updated with SSL files which are not compatible ! # with POPFile and the generation of an updated version of the SSL patches (or this wizard). # # The /BUILTIN switch provides an easy way to force the installation of the old SSL support # files normally used only for the POPFile 0.22.0, 0.22.1 and 0.22.2 releases as a workaround ! # until the SSL patches (or this wizard) can be updated to handle the new SSL support files. # # To force the installation of the old SSL support files use the following command: *************** *** 215,218 **** --- 216,220 ---- # Normally no NSIS compiler warnings are expected. However there may be some warnings # which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or more language tables. + # # These "PFI_LANG_NSISDL_PLURAL" warnings can be safely ignored (at present only the # 'Japanese-pfi.nsh' file generates this warning). *************** *** 266,270 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.3.0" ; Mention the wizard's version number in the window title --- 268,272 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.3.1" ; Mention the wizard's version number in the window title |