From a67de73e4b66d67eeafe5d8c1f7fd5b031faeb3f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 26 Jul 2009 01:11:53 +0200
Subject: [PATCH] merge with lp:apt/debian-sid Remove a bug (= an evil amok
 running if) introduced by the merge in 1817 which cause a segfault in the
 destructor for the dynamic mmap.

---
 apt-pkg/contrib/mmap.cc | 2 +-
 po/apt-all.pot          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 917466c2f..aa52b4c30 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -201,7 +201,7 @@ DynamicMMap::~DynamicMMap()
    if (Fd == 0)
    {
 #ifdef _POSIX_MAPPED_FILES
-      if(munmap(Base, WorkSpace) < 0)
+      munmap(Base, WorkSpace);
 #else
       delete [] (unsigned char *)Base;
 #endif
diff --git a/po/apt-all.pot b/po/apt-all.pot
index c2cd5e9d7..a18646290 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 18:36+0200\n"
+"POT-Creation-Date: 2009-07-26 01:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
2.45.2