From 692b42f3b8928d4f9c9efc8cd4640b94e5bb06a7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertn@the-nelsons.org>
Date: Wed, 7 Feb 2007 12:47:03 +0000
Subject: [PATCH] Back out eol change, it doesn't work on Linux.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4128 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/win32/patches/nsis.patch | 156 ++++++++++++++--------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/bacula/src/win32/patches/nsis.patch b/bacula/src/win32/patches/nsis.patch
index 23486191ab..0a37cd7c22 100644
--- a/bacula/src/win32/patches/nsis.patch
+++ b/bacula/src/win32/patches/nsis.patch
@@ -1,7 +1,7 @@
-Index: SCons/Config/gnu
---- ../release/nsis-2.17-src/SCons/Config/gnu	2006-04-28 08:54:41.000000000 -0700
-+++ SCons/Config/gnu	2006-08-07 18:49:47.000000000 -0700
-@@ -65,7 +65,7 @@
+Index: SCons/Config/gnu
+--- ../release/nsis-2.17-src/SCons/Config/gnu	2006-04-28 08:54:41.000000000 -0700
++++ SCons/Config/gnu	2006-08-07 18:49:47.000000000 -0700
+@@ -65,7 +65,7 @@
  cross_env(stub_env)
  
  if not defenv['DEBUG']:
@@ -10,7 +10,7 @@ Index: SCons/Config/gnu
  stub_env.Append(CCFLAGS = '-Wall')                # all warnings
  stub_env.Append(CCFLAGS = '-x c')                 # force compile as c
  
-@@ -82,8 +82,8 @@
+@@ -82,8 +82,8 @@
  makensis_env = defenv.Copy()
  
  if not defenv['DEBUG']:
@@ -20,7 +20,7 @@ Index: SCons/Config/gnu
  
  conf = FlagsConfigure(makensis_env)
  conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@
  cross_env(plugin_env)
  
  if not defenv['DEBUG']:
@@ -29,7 +29,7 @@ Index: SCons/Config/gnu
  plugin_env.Append(CCFLAGS = '-Wall')              # level 3 warnings
  
  if not defenv['DEBUG']:
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@
  cp_util_env = defenv.Copy()
  
  if not defenv['DEBUG']:
@@ -38,10 +38,10 @@ Index: SCons/Config/gnu
  cp_util_env.Append(CCFLAGS = '-Wall')             # all warnings
  
  conf = FlagsConfigure(cp_util_env)
-Index: Source/build.cpp
---- ../release/nsis-2.17-src/Source/build.cpp	2006-04-14 03:05:01.000000000 -0700
-+++ ./Source/build.cpp	2006-07-31 13:26:38.000000000 -0700
-@@ -2384,7 +2384,7 @@
+Index: Source/build.cpp
+--- ../release/nsis-2.17-src/Source/build.cpp	2006-04-14 03:05:01.000000000 -0700
++++ ./Source/build.cpp	2006-07-31 13:26:38.000000000 -0700
+@@ -2384,7 +2384,7 @@
          return PS_ERROR;
        }
  #ifdef NSIS_CONFIG_CRC_SUPPORT
@@ -50,10 +50,10 @@ Index: Source/build.cpp
        firstheader_writer w(&crc_sink);
        w.write(&fh);
  
-Index: Source/build.h
---- ../release/nsis-2.17-src/Source/build.h	2005-04-02 04:04:06.000000000 -0800
-+++ ./Source/build.h	2006-07-31 13:28:44.000000000 -0700
-@@ -38,7 +38,7 @@
+Index: Source/build.h
+--- ../release/nsis-2.17-src/Source/build.h	2005-04-02 04:04:06.000000000 -0800
++++ ./Source/build.h	2006-07-31 13:28:44.000000000 -0700
+@@ -38,7 +38,7 @@
  #ifdef NSIS_CONFIG_CRC_SUPPORT
  extern "C"
  {
@@ -62,10 +62,10 @@ Index: Source/build.h
  };
  #endif
  
-Index: Source/crc32.c
---- ../release/nsis-2.17-src/Source/crc32.c	2004-03-12 12:43:54.000000000 -0800
-+++ ./Source/crc32.c	2006-07-31 13:27:12.000000000 -0700
-@@ -3,18 +3,18 @@
+Index: Source/crc32.c
+--- ../release/nsis-2.17-src/Source/crc32.c	2004-03-12 12:43:54.000000000 -0800
++++ ./Source/crc32.c	2006-07-31 13:27:12.000000000 -0700
+@@ -3,18 +3,18 @@
  #ifdef NSIS_CONFIG_CRC_SUPPORT
  
  // this is based on the (slow,small) CRC32 implementation from zlib.
