Merge remote-tracking branch 'mvo/feature/acq-trans' into debian/experimental

diff --combined apt-pkg/acquire-method.cc
index d116994e64ed61937bfa3ac0b43618ab6b6f3172,cbcbea247f38f5e1e4a4a8b5c309e7c0bf367956..8533e319fceb8f10600b3358b5cf6c1afdf43f50
--- 1/apt-pkg/acquire-method.cc
--- 2/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -102,7 -102,10 +102,10 @@@ void pkgAcqMethod::Fail(string Err,boo
     if (Queue != 0)
     {
        std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n"
-               << "Message: " << Err << " " << IP << "\n";
+               << "Message: " << Err;
+       if (IP.empty() == false && _config->FindB("Acquire::Failure::ShowIP", true) == true)
+        std::cout << " " << IP;
+       std::cout << "\n";
        Dequeue();
     }
     else
@@@ -124,7 -127,7 +127,7 @@@
  /* */
  void pkgAcqMethod::DropPrivsOrDie()
  {
 -   if (!DropPrivs()) {
 +   if (!DropPrivileges()) {
        Fail(false);
        exit(112);      /* call the european emergency number */
     }

diff --combined apt-pkg/contrib/fileutl.cc
index 844a6bd3cd53d02c61c6539834234ff7090bbe3b,c5eb56f0e236ac7f7c9dba829118d2f330af7bfe..3e592d94fd349476969cd62b84996c648d19f66b
--- 1/apt-pkg/contrib/fileutl.cc
--- 2/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@@ -857,7 -857,11 +857,7 @@@ bool ExecWait(pid_t Pid,const char *Nam
     return true;
  }
                                                                        /*}}}*/
 -
 -
 -// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned     /*{{{*/
 -// ---------------------------------------------------------------------
 -/* */
 +// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned   /*{{{*/
  bool StartsWithGPGClearTextSignature(string const &FileName)
  {
     static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n";
@@@ -873,7 -877,7 +873,7 @@@
  
     return true;
  }
 -
 +                                                                      /*}}}*/
  
  class FileFdPrivate {                                                 /*{{{*/
        public:
@@@ -1521,7 -1525,7 +1521,7 @@@ bool FileFd::Read(void *To,unsigned lon
            int err;
            char const * const errmsg = BZ2_bzerror(d->bz2, &err);
            if (err != BZ_IO_ERROR)
-              return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);
+              return FileFdError("BZ2_bzread: %s %s (%d: %s)", FileName.c_str(), _("Read error"), err, errmsg);
         }
  #endif
  #ifdef HAVE_LZMA
@@@ -2031,7 -2035,10 +2031,7 @@@ APT_DEPRECATED gzFile FileFd::gzFd() 
  #endif
  }
  
 -
 -// Glob - wrapper around "glob()"                                      /*{{{*/
 -// ---------------------------------------------------------------------
 -/* */
 +// Glob - wrapper around "glob()"                                     /*{{{*/
  std::vector<std::string> Glob(std::string const &pattern, int flags)
  {
     std::vector<std::string> result;
@@@ -2057,7 -2064,8 +2057,7 @@@
     return result;
  }
                                                                        /*}}}*/
 -
 -std::string GetTempDir()
 +std::string GetTempDir()                                              /*{{{*/
  {
     const char *tmpdir = getenv("TMPDIR");
  
@@@ -2073,8 -2081,8 +2073,8 @@@
  
     return string(tmpdir);
  }
 -
 -FileFd* GetTempFile(std::string const &Prefix, bool ImmediateUnlink)
 +                                                                      /*}}}*/
 +FileFd* GetTempFile(std::string const &Prefix, bool ImmediateUnlink)  /*{{{*/
  {
     char fn[512];
     FileFd *Fd = new FileFd();
@@@ -2098,19 -2106,19 +2098,19 @@@
  
     return Fd;
  }
 -
 -bool Rename(std::string From, std::string To)
 +                                                                      /*}}}*/
 +bool Rename(std::string From, std::string To)                         /*{{{*/
  {
     if (rename(From.c_str(),To.c_str()) != 0)
     {
        _error->Error(_("rename failed, %s (%s -> %s)."),strerror(errno),
                      From.c_str(),To.c_str());
        return false;
 -   }   
 +   }
     return true;
  }
 -
 -bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)
 +                                                                      /*}}}*/
 +bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)/*{{{*/
  {
     int fd;
     if (Mode != FileFd::ReadOnly && Mode != FileFd::WriteOnly)
@@@ -2162,35 -2170,29 +2162,35 @@@
  
     return true;
  }
 -
 -bool DropPrivs()
 +                                                                      /*}}}*/
 +bool DropPrivileges()                                                 /*{{{*/
  {
 +   if(_config->FindB("Debug::NoDropPrivs", false) == true)
 +      return true;
 +
 +#if __gnu_linux__
 +#if defined(PR_SET_NO_NEW_PRIVS) && ( PR_SET_NO_NEW_PRIVS != 38 )
 +#error "PR_SET_NO_NEW_PRIVS is defined, but with a different value than expected!"
 +#endif
 +   // see prctl(2), needs linux3.5 at runtime - magic constant to avoid it at buildtime
 +   int ret = prctl(38, 1, 0, 0, 0);
 +   // ignore EINVAL - kernel is too old to understand the option
 +   if(ret < 0 && errno != EINVAL)
 +      _error->Warning("PR_SET_NO_NEW_PRIVS failed with %i", ret);
 +#endif
 +
     // uid will be 0 in the end, but gid might be different anyway
 -   uid_t old_uid = getuid();
 -   gid_t old_gid = getgid();
 +   uid_t const old_uid = getuid();
 +   gid_t const old_gid = getgid();
  
     if (old_uid != 0)
        return true;
 -   if(_config->FindB("Debug::NoDropPrivs", false) == true)
 -      return true;
  
     const std::string toUser = _config->Find("APT::Sandbox::User", "_apt");
     struct passwd *pw = getpwnam(toUser.c_str());
     if (pw == NULL)
        return _error->Error("No user %s, can not drop rights", toUser.c_str());
  
 -#if __gnu_linux__
 -   // see prctl(2), needs linux3.5
 -   int ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0,0, 0);
 -   if(ret < 0)
 -      _error->Warning("PR_SET_NO_NEW_PRIVS failed with %i", ret);
 -#endif
     // Do not change the order here, it might break things
     if (setgroups(1, &pw->pw_gid))
        return _error->Errno("setgroups", "Failed to setgroups");
@@@ -2257,4 -2259,3 +2257,4 @@@
  
     return true;
  }
 +                                                                      /*}}}*/