Reject files known to be invalid (LP: #346386) (Closes: #627642)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 6df915d8eeea893e4ee5df6464bf83fb6e2ed822..998c42dc4a31dd5c063570a2fa0297a1147b7389 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -271,7 +271,7 @@ void pkgAcqSubIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{{
 
    string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI);
 
 
    string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI);
 

-   /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #195301) */
+   /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */

    indexRecords SubIndexParser;
    if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) {
       Status = StatError;
    indexRecords SubIndexParser;
    if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) {
       Status = StatError;


@@ -904,7 +904,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
       }
 
       /* Verify the index file for correctness (all indexes must
       }
 
       /* Verify the index file for correctness (all indexes must

-       * have a Package field) (LP: #346386) (Closes: #195301) */
+       * have a Package field) (LP: #346386) (Closes: #627642) */

       {
         FileFd fd(DestFile, FileFd::ReadOnly);
         pkgTagSection sec;
       {
         FileFd fd(DestFile, FileFd::ReadOnly);
         pkgTagSection sec;


@@ -1360,7 +1360,7 @@ void pkgAcqMetaIndex::AuthDone(string Message)                            /*{{{*/
 void pkgAcqMetaIndex::QueueIndexes(bool verify)                                /*{{{*/
 {
 #if 0
 void pkgAcqMetaIndex::QueueIndexes(bool verify)                                /*{{{*/
 {
 #if 0

-   /* Reject invalid, existing Release files (LP: #346386) (Closes: #195301)
+   /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642)

     * FIXME: Disabled; it breaks unsigned repositories without hashes */
    if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile))
    {
     * FIXME: Disabled; it breaks unsigned repositories without hashes */
    if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile))
    {


@@ -1533,7 +1533,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
         RunScripts("APT::Update::Auth-Failure");
         return;
       } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
         RunScripts("APT::Update::Auth-Failure");
         return;
       } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {

-        /* Invalid signature file, reject (LP: #346386) (Closes: #195301) */
+        /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */

         _error->Error(_("GPG error: %s: %s"),
                         Desc.Description.c_str(),
                         LookupTag(Message,"Message").c_str());
         _error->Error(_("GPG error: %s: %s"),
                         Desc.Description.c_str(),
                         LookupTag(Message,"Message").c_str());

diff --git a/debian/changelog b/debian/changelog
index b1d276d5dc8e772b799277d87b59d98625b234ab..d02091f540df72accc69b5f30e13b6405e039f81 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ apt (0.8.15) UNRELEASED; urgency=low
     - Really release action groups only once (Closes: #622744)
     - Make purge work again for config-files (LP: #244598) (Closes: #150831)
   * apt-pkg/acquire-item.cc:
     - Really release action groups only once (Closes: #622744)
     - Make purge work again for config-files (LP: #244598) (Closes: #150831)
   * apt-pkg/acquire-item.cc:

-    - Reject files known to be invalid (LP: #346386) (Closes: #195301)
+    - Reject files known to be invalid (LP: #346386) (Closes: #627642)

   * debian/apt.cron.daily:
     - Check power after wait, patch by manuel-soto (LP: #705269)
   * debian/control:
   * debian/apt.cron.daily:
     - Check power after wait, patch by manuel-soto (LP: #705269)
   * debian/control: