non-inline RunGPGV methods to restore ABI compatibility with previous versions to...

The rename in 0.9.7.9~exp2 moved the method body to the class definition
which means it became inline, which isn't ABI compatibile. The reverse of
moving inline to non-inline is safe though.

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index a262ef789af0d98bce1acc2072beb693cdd44329..0e36b3ded7cbf60d4f8d5cc3a75dfe85344863ff 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -642,6 +642,18 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
    return true;
 }
                                                                        /*}}}*/
+// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV            /*{{{*/
+bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd, int fd[2]) {
+   ExecGPGV(File, FileOut, statusfd, fd);
+   return false;
+};
+bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd) {
+   ExecGPGV(File, FileOut, statusfd);
+   return false;
+};
+                                                                       /*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,      /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)
 {

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index aa221158ec0569150d3bb6198a9e40a67046ffd3..e6a07a8878e744043f8dcc5c36ab9a11e0855556 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -100,15 +100,9 @@ class SigVerify                                                            /*{{{*/
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
    __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-                      int const &statusfd, int fd[2]) {
-      ExecGPGV(File, FileOut, statusfd, fd);
-      return false;
-   };
+                      int const &statusfd, int fd[2]);
    __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
-                             int const &statusfd = -1) {
-      ExecGPGV(File, FileOut, statusfd);
-      return false;
-   };
+                             int const &statusfd = -1);
 };
                                                                        /*}}}*/
 

diff --git a/debian/changelog b/debian/changelog
index d5ae8448b2b56b797e64556b13a34f717de541f0..6ccbd37c47122c5528bb65b1bf6b654b87925d0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.9.8.1) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/indexcopy.cc:
+    - non-inline RunGPGV methods to restore ABI compatibility with previous
+      versions to fix partial upgrades (Closes: #707771)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 May 2013 09:53:59 +0200
+
 apt (0.9.8) UNRELEASED; urgency=low
 
   [ Ludovico Cavedon ]