security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-21 10:09:57 +01:00
Code Activity

speedo: Put the keyboxd into the Windows installer

Browse Source 
* build-aux/speedo/w32/inst.nsi: Install keyboxd.
* Makefile.am (sign-release): Sign the wixlib only if generated.
* autogen.rc: Remove meanwhile obsolete option --with-regex.
This commit is contained in:
Werner Koch 2021-10-12 17:12:29 +02:00
parent bcd5feec0e
commit 10f52f9bf3
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -243,7 +243,7 @@ release:
echo "/* Build finished at $$(date -uIseconds) */" ;\ echo "/* Build finished at $$(date -uIseconds) */" ;\
echo "/*" ;\ echo "/*" ;\
echo " * Please run the final step interactively:" ;\ echo " * Please run the final step interactively:" ;\
echo " * make sign-release" ;\ echo " * make sign-release $${WITH_MSI:+WITH_MSI=1}" ;\
echo " */" ;\ echo " */" ;\
) 2>&1 | tee "$(RELEASE_NAME).buildlog" ) 2>&1 | tee "$(RELEASE_NAME).buildlog"
@ -280,8 +280,10 @@ sign-release:
gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\ gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\
echo "/* Signing the W32 installer ..." ;\ echo "/* Signing the W32 installer ..." ;\
gpg -sbu $$mysignkey $${release_w32_name}.exe ;\ gpg -sbu $$mysignkey $${release_w32_name}.exe ;\
echo "/* Signing the Wixlib ..." ;\ if [ -e $${wixlibfile} ]; then \
gpg -sbu $$mysignkey $${wixlibfile} ;\ echo "/* Signing the Wixlib ..." ;\
gpg -sbu $$mysignkey $${wixlibfile} ;\
fi; \
cat $(RELEASE_NAME).swdb >swdb.snippet;\ cat $(RELEASE_NAME).swdb >swdb.snippet;\
echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\ echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\
cat $${release_w32_name}.exe.swdb >>swdb.snippet;\ cat $${release_w32_name}.exe.swdb >>swdb.snippet;\

1
autogen.rc
View File

@ -18,7 +18,6 @@ case "$myhost" in
w32) w32)
configure_opts=" configure_opts="
--with-zlib=@SYSROOT@ --with-zlib=@SYSROOT@
--with-regex=@SYSROOT@
--disable-g13 --disable-g13
--disable-tpm2d --disable-tpm2d
" "

15
build-aux/speedo/w32/inst.nsi
View File

@ -1,5 +1,5 @@
# inst.nsi - Installer for GnuPG on Windows. -*- coding: latin-1; -*- # inst.nsi - Installer for GnuPG on Windows. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2014 g10 Code GmbH # Copyright (C) 2005, 2014, 2019-2021 g10 Code GmbH
# 2017 Intevation GmbH # 2017 Intevation GmbH
# #
# This file is part of GnuPG. # This file is part of GnuPG.
@ -43,7 +43,7 @@
!define PRETTY_PACKAGE "GNU Privacy Guard" !define PRETTY_PACKAGE "GNU Privacy Guard"
!define PRETTY_PACKAGE_SHORT "GnuPG" !define PRETTY_PACKAGE_SHORT "GnuPG"
!define COMPANY "The GnuPG Project" !define COMPANY "The GnuPG Project"
!define COPYRIGHT "Copyright (C) 2017 The GnuPG Project" !define COPYRIGHT "Copyright (C) 2021 g10 Code GmbH"
!define DESCRIPTION "GnuPG: The GNU Privacy Guard for Windows" !define DESCRIPTION "GnuPG: The GNU Privacy Guard for Windows"
!define INSTALL_DIR "GnuPG" !define INSTALL_DIR "GnuPG"
@ -600,6 +600,7 @@ Section "-gnupginst"
ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"'
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"'
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "keyboxd"'
no_gpgconf: no_gpgconf:
@ -655,6 +656,14 @@ Section "GnuPG" SEC_gnupg
File /oname=scdaemon.exe.tmp "libexec/scdaemon.exe" File /oname=scdaemon.exe.tmp "libexec/scdaemon.exe"
Rename /REBOOTOK scdaemon.exe.tmp scdaemon.exe Rename /REBOOTOK scdaemon.exe.tmp scdaemon.exe
ClearErrors
SetOverwrite try
File "libexec/keyboxd.exe"
SetOverwrite lastused
ifErrors 0 +3
File /oname=keyboxd.exe.tmp "libexec/keyboxd.exe"
Rename /REBOOTOK keyboxd.exe.tmp keyboxd.exe
SetOutPath "$INSTDIR\share\gnupg" SetOutPath "$INSTDIR\share\gnupg"
File "share/gnupg/distsigkey.gpg" File "share/gnupg/distsigkey.gpg"
File "share/gnupg/sks-keyservers.netCA.pem" File "share/gnupg/sks-keyservers.netCA.pem"
@ -1059,6 +1068,7 @@ Section "-un.gnupglast"
ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"'
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"'
nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "keyboxd"'
no_gpgconf: no_gpgconf:
SectionEnd SectionEnd
@ -1316,6 +1326,7 @@ Section "-un.gnupg"
Delete "$INSTDIR\bin\gpgsm.exe" Delete "$INSTDIR\bin\gpgsm.exe"
Delete "$INSTDIR\bin\gpg-agent.exe" Delete "$INSTDIR\bin\gpg-agent.exe"
Delete "$INSTDIR\bin\scdaemon.exe" Delete "$INSTDIR\bin\scdaemon.exe"
Delete "$INSTDIR\bin\keyboxd.exe"
Delete "$INSTDIR\bin\dirmngr.exe" Delete "$INSTDIR\bin\dirmngr.exe"
Delete "$INSTDIR\bin\gpgconf.exe" Delete "$INSTDIR\bin\gpgconf.exe"
Delete "$INSTDIR\bin\gpg-connect-agent.exe" Delete "$INSTDIR\bin\gpg-connect-agent.exe"