summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-05-11 16:09:00 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-05-11 16:09:00 +0400
commitb5e9185ba9cd52c52bb90a9a354f27900303920c (patch)
tree0206d8ba1fdcc8b3571158c1fbaa3bdf07c42cda
parent25399d502ec5733044f4975e819994ee231e982f (diff)
downloadscreen-b5e9185ba9cd52c52bb90a9a354f27900303920c.tar.gz
Removed solaris-dev-console.patch (there is 61-allow-dev-console-to-be-a-symlink.patch now)
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/solaris-dev-console.patch33
2 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 303c7bd..fc0563d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,5 @@
62-prevent-repeated-title-prompt.patch
# 80-99: experimental patches, new features etc.
80EXP_session_creation_time.patch
-solaris-dev-console.patch
solaris-disable-SVR4-check.patch
solaris-push-check.patch
diff --git a/debian/patches/solaris-dev-console.patch b/debian/patches/solaris-dev-console.patch
deleted file mode 100644
index 29512ed..0000000
--- a/debian/patches/solaris-dev-console.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: /dev/console may be a symlink
- See http://lists.debian.org/debian-devel/2013/01/msg00576.html
- In case of SunOS kernel (illumos) it is not possible for a device
- file to have st_nlink != 1, so do not bother with "/devices/"
-Index: screen/tty.sh
-===================================================================
---- screen.orig/tty.sh 2013-01-27 02:16:57.916935245 +0000
-+++ screen/tty.sh 2013-01-27 02:33:12.831241123 +0000
-@@ -1506,11 +1506,21 @@
- char *tty;
- {
- struct stat st;
-+ char * real;
-+ int rc;
-
-- if (lstat(tty, &st) || !S_ISCHR(st.st_mode) ||
-- (st.st_nlink > 1 && strncmp(tty, "/dev/", 5)))
-+ real = realpath(tty, NULL);
-+ if (!real)
- return -1;
-- return 0;
-+
-+ if (lstat(real, &st) || !S_ISCHR(st.st_mode) ||
-+ (st.st_nlink > 1 && strncmp(real, "/dev/", 5)))
-+ rc = -1;
-+ else
-+ rc = 0;
-+
-+ free(real);
-+ return rc;
- }
-
- /*