From e45c4617e496b49f8d7225546a751022f246a2f3 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 31 Oct 2013 22:55:38 +0100
Subject: add new pid_t ExecFork(std::set<int> KeepFDs) to get rid of the super
 ugly APT::Keep-Fds hack and also add a new
 PackageManagerProgressFd::StartDpkg() progress state

---
 apt-pkg/contrib/fileutl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/contrib/fileutl.h')

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index decd64d9d..63a999c30 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <vector>
+#include <set>
 
 #include <zlib.h>
 
@@ -182,6 +183,7 @@ void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 pid_t ExecFork();
+pid_t ExecFork(std::set<int> keep_fds);
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // File string manipulators
-- 
cgit v1.2.3


From 96ae6de5d3d5ae31100079c78fffc5ebc4a0b81c Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 17:08:53 +0100
Subject: fix regression that APT::Keep-Fds is not honored (closes: #730490)

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

(limited to 'apt-pkg/contrib/fileutl.h')

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 63a999c30..e9a9aab28 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -184,6 +184,7 @@ void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 pid_t ExecFork();
 pid_t ExecFork(std::set<int> keep_fds);
+void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds);
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // File string manipulators
-- 
cgit v1.2.3


From 68e0172140872d8044b3c768a6bea3ac58d426c4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sun, 22 Dec 2013 22:15:52 +0100
Subject: factor GetTempDir out

---
 apt-pkg/contrib/fileutl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/contrib/fileutl.h')

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index e9a9aab28..e752e9621 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -165,6 +165,8 @@ bool DirectoryExists(std::string const &Path) __attrib_const;
 bool CreateDirectory(std::string const &Parent, std::string const &Path);
 time_t GetModificationTime(std::string const &Path);
 
+std::string GetTempDir();
+
 /** \brief Ensure the existence of the given Path
  *
  *  \param Parent directory of the Path directory - a trailing
-- 
cgit v1.2.3