From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 31 Jan 2008 09:06:00 +0000 (+0100)
Subject: * apt-pkg/deb/dpkgpm.cc:
X-Git-Tag: 0.7.24ubuntu1~85^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/51dbf3686ee62584d7c2a21b6209a45ebceac5c9?ds=inline;hp=--cc

* apt-pkg/deb/dpkgpm.cc:
  - merged patch from Kees Cook to fix anoying upper-case display
    on amd64 in sbuild
---

51dbf3686ee62584d7c2a21b6209a45ebceac5c9
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 34e166447..bc15b8819 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -702,14 +702,16 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
 
       struct	termios tt;
+      struct	termios tt_out;
       struct	winsize win;
       int	master;
       int	slave;
 
       // FIXME: setup sensible signal handling (*ick*)
       tcgetattr(0, &tt);
+      tcgetattr(1, &tt_out);
       ioctl(0, TIOCGWINSZ, (char *)&win);
-      if (openpty(&master, &slave, NULL, &tt, &win) < 0) 
+      if (openpty(&master, &slave, NULL, &tt_out, &win) < 0) 
       {
 	 const char *s = _("Can not write log, openpty() "
 			   "failed (/dev/pts not mounted?)\n");
diff --git a/debian/changelog b/debian/changelog
index 92fdcf57c..d0e0c754d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ apt (0.7.11) UNRELEASED; urgency=low
     - add support for a master-keyring that contains signing keys
       that can be used to sign the archive signing keys. This should
       make key-rollover easier.
+  * apt-pkg/deb/dpkgpm.cc:
+    - merged patch from Kees Cook to fix anoying upper-case display
+      on amd64 in sbuild
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Jan 2008 12:06:12 +0100