* changelog updated

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 714edd8d8caff9920f9e10ffbfbb1de1ee0c1575..b2f896627f23e44433c4214c1ab562e4b32efa68 100644 (file)
--- 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);
       // 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);
    }
 
    QueueURI(Desc);

diff --git a/configure.in b/configure.in
index 3c5d6d69dc04115581868dd4d8dee1a0776f433b..e17a126ba7b595152fafe0787cb07f22ea3e7adc 100644 (file)
--- 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_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)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 1820b2cbfc80adad5af38b8139b54f026be14d9d..9f8ea192b033465442733769e0f8ad95ccfbae02 100644 (file)
--- 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 <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
+

 apt (0.6.35) hoary; urgency=low
 
   * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
 apt (0.6.35) hoary; urgency=low
 
   * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):