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

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