summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 0 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index be11870fd..14376f649 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -738,6 +738,7 @@ bool pkgDPkgPM::OpenLog()
d->history_out = fopen(history_name.c_str(),"a");
if (d->history_out == NULL)
return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
+ SetCloseExec(fileno(d->history_out), true);
chmod(history_name.c_str(), 0644);
fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
string remove, purge, install, reinstall, upgrade, downgrade;
diff --git a/debian/changelog b/debian/changelog
index 50d6ea3ce..fa4cdc251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,12 @@ apt (0.8.16~exp13) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 18:12:57 +0100
+apt (0.8.16~exp12ubuntu8) precise; urgency=low
+
+ * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 12 Apr 2012 16:26:20 -0600
+
apt (0.8.16~exp12) experimental; urgency=low
[ Michael Vogt ]