From b16c26174fd625aba62ea5716e78b40d64812f3d Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 10 Sep 2007 16:52:56 +0200
Subject: * apt-pkg/contrib/hashes.h:   - fix anohter missing cstring include

---
 apt-pkg/contrib/hashes.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 93e7b25d9..264f7fe90 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <vector>
+#include <cstring>
 
 using std::min;
 using std::vector;
-- 
cgit v1.2.3


From faebb6992f9a4b8cfe95083c2ad63ff49b608ed0 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 11 Sep 2007 20:50:31 +0200
Subject: * fix missing SetExecClose() call when the status-fd is used

---
 apt-pkg/packagemanager.h | 2 ++
 debian/changelog         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 53600fb61..adcbec3d0 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -91,6 +91,8 @@ class pkgPackageManager : protected pkgCache::Namespace
 
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(int statusFd=-1) {
+      if(statusFd > 0)
+	 SetCloseExec(statusFd, true);
       bool goResult = Go(statusFd);
       if(goResult == false) 
 	 return Failed;
diff --git a/debian/changelog b/debian/changelog
index bf5afb3b9..69721ebc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ apt (0.7.7) UNRELEASED; urgency=low
     - increase MaxPipeDepth for the internal worker<->method
       communication to 1000 for the debtorrent backend
   * make apt build with g++ 4.3
+  * fix missing SetExecClose() call when the status-fd is used
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.
-- 
cgit v1.2.3