From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 3 Feb 2021 17:03:23 +0000 (+0100)
Subject: win32: Backport signing procedures to 11.0
X-Git-Tag: Release-11.3.2~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02103bed5ebfac91955f7e8b44e0686437a60ae4;p=thirdparty%2Fbacula.git

win32: Backport signing procedures to 11.0
---

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index c7e605ff8..93c9a44da 100644
--- 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 6ab0cd180..649c3ce3a 100644
--- 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 dedcf66da..892fd51a8 100755
--- 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 34ca1edf5..b99e82eb8 100755
--- 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 bf0a7dc39..c99339187 100644
--- 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 df6e61ccd..4938ecd0c 100644
--- 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