- fix parse error when dpkg sends unexpected data

* fix missing SetExecClose() call when the status-fd is used
* debian/apt.cron.daily:
  - move unattended-upgrade before apt-get autoclean
* fix "purge" commandline argument, closes: #133421
  (thanks to Julien Danjou for the patch)
* cmdline/apt-get.cc:
  - do not change the auto-installed information if a package
    is reinstalled
* apt-pkg/acquire-item.cc:
  - fix crash in diff acquire code
* cmdline/apt-mark:
  - Fix chmoding after have renamed the extended-states file (LP: #140019)
    (thanks to Laurent Bigonville)
* apt-pkg/contrib/mmap.cc:
  - don't fail if msync() returns > 0

2 files changed, 7 insertions, 3 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c9ec481aa..e214691f8 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
 	    // where foo is marked automatic
 	    if(!Remove && 
 	       Cache[Pkg].Install() == false && 
-	       (Cache[Pkg].Flags & pkgCache::Flag::Auto))
+	       (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
+	       _config->FindB("APT::Get::ReInstall",false) == false)
 	    {
 	       ioprintf(c1out,_("%s set to manual installed.\n"),
 			Pkg.Name());
@@ -2471,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL)
                            break;
                  }
                  if (CV.end() == true)
+		 {
 		   if (hasAlternatives)
 		   {
 		      continue;
@@ -2483,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL)
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            (*D).Package.c_str());
 		   }
+		 }
             }
             else
             {
@@ -2752,6 +2755,7 @@ int main(int argc,const char *argv[])
                                    {"install",&DoInstall},
                                    {"remove",&DoInstall},
 				   {"autoremove",&DoInstall},
+				   {"purge",&DoInstall},
                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
 				   {"build-dep",&DoBuildDep},
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index fdc3e1856..f6e749eb5 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -40,7 +40,7 @@ if __name__ == "__main__":
     if not options.filename:
         STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
     else:
-        STATE_FILE=options.state_file
+        STATE_FILE=options.filename
 
     # open the statefile
     if os.path.exists(STATE_FILE):
@@ -62,4 +62,4 @@ if __name__ == "__main__":
         # all done, rename the tmpfile
         os.chmod(outfile.name, 0644)
         os.rename(outfile.name, STATE_FILE)
-        os.chmod(outfile.name, 0644)
+        os.chmod(STATE_FILE, 0644)