summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt.conf.5.xml11
-rw-r--r--doc/examples/configure-index15
2 files changed, 24 insertions, 2 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index b5d223372..69e212243 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -251,6 +251,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
the cdrom block. It is important to have the trailing slash. Unmount
commands can be specified using UMount.</para></listitem>
</varlistentry>
+
+ <varlistentry><term>gpgv</term>
+ <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
+ <literal>gpgv::Options</literal> Additional options passed to gpgv.
+ </para></listitem>
+ </varlistentry>
+
</variablelist>
</para>
</refsect1>
@@ -373,7 +380,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<literal>Debug::NoLocking</literal> disables file locking so APT can do some
operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the
command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will
- disable the inclusion of statfs data in CDROM IDs.</para>
+ disable the inclusion of statfs data in CDROM IDs.
+ <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+ </para>
</refsect1>
<refsect1><title>Examples</title>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 7cb29f082..a09ea0c37 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
NoAct "false";
};
+ GPGV
+ {
+ TrustedKeyring "/etc/apt/trusted.gpg";
+ };
+
// Some general options
Ignore-Hold "false";
Clean-Installed "true";
@@ -137,6 +142,11 @@ Acquire
UMount "sleep 500";
}
};
+
+ gpgv
+ {
+ Options {"--ignore-time-conflict";} // not very usefull on a normal system
+ };
};
// Directory layout
@@ -171,9 +181,10 @@ Dir "/"
Bin {
methods "/usr/lib/apt/methods/";
gzip "/bin/gzip";
+ gpg "/usr/bin/gpgv";
dpkg "/usr/bin/dpkg";
dpkg-source "/usr/bin/dpkg-source";
- dpkg-buildpackage "/usr/bin/dpkg-buildpackage"
+ dpkg-buildpackage "/usr/bin/dpkg-buildpackage";
apt-get "/usr/bin/apt-get";
apt-cache "/usr/bin/apt-cache";
};
@@ -229,8 +240,10 @@ Debug
NoLocking "false";
Acquire::Ftp "false"; // Show ftp command traffic
Acquire::Http "false"; // Show http command traffic
+ Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+
}
/* Whatever you do, do not use this configuration file!! Take out ONLY