Merge misc-abi-changes

Patches applied:

 * apt@packages.debian.org/apt--misc-abi-changes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-16

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-1
   Fix apt-get -s remove to not display the candidate version

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-2
   Merge from main

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-3
   Use pid_t throughout to hold process IDs

diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index 50b36194831d6042877ccf8d0cc854d5ef9a4b41..7da5a26aaabdbb7ec5f9c7abfa604ff2e24e6910 100644 (file)
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -61,7 +61,7 @@ static bool EraseDir(const char *Dir)
       return _error->Errno("rmdir",_("Failed to remove %s"),Dir);
    
    // Purge it using rm
       return _error->Errno("rmdir",_("Failed to remove %s"),Dir);
    
    // Purge it using rm

-   int Pid = ExecFork();
+   pid_t Pid = ExecFork();

 
    // Spawn the subprocess
    if (Pid == 0)
 
    // Spawn the subprocess
    if (Pid == 0)

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 9b37385bf87ae59b3179604ca87b69ad28c06660..479927d65519372d30a413c84ee55c059d39d9da 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -50,26 +50,29 @@ pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache),
                                                                        /*}}}*/
 // Simulate::Describe - Describe a package                             /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // Simulate::Describe - Describe a package                             /*{{{*/
 // ---------------------------------------------------------------------

-/* Parameter Now == true gives both current and available varsion,
-   Parameter Now == false gives only the available package version */
-void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Now)
+/* Parameter Current == true displays the current package version,
+   Parameter Candidate == true displays the candidate package version */
+void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Current,bool Candidate)

 {
    VerIterator Ver(Sim);
  
    out << Pkg.Name();
 
 {
    VerIterator Ver(Sim);
  
    out << Pkg.Name();
 

-   if (Now == true)
+   if (Current == true)

    {
       Ver = Pkg.CurrentVer();
       if (Ver.end() == false)
          out << " [" << Ver.VerStr() << ']';
    }
 
    {
       Ver = Pkg.CurrentVer();
       if (Ver.end() == false)
          out << " [" << Ver.VerStr() << ']';
    }
 

-   Ver = Sim[Pkg].CandidateVerIter(Sim);
-   if (Ver.end() == true)
-      return;
+   if (Candidate == true)
+   {
+      Ver = Sim[Pkg].CandidateVerIter(Sim);
+      if (Ver.end() == true)
+         return;

    
    

-   out << " (" << Ver.VerStr() << ' ' << Ver.RelStr() << ')';
+      out << " (" << Ver.VerStr() << ' ' << Ver.RelStr() << ')';
+   }

 }
                                                                        /*}}}*/
 // Simulate::Install - Simulate unpacking of a package                 /*{{{*/
 }
                                                                        /*}}}*/
 // Simulate::Install - Simulate unpacking of a package                 /*{{{*/


@@ -82,7 +85,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/)
    Flags[Pkg->ID] = 1;
    
    cout << "Inst ";
    Flags[Pkg->ID] = 1;
    
    cout << "Inst ";

-   Describe(Pkg,cout,true);
+   Describe(Pkg,cout,true,true);

    Sim.MarkInstall(Pkg,false);
    
    // Look for broken conflicts+predepends.
    Sim.MarkInstall(Pkg,false);
    
    // Look for broken conflicts+predepends.


@@ -156,7 +159,7 @@ bool pkgSimulate::Configure(PkgIterator iPkg)
    else
    {
       cout << "Conf "; 
    else
    {
       cout << "Conf "; 

-      Describe(Pkg,cout,false);
+      Describe(Pkg,cout,false,true);

    }
 
    if (Sim.BrokenCount() != 0)
    }
 
    if (Sim.BrokenCount() != 0)


@@ -181,7 +184,7 @@ bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge)
       cout << "Purg ";
    else
       cout << "Remv ";
       cout << "Purg ";
    else
       cout << "Remv ";

-   Describe(Pkg,cout,false);
+   Describe(Pkg,cout,true,false);

 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();
 
    if (Sim.BrokenCount() != 0)
       ShortBreaks();

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 0b38e4244fd24d62e86e83a9cb3f81ba654245e3..174a7f58d18aea15aa0c36bf2fde93c243a3de8a 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -67,8 +67,10 @@ class pkgSimulate : public pkgPackageManager
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);

+
+private:

    void ShortBreaks();
    void ShortBreaks();

