screen (4.1.0~20120320gitdb59704-7+dyson3) unstable; urgency=low

  * Added solaris-push-check.patch
  * Use dh_smf on illumos

5 files changed, 24 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 08d1b33..d0771f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+screen (4.1.0~20120320gitdb59704-7+dyson3) unstable; urgency=low
+
+  * Added solaris-push-check.patch
+  * Use dh_smf on illumos
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 27 Jul 2013 06:12:22 +0400
+
 screen (4.1.0~20120320gitdb59704-7+dyson2) unstable; urgency=low
 
   * Fixed typo in solaris-dev-console.patch
diff --git a/debian/control b/debian/control
index 31aca85..7279fa6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Axel Beckert <abe@debian.org>
 Uploaders: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
 Standards-Version: 3.9.3
 Build-Depends: libncursesw5-dev, texinfo, libpam0g-dev, debhelper (>> 7), dh-autoreconf, dpkg-dev (>= 1.16.1~),
- libkstat-dev [illumos-any]
+ libkstat-dev [illumos-any], dh-smf [illumos-any]
 Homepage: http://savannah.gnu.org/projects/screen
 Vcs-Git: git://anonscm.debian.org/collab-maint/screen.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/screen.git
diff --git a/debian/patches/series b/debian/patches/series
index 28ae7dc..8246498 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@
 80EXP_session_creation_time.patch
 solaris-dev-console.patch
 solaris-disable-SVR4-check.patch
+solaris-push-check.patch
diff --git a/debian/patches/solaris-push-check.patch b/debian/patches/solaris-push-check.patch
new file mode 100644
index 0000000..10f8e2b
--- /dev/null
+++ b/debian/patches/solaris-push-check.patch
@@ -0,0 +1,14 @@
+Description: don't push modules if already pushed
+Index: screen/pty.c
+===================================================================
+--- screen.orig/pty.c	2013-07-27 06:08:50.928542103 +0400
++++ screen/pty.c	2013-07-27 06:11:28.473309177 +0400
+@@ -137,6 +137,8 @@
+   if (f < 0)
+     return;
+ #if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__GLIBC__) && !defined(__osf__) && !defined(M_UNIX)
++  if (0 != ioctl(f, I_FIND, "ldterm"))
++    return;
+   if (ioctl(f, I_PUSH, "ptem"))
+     Panic(errno, "InitPTY: cannot I_PUSH ptem");
+   if (ioctl(f, I_PUSH, "ldterm"))
diff --git a/debian/rules b/debian/rules
index 20e0489..f4213a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,7 @@ ifeq (illumos,$(DEB_HOST_ARCH_OS))
 		/lib/svc/method
 	dh_install -pscreen debian/screen-cleanup.xml /lib/svc/manifest/system/
 	install -m 755 debian/init debian/screen/lib/svc/method/screen-cleanup
+	dh_smf --onlyscripts
 else
 	dh_installinit --no-start --init-script='screen-cleanup' --update-rcd-params='start 70 S .'
 endif