cherry pick -r1847 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ddd3300f91b50b12dc0532c20c86b41b0a0be439..665dd427ef68af3075ed58b899abcd2d1d851dee 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1241,8 +1241,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash,    /
          // if we expect a ClearTextSignature (InRelase), ensure that
          // this is what we get and if not fail to queue a 
          // Release/Release.gpg, see #346386
-         if (SigFile == DestFile && 
-             !IsPgpClearTextSignature(DestFile))
+         if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile))
          {
             Failed(Message, Cfg);
             return;

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d63195c7d61cf68aa94e7cc77c29b5397e118e85..960616f33a29d837d070a6bc842bad5673162175 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -852,10 +852,10 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
 }
                                                                        /*}}}*/
 
-// IsPgpClearTextSignature - Check if a file is Pgp/GPG clearsigned     /*{{{*/
+// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool IsPgpClearTextSignature(string const &FileName)
+bool StartsWithGPGClearTextSignature(string const &FileName)
 {
    static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n";
    char buffer[strlen(SIGMSG)+1];

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 1e16540f7e1838f129ab245b2cb45c04af0a8b35..510b1c984c2921519d108bb64592063f2ea1bd2b 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -181,7 +181,7 @@ pid_t ExecFork();
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // check if the given file starts with a PGP cleartext signature
-bool IsPgpClearTextSignature(std::string const &FileName);
+bool StartsWithGPGClearTextSignature(std::string const &FileName);
 
 // File string manipulators
 std::string flNotDir(std::string File);

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index db3d10ecd64dcfc78a4ee6a493a104f55fc63642..ddf1909b7b10d33b87345a8e6893c7a560570d56 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -652,7 +652,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
       if (gpg == NULL)
         return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
       fclose(gpg);
-      if (!IsPgpClearTextSignature(File))
+      if (!StartsWithGPGClearTextSignature(File))
         return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
    }