@@ -88,10 +88,10 @@ Index: Source/crc32.c
          for (k = 0; k < 8; k++) c = (c >> 1) ^ (c & 1 ? 0xedb88320L : 0);
          crc_table[n] = c;
        }
-Index: Source/DialogTemplate.cpp
---- ../release/nsis-2.17-src/Source/DialogTemplate.cpp	2006-03-24 10:36:24.000000000 -0800
-+++ ./Source/DialogTemplate.cpp	2006-07-31 05:48:44.000000000 -0700
-@@ -93,7 +93,7 @@
+Index: Source/DialogTemplate.cpp
+--- ../release/nsis-2.17-src/Source/DialogTemplate.cpp	2006-03-24 10:36:24.000000000 -0800
++++ ./Source/DialogTemplate.cpp	2006-07-31 05:48:44.000000000 -0700
+@@ -93,7 +93,7 @@
      if (IS_INTRESOURCE(x)) { \
        *(WORD*)seeker = 0xFFFF; \
        seeker += sizeof(WORD); \
@@ -100,7 +100,7 @@ Index: Source/DialogTemplate.cpp
        seeker += sizeof(WORD); \
      } \
      else { \
-@@ -629,7 +629,7 @@
+@@ -629,7 +629,7 @@
      }
    }
  
@@ -109,10 +109,10 @@ Index: Source/DialogTemplate.cpp
  
    // DONE!
    return pbDlg;
-Index: Source/exehead/fileform.c
---- ../release/nsis-2.17-src/Source/exehead/fileform.c	2005-09-09 09:08:44.000000000 -0700
-+++ ./Source/exehead/fileform.c	2006-07-31 13:26:08.000000000 -0700
-@@ -95,7 +95,7 @@
+Index: Source/exehead/fileform.c
+--- ../release/nsis-2.17-src/Source/exehead/fileform.c	2005-09-09 09:08:44.000000000 -0700
++++ ./Source/exehead/fileform.c	2006-07-31 13:26:08.000000000 -0700
+@@ -95,7 +95,7 @@
  static z_stream g_inflate_stream;
  #endif
  
@@ -121,10 +121,10 @@ Index: Source/exehead/fileform.c
  
  const char * NSISCALL loadHeaders(int cl_flags)
  {
-Index: Source/Platform.h
---- ../release/nsis-2.17-src/Source/Platform.h	2006-05-03 08:43:54.000000000 -0700
-+++ ./Source/Platform.h	2006-07-31 05:48:44.000000000 -0700
-@@ -16,15 +16,15 @@
+Index: Source/Platform.h
+--- ../release/nsis-2.17-src/Source/Platform.h	2006-05-03 08:43:54.000000000 -0700
++++ ./Source/Platform.h	2006-07-31 05:48:44.000000000 -0700
+@@ -16,15 +16,15 @@
  // basic types
  typedef unsigned char BYTE, *PBYTE, *LPBYTE;
  typedef unsigned short WORD, *LPWORD;
@@ -143,7 +143,7 @@ Index: Source/Platform.h
  typedef long long INT64, LARGE_INTEGER;
  typedef unsigned long long UINT64, ULARGE_INTEGER;
  typedef int BOOL, *LPBOOL;
-@@ -35,13 +35,14 @@
+@@ -35,13 +35,14 @@
  typedef const char *LPCCH, *PCSTR, *LPCSTR;
  typedef unsigned short WCHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR;
  typedef const unsigned short *LPCWCH, *PCWCH, *LPCWSTR, *PCWSTR;
@@ -162,7 +162,7 @@ Index: Source/Platform.h
  // bool
  #  define FALSE 0
  #  define TRUE 1
-@@ -129,13 +130,13 @@
+@@ -129,13 +130,13 @@
  
  #ifndef _WIN32
  #  ifndef FIELD_OFFSET
@@ -178,7 +178,7 @@ Index: Source/Platform.h
                                       FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
                                       FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
  #  endif
-@@ -166,9 +167,9 @@
+@@ -166,9 +167,9 @@
  #  define FOF_NOERRORUI 0x0400
  #endif
  
@@ -191,10 +191,10 @@ Index: Source/Platform.h
  
  #ifndef IDC_HAND
  #  define IDC_HAND MAKEINTRESOURCE(32649)
-Index: Source/Plugins.cpp
---- ../release/nsis-2.17-src/Source/Plugins.cpp	2006-04-05 11:42:12.000000000 -0700
-+++ ./Source/Plugins.cpp	2006-07-31 06:50:08.000000000 -0700
-@@ -120,8 +120,8 @@
+Index: Source/Plugins.cpp
+--- ../release/nsis-2.17-src/Source/Plugins.cpp	2006-04-05 11:42:12.000000000 -0700
++++ ./Source/Plugins.cpp	2006-07-31 06:50:08.000000000 -0700
+@@ -120,8 +120,8 @@
          DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);
          PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);
          DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);
