aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2023-03-27 10:28:53 +0000
committerWerner Koch <[email protected]>2023-03-27 10:28:53 +0000
commit3ec685d32ff508f2603827ebc5cf2fdeb8111d6f (patch)
tree3267bcaa623064e6b139baa7f8c970d4036220e4
parentgpg,gpgsm: Extend the use of allow-ecc-encr and vsd-allow-ocb (diff)
downloadgnupg-3ec685d32ff508f2603827ebc5cf2fdeb8111d6f.tar.gz
gnupg-3ec685d32ff508f2603827ebc5cf2fdeb8111d6f.zip
doc: Remove the obsolete VS-NfD.prf
-- The apply-profile thing is not anymore used.
-rw-r--r--build-aux/speedo/w32/inst.nsi2
-rw-r--r--build-aux/speedo/w32/wixlib.wxs3
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/examples/VS-NfD.prf24
4 files changed, 1 insertions, 30 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index bc41fac67..77090af52 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -659,7 +659,6 @@ Section "GnuPG" SEC_gnupg
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"
@@ -1324,7 +1323,6 @@ Section "-un.gnupg"
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"
diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs
index d3ffc08b7..5d84336d6 100644
--- a/build-aux/speedo/w32/wixlib.wxs
+++ b/build-aux/speedo/w32/wixlib.wxs
@@ -157,9 +157,6 @@ and then manually edited:
<Component Id="cmpB5509E83C14EE3080355A3EAF09D1C8D" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="FEC81836-944E-4613-A498-E620B981EB04">
<File Id="fil0615847C26E386E0B892124531F2ABBC" KeyPath="yes" Source="$(var.SourceDir)\lib\libnpth.dll.a" Name="libnpth.imp"/>
</Component>
- <Component Id="cmp909B0412FDFCFD5092D93932AF982A72" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F610">
- <File Id="fil322067E40CE41C36574A7CC520D75876" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\VS-NfD.prf" Name="VS-NfD.prf"/>
- </Component>
<Component Id="cmp909B0412FDFCFD5092D93932AF982A73" Directory="dirC2E6BF1CC65903EA3A1AD83349586122" Guid="D30E7138-0D1C-48F4-8F53-E1EC6333F611">
<File Id="fil322067E40CE41C36574A7CC520D75877" KeyPath="yes" Source="$(var.SourceDir)\share\doc\gnupg\examples\Automatic.prf" Name="Automatic.prf"/>
</Component>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 06efa486c..2e2b185e9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
examples = examples/README examples/scd-event examples/trustlist.txt \
- examples/VS-NfD.prf examples/Automatic.prf \
+ examples/Automatic.prf \
examples/debug.prf \
examples/gpgconf.rnames examples/gpgconf.conf \
examples/systemd-user/README \
diff --git a/doc/examples/VS-NfD.prf b/doc/examples/VS-NfD.prf
deleted file mode 100644
index edb9e018e..000000000
--- a/doc/examples/VS-NfD.prf
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-# the gpgconf manpage for a description of this file's syntax.
-
-[gpg]
-compliance de-vs
-
-[gpgsm]
-compliance de-vs
-enable-crl-checks
-
-[gpg-agent]
-default-cache-ttl 900
-max-cache-ttl 3600
-no-allow-mark-trusted
-no-allow-external-cache
-enforce-passphrase-constraints
-min-passphrase-len 9
-min-passphrase-nonalpha 0
-
-[dirmngr]
-allow-ocsp