win32: Backport signing procedures to 11.0

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index c7e605ff853e9ae1f84d3ac6b646bcbf550cdaf7..93c9a44da114d160d82d565154523b46741ba774 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2020 Kern Sibbald
+# Copyright (C) 2000-2021 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 #  Makefile for Win32/Win64 Bacula File daemon
@@ -58,7 +58,7 @@ release32/bat.exe: is_depkgs_set
        ( cd ../qt-console; ./make-win32 "32" )
        test -f release32/bat.exe
        test -f release32/bacula-tray-monitor.exe
-       ./sign-binaries release32/bat.exe release32/bacula-tray-monitor.exe release32/RegistrationWizard.exe release32/Qt*dll release32/q*.dll
+       ./sign-binaries release32/bat.exe release32/bacula-tray-monitor.exe release32/Qt*dll release32/q*.dll
 
 bat32: release32/bat.exe
 
@@ -66,7 +66,7 @@ release64/bat.exe: is_depkgs_set
        ( cd ../qt-console; ./make-win32 "64" )
        test -f release64/bat.exe
        test -f release64/bacula-tray-monitor.exe
-       ./sign-binaries release64/bat.exe release64/bacula-tray-monitor.exe release64/RegistrationWizard.exe release64/Qt*dll release64/q*.dll
+       ./sign-binaries release64/bat.exe release64/bacula-tray-monitor.exe release64/Qt*dll release64/q*.dll
 
 bat64: release64/bat.exe
 

diff --git a/bacula/src/win32/Makefile.full b/bacula/src/win32/Makefile.full
index 6ab0cd1806163c56a86b78097c9f53cf891b7958..649c3ce3a0bd2133e08f54fac9bc52b878fcd05f 100644 (file)
--- a/bacula/src/win32/Makefile.full
+++ b/bacula/src/win32/Makefile.full
@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2020 Kern Sibbald
+# Copyright (C) 2000-2021 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 
 ECHO_CMD=@

diff --git a/bacula/src/win32/build-depkgs-mingw-w64 b/bacula/src/win32/build-depkgs-mingw-w64
index dedcf66dac8856aade13dc83cd8731e4a5c7368e..892fd51a89330b14373ca6f5c8f5f8e5be40d0ea 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw-w64
+++ b/bacula/src/win32/build-depkgs-mingw-w64
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2018 Kern Sibbald
+# Copyright (C) 2000-2021 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 #  This file may help you build the dependency packages that

diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32
index 34ca1edf51d4133d4c51757ece7646bd5046d2f9..b99e82eb8f90c6fcd8e32123d4b52f657b14cfdf 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw32
+++ b/bacula/src/win32/build-depkgs-mingw32
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2018 Kern Sibbald
+# Copyright (C) 2000-2021 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 #

diff --git a/bacula/src/win32/filed/plugins/Makefile b/bacula/src/win32/filed/plugins/Makefile
index bf0a7dc39d562694d0641e4c8317f0fb045f84d4..c99339187a204a664c76ae6654e28f16711bd7ec 100644 (file)
--- a/bacula/src/win32/filed/plugins/Makefile
+++ b/bacula/src/win32/filed/plugins/Makefile
@@ -94,6 +94,7 @@ $(BINDIR)/cdp-fd.dll: $(CDP_OBJS) $(LIBS_BACULA)
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/cdp-fd.a $^ $(LIBS_DLL) -o $@
+       $(BUILDDIR)/sign-binaries $@
 
 #$(LIBDIR)/libexchange-fd.a: DLL_DEFINE=USING_DLL
 
@@ -109,6 +110,7 @@ $(BINDIR)/exchange-fd.dll: $(EXCHANGE_OBJS) exchange-fd.def
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/exchange-fd.a $^ $(LIBS_DLL) -o $@
+       $(BUILDDIR)/sign-binaries $@
 
 $(BINDIR)/cdp-fd.dll: DLL_DEFINE=BUILDING_DLL
 
@@ -125,6 +127,7 @@ $(BINDIR)/bpipe-fd.dll: $(BPIPE_OBJS) bpipe-fd.def $(LIBS_BACULA)
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(CFLAGS) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/bpipe-fd.a $^ $(LIBS_DLL) -o $@
+       $(BUILDDIR)/sign-binaries $@
 
 $(BINDIR)/alldrives-fd.dll: DLL_DEFINE=BUILDING_DLL
 
@@ -132,6 +135,7 @@ $(BINDIR)/alldrives-fd.dll: $(OBJDIR)/alldrives-fd.o $(LIBS_BACULA)
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(CFLAGS) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/alldrives-fd.a $^ $(LIBS_DLL) -o $@
+       $(BUILDDIR)/sign-binaries $@
 
 include $(BUILDDIR)/Makefile.rules
 

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index df6e61ccd08b8f35c3faab8e3d2867f96a1ced09..4938ecd0ccce4b4b2ae2fd7a7f42f239f88eefa2 100644 (file)
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -184,5 +184,4 @@ $(INSTALL_EXE): winbacula.nsi $(addprefix release32/,$(BACULA_BINARIES) $(SCRIPT
        makensis -V3 $(DEFINES) winbacula.nsi
        ../sign-binaries ../release32/bacula-*$(VERSION).exe
 
-
 include $(BUILDDIR)/Makefile.rules