@@ -205,10 +205,10 @@ Index: Source/Plugins.cpp
          {
            const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
            const string signature = dllName + "::" + name;
-Index: Source/ResourceEditor.cpp
---- ../release/nsis-2.17-src/Source/ResourceEditor.cpp	2006-04-05 11:40:09.000000000 -0700
-+++ ./Source/ResourceEditor.cpp	2006-07-31 05:48:44.000000000 -0700
-@@ -545,7 +545,7 @@
+Index: Source/ResourceEditor.cpp
+--- ../release/nsis-2.17-src/Source/ResourceEditor.cpp	2006-04-05 11:40:09.000000000 -0700
++++ ./Source/ResourceEditor.cpp	2006-07-31 05:48:44.000000000 -0700
+@@ -545,7 +545,7 @@
      rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
  
      CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
@@ -217,7 +217,7 @@ Index: Source/ResourceEditor.cpp
      seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
  
      for (int i = 0; i < crd->CountEntries(); i++) {
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@
        rDirE.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
  
        CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
@@ -226,7 +226,7 @@ Index: Source/ResourceEditor.cpp
        seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
      }
      qDirs.pop();
-@@ -582,7 +582,7 @@
+@@ -582,7 +582,7 @@
      rDataE.Size = ConvertEndianness(cRDataE->GetSize());
  
      CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
@@ -235,7 +235,7 @@ Index: Source/ResourceEditor.cpp
      seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
  
      qDataEntries.pop();
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@
    while (!qStrings.empty()) {
      CResourceDirectoryEntry* cRDirE = qStrings.front();
  
@@ -244,7 +244,7 @@ Index: Source/ResourceEditor.cpp
  
      char* szName = cRDirE->GetName();
      WORD iLen = strlen(szName) + 1;
-@@ -626,7 +626,7 @@
+@@ -626,7 +626,7 @@
    while (!qDataEntries2.empty()) {
      CResourceDataEntry* cRDataE = qDataEntries2.front();
      CopyMemory(seeker, cRDataE->GetData(), cRDataE->GetSize());
@@ -253,7 +253,7 @@ Index: Source/ResourceEditor.cpp
  
      seeker += RALIGN(cRDataE->GetSize(), 8);
  
-@@ -636,7 +636,7 @@
+@@ -636,7 +636,7 @@
    /*
     * Set all of the directory entries offsets.
     */
@@ -262,7 +262,7 @@ Index: Source/ResourceEditor.cpp
  }
  
  // Sets the offsets in directory entries
-@@ -650,7 +650,7 @@
+@@ -650,7 +650,7 @@
        SetOffsets(resDir->GetEntry(i)->GetSubDirectory(), newResDirAt);
      }
      else {
@@ -271,7 +271,7 @@ Index: Source/ResourceEditor.cpp
      }
    }
  }
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@
  // Returns -1 if can not be found
  int CResourceDirectory::Find(char* szName) {
    if (IS_INTRESOURCE(szName))
@@ -280,7 +280,7 @@ Index: Source/ResourceEditor.cpp
    else
      if (szName[0] == '#')
        return Find(WORD(atoi(szName + 1)));
-@@ -836,7 +836,7 @@
+@@ -836,7 +836,7 @@
    if (IS_INTRESOURCE(szName)) {
      m_bHasName = false;
      m_szName = 0;
@@ -289,7 +289,7 @@ Index: Source/ResourceEditor.cpp
    }
    else {
      m_bHasName = true;
-@@ -851,7 +851,7 @@
+@@ -851,7 +851,7 @@
    if (IS_INTRESOURCE(szName)) {
      m_bHasName = false;
      m_szName = 0;
@@ -298,10 +298,10 @@ Index: Source/ResourceEditor.cpp
    }
    else {
      m_bHasName = true;
-Index: Source/ResourceEditor.h
---- ../release/nsis-2.17-src/Source/ResourceEditor.h	2006-04-28 08:54:42.000000000 -0700
-+++ ./Source/ResourceEditor.h	2006-07-31 05:48:44.000000000 -0700
-@@ -173,7 +173,7 @@
+Index: Source/ResourceEditor.h
+--- ../release/nsis-2.17-src/Source/ResourceEditor.h	2006-04-28 08:54:42.000000000 -0700
++++ ./Source/ResourceEditor.h	2006-07-31 05:48:44.000000000 -0700
+@@ -173,7 +173,7 @@
  
    void Destroy();
  
@@ -310,7 +310,7 @@ Index: Source/ResourceEditor.h
  
  private:
    IMAGE_RESOURCE_DIRECTORY m_rdDir;
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@
  
    CResourceDataEntry* GetDataEntry();
  
@@ -319,7 +319,7 @@ Index: Source/ResourceEditor.h
  
  private:
    bool m_bHasName;
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@
    DWORD GetSize();
    DWORD GetCodePage();
  
@@ -328,10 +328,10 @@ Index: Source/ResourceEditor.h
  
  private:
    BYTE* m_pbData;
-Index: Source/script.cpp
---- ../release/nsis-2.17-src/Source/script.cpp	2006-03-28 10:22:34.000000000 -0800
-+++ ./Source/script.cpp	2006-07-31 20:56:03.000000000 -0700
-@@ -4748,8 +4748,8 @@
+Index: Source/script.cpp
+--- ../release/nsis-2.17-src/Source/script.cpp	2006-03-28 10:22:34.000000000 -0800
++++ ./Source/script.cpp	2006-07-31 20:56:03.000000000 -0700
+@@ -4748,8 +4748,8 @@
            {
              struct
              {
@@ -342,7 +342,7 @@ Index: Source/script.cpp
              } words;
              long long ll;
            };
-@@ -6075,8 +6075,8 @@
+@@ -6075,8 +6075,8 @@
          {
            struct
            {
@@ -353,10 +353,10 @@ Index: Source/script.cpp
            } words;
            long long ll;
          };
-Index: Source/util.cpp
---- ../release/nsis-2.17-src/Source/util.cpp	2006-04-28 08:54:42.000000000 -0700
-+++ ./Source/util.cpp	2006-07-31 05:48:44.000000000 -0700
-@@ -312,7 +312,7 @@
+Index: Source/util.cpp
+--- ../release/nsis-2.17-src/Source/util.cpp	2006-04-28 08:54:42.000000000 -0700
++++ ./Source/util.cpp	2006-07-31 05:48:44.000000000 -0700
+@@ -312,7 +312,7 @@
    FIX_ENDIAN_INT32_INPLACE(rdEntry.OffsetToData);
    MY_ASSERT(!rdEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");
  
@@ -365,7 +365,7 @@ Index: Source/util.cpp
  
    MY_ASSERT((size_t)rdIcons - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");
  
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@
      FIX_ENDIAN_INT32_INPLACE(icoEntry.OffsetToData);
  
      MY_ASSERT(!icoEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");
@@ -374,7 +374,7 @@ Index: Source/util.cpp
      
      MY_ASSERT((size_t)rd - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");
  
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@
  
      MY_ASSERT(datEntry.DirectoryOffset.DataIsDirectory, "bad resource directory");
      
@@ -383,7 +383,7 @@ Index: Source/util.cpp
  
      MY_ASSERT((size_t)rde - (size_t)exeHeader > exeHeaderSize, "corrupted EXE - invalid pointer");
  
-@@ -355,10 +355,10 @@
+@@ -355,10 +355,10 @@
      }
  
      // Set offset
@@ -396,10 +396,10 @@ Index: Source/util.cpp
    }
  
    LPBYTE seeker = uninstIconData;
-Index: Source/writer.cpp
---- ../release/nsis-2.17-src/Source/writer.cpp	2006-03-11 03:13:07.000000000 -0800
-+++ ./Source/writer.cpp	2006-07-31 13:27:37.000000000 -0700
-@@ -64,7 +64,7 @@
+Index: Source/writer.cpp
+--- ../release/nsis-2.17-src/Source/writer.cpp	2006-03-11 03:13:07.000000000 -0800
++++ ./Source/writer.cpp	2006-07-31 13:27:37.000000000 -0700
+@@ -64,7 +64,7 @@
  }
  
  #ifdef NSIS_CONFIG_CRC_SUPPORT
@@ -408,10 +408,10 @@ Index: Source/writer.cpp
  
  void crc_writer_sink::write_data(const void *data, const size_t size)
  {
-Index: Source/writer.h
---- ../release/nsis-2.17-src/Source/writer.h	2006-03-11 03:13:07.000000000 -0800
-+++ ./Source/writer.h	2006-07-31 13:27:58.000000000 -0700
-@@ -57,12 +57,12 @@
+Index: Source/writer.h
+--- ../release/nsis-2.17-src/Source/writer.h	2006-03-11 03:13:07.000000000 -0800
++++ ./Source/writer.h	2006-07-31 13:27:58.000000000 -0700
+@@ -57,12 +57,12 @@
  #ifdef NSIS_CONFIG_CRC_SUPPORT
  class crc_writer_sink : public writer_sink {
  public:
-- 
2.39.5