From a4fa4b5d4ba38e51436914505af1a8f3483ed945 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 4 Nov 2020 16:11:10 +0100 Subject: [PATCH] speedo,w32: Install gpg-check-pattern and example profiles. * doc/examples/vsnfd.prf: Rename to VS-NfD.prf. * doc/examples/Automatic.prf: New. * doc/Makefile.am (examples): Adjust. * build-aux/speedo/w32/inst.nsi: Install gpg-check-pattern.exe and 3 example files. * build-aux/speedo/w32/wixlib.wxs: Add new files. -- Note that we renamed the existing example profile so that kleopatra shows a nicer name. In fact the gpg4win installer just copies of theses file but it is better to maintain them here. gpg-check-pattern.exe can no be installed because we meanwhile have a regex lib which works also on Windows. Signed-off-by: Werner Koch --- build-aux/speedo/w32/inst.nsi | 12 ++++++++++++ build-aux/speedo/w32/wixlib.wxs | 11 ++++++++++- doc/Makefile.am | 3 ++- doc/examples/Automatic.prf | 15 +++++++++++++++ doc/examples/{vsnfd.prf => VS-NfD.prf} | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 doc/examples/Automatic.prf rename doc/examples/{vsnfd.prf => VS-NfD.prf} (86%) diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index fb452d513..9eb4fb4ed 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -627,6 +627,7 @@ Section "GnuPG" SEC_gnupg File "bin/gpgtar.exe" File "libexec/dirmngr_ldap.exe" File "libexec/gpg-preset-passphrase.exe" + File "libexec/gpg-check-pattern.exe" File "libexec/gpg-wks-client.exe" ClearErrors @@ -657,6 +658,11 @@ Section "GnuPG" SEC_gnupg File "share/gnupg/distsigkey.gpg" File "share/gnupg/sks-keyservers.netCA.pem" + SetOutPath "$INSTDIR\share\doc\gnupg\examples" + File "share/doc/gnupg/examples/VS-NfD.prf" + File "share/doc/gnupg/examples/Automatic.prf" + File "share/doc/gnupg/examples/pwpattern.list" + SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES" File share/locale/ca/LC_MESSAGES/gnupg2.mo SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES" @@ -1315,8 +1321,14 @@ Section "-un.gnupg" Delete "$INSTDIR\bin\gpgtar.exe" Delete "$INSTDIR\bin\dirmngr_ldap.exe" Delete "$INSTDIR\bin\gpg-preset-passphrase.exe" + Delete "$INSTDIR\bin\gpg-check-pattern.exe" Delete "$INSTDIR\bin\gpg-wks-client.exe" + Delete "$INSTDIR\share\doc\gnupg\examples\VS-NfD.prf" + Delete "$INSTDIR\share\doc\gnupg\examples\Automatic.prf" + Delete "$INSTDIR\share\doc\gnupg\examples\pwpattern.list" + RMDir "$INSTDIR\share\doc\gnupg\examples" + Delete "$INSTDIR\share\gnupg\sks-keyservers.netCA.pem" Delete "$INSTDIR\share\gnupg\dirmngr-conf.skel" Delete "$INSTDIR\share\gnupg\distsigkey.gpg" diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs index 733ae552c..d3ffc08b7 100644 --- a/build-aux/speedo/w32/wixlib.wxs +++ b/build-aux/speedo/w32/wixlib.wxs @@ -64,6 +64,9 @@ and then manually edited: + + + @@ -155,7 +158,13 @@ and then manually edited: - + + + + + + + diff --git a/doc/Makefile.am b/doc/Makefile.am index 3a2c1c2eb..2b882c3e8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,7 +22,8 @@ AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am examples = examples/README examples/scd-event examples/trustlist.txt \ - examples/vsnfd.prf examples/debug.prf \ + examples/VS-NfD.prf examples/Automatic.prf \ + examples/debug.prf \ examples/systemd-user/README \ examples/systemd-user/dirmngr.service \ examples/systemd-user/dirmngr.socket \ diff --git a/doc/examples/Automatic.prf b/doc/examples/Automatic.prf new file mode 100644 index 000000000..41f9bea0c --- /dev/null +++ b/doc/examples/Automatic.prf @@ -0,0 +1,15 @@ +# Automatic.prf - Configure options for a more automatic mode -*- conf -*- +# +# The options for each tool are configured in a section ("[TOOL]"); +# see the respective man page for a description of these options and +# the gpgconf manpage for a description of this file's syntax. + +[gpg] +auto-key-locate local,wkd,dane +auto-key-retrieve +trust-model tofu+pgp$\r$\n' + +[gpg-agent] +default-cache-ttl 900 +max-cache-ttl 3600 +min-passphrase-nonalpha 0 diff --git a/doc/examples/vsnfd.prf b/doc/examples/VS-NfD.prf similarity index 86% rename from doc/examples/vsnfd.prf rename to doc/examples/VS-NfD.prf index 7224e7566..edb9e018e 100644 --- a/doc/examples/vsnfd.prf +++ b/doc/examples/VS-NfD.prf @@ -1,4 +1,4 @@ -# vsnfd.prf - Configure options for the VS-NfD mode -*- conf -*- +# VS-NfD.prf - Configure options for the VS-NfD mode -*- conf -*- # # The options for each tool are configured in a section ("[TOOL]"); # see the respective man page for a description of these options and