Просмотр исходного кода

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

Michael Vogt лет назад: 18
Родитель
Сommit
51dbf3686e
2 измененных файлов с 6 добавлено и 1 удалено
  1. 3 1
      apt-pkg/deb/dpkgpm.cc
  2. 3 0
      debian/changelog

+ 3 - 1
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");

+ 3 - 0
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