diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 11 | ||||
| -rw-r--r-- | doc/examples/configure-index | 8 | ||||
| -rw-r--r-- | methods/gpgv.cc | 4 | ||||
| -rw-r--r-- | po/apt-all.pot | 2 |
6 files changed, 29 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 6b57dec27..8c2fcbae6 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.31") +AC_DEFINE_UNQUOTED(VERSION,"0.6.32") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c384c399d..372086178 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.32) hoary; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (patch-1) + - Implement Acquire::gpgv::options (Ubuntu bug#6283) + + -- Matt Zimmerman <mdz@ubuntu.com> Tue, 8 Feb 2005 19:31:15 -0800 + apt (0.6.31) hoary; urgency=low * Matt Zimmerman 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..c834c49d5 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"; @@ -171,6 +176,7 @@ 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" @@ -229,8 +235,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 diff --git a/methods/gpgv.cc b/methods/gpgv.cc index f7d16ef01..24e945b2c 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -46,7 +46,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, int status; struct stat buff; string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); + string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); if (_config->FindB("Debug::Acquire::gpgv", false)) { std::cerr << "gpgv path: " << gpgvpath << std::endl; @@ -101,7 +101,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { std::cerr << "Preparing to exec: " << gpgvpath; for(unsigned int j=0;Args[j] != NULL; j++) - std::cerr << Args[j] << " "; + std::cerr << " " << Args[j]; std::cerr << std::endl; } int nullfd = open("/dev/null", O_RDONLY); diff --git a/po/apt-all.pot b/po/apt-all.pot index d40d44701..4fbd34e4e 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-08 16:58+0100\n" +"POT-Creation-Date: 2005-02-09 12:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |