merged from donkult

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 395c3fb1aed6da42338b556fa99688a31ef645bc..9f0da3be61a3c695b0242244cfb65326a638981e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -660,6 +660,7 @@ bool pkgDPkgPM::OpenLog()
       if (term_out == NULL)
         return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
       setvbuf(term_out, NULL, _IONBF, 0);
+      SetCloseExec(fileno(term_out), true);
       chmod(logfile_name.c_str(), 0600);
       fprintf(term_out, "\nLog started: %s\n", timestr);
    }

diff --git a/debian/changelog b/debian/changelog
index 8ca3e164acb11d63f9a1619121eeb3237907e0b4..437ded36555e90c720a67389ee6b43495095f43c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ apt (0.8.7) unstable; urgency=low
   * apt-pkg/deb/debsystem.cc:
     - fix issues with dir::state::status and dir::state::extended_states
       when alternative rootdirs are used
+  * apt-pkg/deb/dpkgpm.cc:
+    - ensure that history.log gets closed to avoid leaking a FD
+      (closes: #601649)
 
   [ Martin Pitt ]
   * apt-pkg/deb/debindexfile.cc: