diff options
| author | Samuel Thibault <sthibault@debian.org> | 2011-03-06 23:28:56 +0000 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2011-09-03 14:05:38 +0200 |
| commit | 0d9908c6151a05c420f0305ff99ab4a332fe6740 (patch) | |
| tree | 15d07e606405764675a14657c4034f16e29e84dc | |
| parent | 7f5193b282028512ad41fbed2e7b6d404c33f9d6 (diff) | |
| download | screen-0d9908c6151a05c420f0305ff99ab4a332fe6740.tar.gz | |
Imported Debian patch 4.0.3-14+hurd.1debian/4.0.3-14+hurd.1
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/12kfreebsd_ctty.dpatch | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 71a159c..75ee1ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +screen (4.0.3-14+hurd.1) unreleased; urgency=low + + * Fix #522689. + + -- Samuel Thibault <sthibault@debian.org> Sun, 06 Mar 2011 23:28:56 +0000 + screen (4.0.3-14) unstable; urgency=low * Cherry-pick a few upstream commits: diff --git a/debian/patches/12kfreebsd_ctty.dpatch b/debian/patches/12kfreebsd_ctty.dpatch index e2373d8..4bc88a2 100644 --- a/debian/patches/12kfreebsd_ctty.dpatch +++ b/debian/patches/12kfreebsd_ctty.dpatch @@ -22,7 +22,7 @@ - if (separate_sids) - setsid(); /* should be already done */ -# ifdef TIOCSCTTY -+# if defined(__FreeBSD_kernel__) && defined(TIOCSCTTY) ++# if (defined(__FreeBSD_kernel__) || defined(__GNU__)) && defined(TIOCSCTTY) ioctl(fd, TIOCSCTTY, (char *)0); -# endif # endif |