From 89eaeb446c24bbeacc5f69c170cf60104854432e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 23 Mar 2005 15:46:22 +0000 Subject: * changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now --- debian/apt.cron.daily | 2 +- debian/changelog | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 7ee7e46db..5145a5d2f 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -74,7 +74,7 @@ check_size_constraints() { # min-age in days MaxAge=0 - MinAge=1 + MinAge=2 MaxSize=0 CacheDir="var/cache/apt" CacheArchive="archives/" diff --git a/debian/changelog b/debian/changelog index 2b093b0dc..65423a754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -apt (0.6.35) hoary; urgency=low +apt (0.6.34ubuntu1) hoary; urgency=low - * Merge apt--mvo--0: - - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache - from growing too large (Ubuntu #6761) + * Implement MaxSize and MaxAge, MinAge in apt.cron.daily, to prevent the + cache from growing too large (Ubuntu #6761) + * "apt-key update" calls gpg with "--ignore-time-conflict (ubuntu #7536) - -- Matt Zimmerman Mon, 7 Mar 2005 20:08:33 -0800 + -- Michael Vogt Wed, 23 Mar 2005 16:45:33 +0100 apt (0.6.34) hoary; urgency=low -- cgit v1.2.3 From 284c8bbc764fed53bd0f9bc6a42a7521a0c617ce Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Apr 2005 22:59:56 +0000 Subject: * changelog updated --- apt-pkg/acquire-item.cc | 6 ++++++ configure.in | 2 +- debian/changelog | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 714edd8d8..b2f896627 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -340,6 +340,12 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, // File was already in place. It needs to be re-verified // because Release might have changed, so Move it into partial Rename(Final,DestFile); + // unlink the file and do not try to use I-M-S and Last-Modified + // if the users proxy is broken + if(_config->FindB("Acquire::BrokenProxy", false) == true) { + std::cerr << "forcing re-get of the signature file as requested" << std::endl; + unlink(DestFile.c_str()); + } } QueueURI(Desc); diff --git a/configure.in b/configure.in index 3c5d6d69d..e17a126ba 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.35") +AC_DEFINE_UNQUOTED(VERSION,"0.6.35ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 1820b2cbf..9f8ea192b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.6.35ubuntu1) hoary; urgency=low + + * apt-pkg/acquire-item.cc: + added "Acquire::BrokenProxy" that will force apt to always + re-get the Release.gpg file (for broken proxies) + * debian/apt.cron.daily: + MinAge is defaulting to 2 days now to prevent over-aggresive removal + + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 + apt (0.6.35) hoary; urgency=low * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1): -- cgit v1.2.3 From 9f4050313c75c9897b7988a62a8288f5dcea4270 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Apr 2005 23:05:00 +0000 Subject: * whitespace change to add incomplete log for last patch * apt-pkg/acquire-item.cc: added "Acquire::BrokenProxy" that will force apt to always re-get the Release.gpg file (for broken proxies) * debian/apt.cron.daily: MinAge is defaulting to 2 days now to prevent over-aggresive removal --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9f8ea192b..0c46871e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ apt (0.6.35ubuntu1) hoary; urgency=low re-get the Release.gpg file (for broken proxies) * debian/apt.cron.daily: MinAge is defaulting to 2 days now to prevent over-aggresive removal - + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 apt (0.6.35) hoary; urgency=low -- cgit v1.2.3 From 279048500953d786320065d0140b74a08d3a6368 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Apr 2005 11:47:32 +0000 Subject: * honor "Acquire::gpgv::Options" in apt-cdrom too --- apt-pkg/indexcopy.cc | 30 +++++++++++++++++++++++++++--- debian/changelog | 2 ++ po/apt-all.pot | 14 +++++++------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 4b6ac5ce0..77426386d 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -593,17 +593,41 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, // verify the gpg signature of "Release" // gpg --verify "*I+Release.gpg", "*I+Release" + const char *Args[400]; + unsigned int i = 0; + string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); + Args[i++] = gpgvpath.c_str(); + Args[i++] = "--keyring"; + Args[i++] = pubringpath.c_str(); + Configuration::Item const *Opts; + Opts = _config->Tree("Acquire::gpgv::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args[i++] = Opts->Value.c_str(); + if(i >= 390) { + _error->Error("Argument list from Acquire::gpgv::Options too long. Exiting."); + return false; + } + } + } + Args[i++] = string(*I+"Release.gpg").c_str(); + Args[i++] = string(*I+"Release").c_str(); + Args[i++] = NULL; + pid_t pid = ExecFork(); if(pid < 0) { _error->Error("Fork failed"); return false; } if(pid == 0) { - execlp(gpgvpath.c_str(), gpgvpath.c_str(), "--keyring", - pubringpath.c_str(), string(*I+"Release.gpg").c_str(), - string(*I+"Release").c_str(), NULL); + execvp(gpgvpath.c_str(), (char**)Args); } if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", diff --git a/debian/changelog b/debian/changelog index 0c46871e3..a30b64f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.6.35ubuntu1) hoary; urgency=low re-get the Release.gpg file (for broken proxies) * debian/apt.cron.daily: MinAge is defaulting to 2 days now to prevent over-aggresive removal + * apt-pkg/cdrom.cc: + - honor "Acquire::gpgv::Options" when verfiying the signature -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 diff --git a/po/apt-all.pot b/po/apt-all.pot index bc687c55f..b9232cac4 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-03-06 12:50+0100\n" +"POT-Creation-Date: 2005-04-06 13:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -303,7 +303,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" #: ftparchive/apt-ftparchive.cc:757 @@ -2251,31 +2251,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 6ead9d25018d517cd6cfe27399b7fd7e33c1ef19 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 6 Apr 2003 16:04:51 +0000 Subject: * corrected a incorrect use of string().c_str() (thanks to mdz!) --- apt-pkg/indexcopy.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 77426386d..1f65062f7 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -598,6 +598,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); + string releasegpg = *I+"Release.gpg"; + string release = *I+"Release"; + Args[i++] = gpgvpath.c_str(); Args[i++] = "--keyring"; Args[i++] = pubringpath.c_str(); @@ -617,8 +620,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, } } } - Args[i++] = string(*I+"Release.gpg").c_str(); - Args[i++] = string(*I+"Release").c_str(); + + Args[i++] = releasegpg.c_str(); + Args[i++] = release.c_str(); Args[i++] = NULL; pid_t pid = ExecFork(); -- cgit v1.2.3