-   void Describe(PkgIterator iPkg,ostream &out,bool Now);
+   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);

    
    public:
 
    
    public:
 

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 4ba8ab05aa815f0ba303b8ebbd4d03f5b575ecdb..7c9f5c0dd5470b16520512a2e9d707778405fa5d 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -306,7 +306,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout)
 /* This is used if you want to cleanse the environment for the forked 
    child, it fixes up the important signals and nukes all of the fds,
    otherwise acts like normal fork. */
 /* This is used if you want to cleanse the environment for the forked 
    child, it fixes up the important signals and nukes all of the fds,
    otherwise acts like normal fork. */

-int ExecFork()
+pid_t ExecFork()

 {
    // Fork off the process
    pid_t Process = fork();
 {
    // Fork off the process
    pid_t Process = fork();


@@ -340,7 +340,7 @@ int ExecFork()
 /* Waits for the given sub process. If Reap is set then no errors are 
    generated. Otherwise a failed subprocess will generate a proper descriptive
    message */
 /* Waits for the given sub process. If Reap is set then no errors are 
    generated. Otherwise a failed subprocess will generate a proper descriptive
    message */

-bool ExecWait(int Pid,const char *Name,bool Reap)
+bool ExecWait(pid_t Pid,const char *Name,bool Reap)

 {
    if (Pid <= 1)
       return true;
 {
    if (Pid <= 1)
       return true;

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index b6b9cae836894facc248f47908b66288843bbfe5..041aa33096c94d18a936420fcc7d1cd277682bbe 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -87,8 +87,8 @@ string SafeGetCWD();
 void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);

-int ExecFork();
-bool ExecWait(int Pid,const char *Name,bool Reap = false);
+pid_t ExecFork();
+bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);

 
 // File string manipulators
 string flNotDir(string File);
 
 // File string manipulators
 string flNotDir(string File);

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index ec2013b0481c5b3b12f31729a9024b91a7d3fc88..e62a7efd526d94cbae8196c388f1327b6a5d0f43 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)

-MAJOR=3.6
+MAJOR=3.7

 MINOR=0
 SLIBS=$(PTHREADLIB) $(INTLLIBS)
 APT_DOMAIN:=libapt-pkg$(MAJOR)
 MINOR=0
 SLIBS=$(PTHREADLIB) $(INTLLIBS)
 APT_DOMAIN:=libapt-pkg$(MAJOR)

diff --git a/cmdline/indexcopy.cc b/cmdline/indexcopy.cc
index 3ce12a94b2f5cea08bc56f90b3670bedf0b6bbd2..0a3cd1575fd7752ec0b9a2f5010b54c9e4c1237c 100644 (file)
--- a/cmdline/indexcopy.cc
+++ b/cmdline/indexcopy.cc
@@ -83,7 +83,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
         fclose(tmp);
         
         // Fork gzip
         fclose(tmp);
         
         // Fork gzip

-        int Process = fork();
+        pid_t Process = fork();

         if (Process < 0)
            return _error->Errno("fork","Couldn't fork gzip");
         
         if (Process < 0)
            return _error->Errno("fork","Couldn't fork gzip");
         

diff --git a/debian/changelog b/debian/changelog
index 9d26496f28584ea241ab87d1c5dd963ef7b761ab..8dbf5cc8f7c25c7227f6b6f014ab3bf4e9114949 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
 apt (0.6.27) hoary; urgency=low
 
 apt (0.6.27) hoary; urgency=low
 

-  * Merge apt--authentication--0 branch (gpg authentication)
+  * Merge apt--authentication--0 branch
+    - Implement gpg authentication for package repositories (Closes: #203741)
+    - Also includes Michael Vogt's fixes
+  * Merge apt--misc-abi-changes--0 branch
+    - Use pid_t throughout to hold process IDs (Closes: #226701)
+    - Import patch from Debian bug #195510: (Closes: #195510)
+      - Make Simulate::Describe and Simulate::ShortBreaks private member
+        functions
+      - Add a parameter (Candidate) to Describe to control whether the
+        candidate version is displayed
+      - Pass an appropriate value for Candidate everywhere Describe is called

 
  -- Matt Zimmerman <mdz@canonical.com>  Mon, 13 Dec 2004 01:03:11 -0800
 
 
  -- Matt Zimmerman <mdz@canonical.com>  Mon, 13 Dec 2004 01:03:11 -0800
 

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index fabd460f86f2905a77ecd162a57044c5e72ae0fc..5073e98ac95be728fed16ec7186a838ee91b703b 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -271,7 +271,7 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */

-bool MultiCompress::OpenCompress(const CompType *Prog,int &Pid,int FileFd,
+bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd,

                                 int &OutFd,bool Comp)
 {
    Pid = -1;
                                 int &OutFd,bool Comp)
 {
    Pid = -1;


@@ -334,7 +334,7 @@ bool MultiCompress::OpenCompress(const CompType *Prog,int &Pid,int FileFd,
 // MultiCompress::OpenOld - Open an old file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens one of the original output files, possibly decompressing it. */
 // MultiCompress::OpenOld - Open an old file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens one of the original output files, possibly decompressing it. */

-bool MultiCompress::OpenOld(int &Fd,int &Proc)
+bool MultiCompress::OpenOld(int &Fd,pid_t &Proc)

 {
    Files *Best = Outputs;
    for (Files *I = Outputs; I != 0; I = I->Next)
 {
    Files *Best = Outputs;
    for (Files *I = Outputs; I != 0; I = I->Next)


@@ -356,7 +356,7 @@ bool MultiCompress::OpenOld(int &Fd,int &Proc)
 // MultiCompress::CloseOld - Close the old file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // MultiCompress::CloseOld - Close the old file                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool MultiCompress::CloseOld(int Fd,int Proc)
+bool MultiCompress::CloseOld(int Fd,pid_t Proc)

 {
    close(Fd);
    if (Proc != -1)
 {
    close(Fd);
    if (Proc != -1)


@@ -439,7 +439,7 @@ bool MultiCompress::Child(int FD)
    while (Missing == false)
    {
       int CompFd = -1;
    while (Missing == false)
    {
       int CompFd = -1;

-      int Proc = -1;
+      pid_t Proc = -1;

       if (OpenOld(CompFd,Proc) == false)
       {
         _error->Discard();
       if (OpenOld(CompFd,Proc) == false)
       {
         _error->Discard();

diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 212dec63d744be5d1baa34d68972d9314033542d..444d8626f35c7ad7a86194b598e90339a35bcb8b 100644 (file)
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -55,7 +55,7 @@ class MultiCompress
    mode_t Permissions;
    static const CompType Compressors[];
 
    mode_t Permissions;
    static const CompType Compressors[];
 

-   bool OpenCompress(const CompType *Prog,int &Pid,int FileFd,
+   bool OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd,

                     int &OutFd,bool Comp);
    bool Child(int Fd);
    bool Start();
                     int &OutFd,bool Comp);
    bool Child(int Fd);
    bool Start();


@@ -68,8 +68,8 @@ class MultiCompress
    unsigned long UpdateMTime;
    
    bool Finalize(unsigned long &OutSize);
    unsigned long UpdateMTime;
    
    bool Finalize(unsigned long &OutSize);

-   bool OpenOld(int &Fd,int &Proc);
-   bool CloseOld(int Fd,int Proc);
+   bool OpenOld(int &Fd,pid_t &Proc);
+   bool CloseOld(int Fd,pid_t Proc);

    static bool GetStat(string Output,string Compress,struct stat &St);
    
    MultiCompress(string Output,string Compress,mode_t Permissions,
    static bool GetStat(string Output,string Compress,struct stat &St);
    
    MultiCompress(string Output,string Compress,mode_t Permissions,

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index e1fd33ad388612128b1754fac86ef36149d89766..35a23a3d7b30744888990c502399a98b65d9a9dd 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -754,7 +754,7 @@ bool ContentsWriter::ReadFromPkgs(string PkgFile,string PkgCompress)
    
    // Open the package file
    int CompFd = -1;
    
    // Open the package file
    int CompFd = -1;

-   int Proc = -1;
+   pid_t Proc = -1;

    if (Pkgs.OpenOld(CompFd,Proc) == false)
       return false;
    
    if (Pkgs.OpenOld(CompFd,Proc) == false)
       return false;
    

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 75a0389793512ba433d1fd88ff343c5ebbc4f9c7..809afc0fc0564bfcc76866e214e493fabf31757d 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -57,7 +57,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
 
    // Fork gzip
       return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
 
    // Fork gzip

-   int Process = ExecFork();
+   pid_t Process = ExecFork();

    if (Process == 0)
    {
       close(GzOut[0]);
    if (Process == 0)
    {
       close(GzOut[0]);

diff --git a/methods/rsh.h b/methods/rsh.h
index bb97f062c118ca56ae508d95ad43c10ed1bdd26b..b06d5a94e67ad2ac9e74bfc35a4b55428c9084fd 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -29,7 +29,7 @@ class RSHConn
 
    public:
 
 
    public:
 

-   int Process;
+   pid_t Process;

 
    // Raw connection IO
    bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);
 
    // Raw connection IO
    bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 722d2e280f0a0ded1850508f2910ff6a82ead55f..bb60a995c93b4f6008fa5cb0df3c48d1ad837fb1 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2087,19 +2087,19 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:238
+#: apt-pkg/algorithms.cc:241

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""