From 61487d3da540a923b6ebee3dcfc8b1026f1a7262 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: May 16 2008 10:28:22 +0000
Subject: - fix multiuser support (#446049)


---

diff --git a/screen-4.0.3-ptygroup.patch b/screen-4.0.3-ptygroup.patch
deleted file mode 100644
index 5bacec9..0000000
--- a/screen-4.0.3-ptygroup.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up screen-4.0.3/window.c.ptygroup screen-4.0.3/window.c
---- screen-4.0.3/window.c.ptygroup	2008-02-26 10:38:35.000000000 +0100
-+++ screen-4.0.3/window.c	2008-02-26 10:39:53.000000000 +0100
-@@ -1083,6 +1083,7 @@ char **namep;
-     return f;
- 
- #ifndef PTYROFS
-+#if 0
- #ifdef PTYGROUP
-   if (chown(*namep, real_uid, PTYGROUP) && !eff_uid)
- #else
-@@ -1093,6 +1094,7 @@ char **namep;
-       close(f);
-       return -1;
-     }
-+#endif
- #ifdef UTMPOK
-   if (chmod(*namep, lflag ? TtyMode : (TtyMode & ~022)) && !eff_uid)
- #else
diff --git a/screen.spec b/screen.spec
index 5f2a4c5..e6dabd4 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -19,7 +19,6 @@ Source1: screen.pam
 Patch1: screen-4.0.3-libs.patch
 # Some tweaks of the default screenrc
 Patch2: screen-4.0.2-screenrc.patch
-Patch3: screen-4.0.3-ptygroup.patch
 Patch4: screen-4.0.3-stropts.patch
 # Fixes potential buffer overflow when > 2^31 semicolons are passed.
 Patch7: screen-4.0.1-args.patch
@@ -40,7 +39,6 @@ support multiple logins on one terminal.
 %setup -q
 %patch1 -p1 -b .libs
 %patch2 -p1 -b .screenrc
-%patch3 -p1 -b .ptygroup
 %patch4 -p1 -b .stropts
 %patch7 -p0 -b .args
 %patch11 -p1 -b .maxstr
@@ -56,7 +54,7 @@ autoconf
 	--enable-locale \
 	--enable-telnet \
 	--with-pty-mode=0620 \
-	--without-pty-group \
+	--with-pty-group=$(getent group tty | cut -d : -f 3) \
 	--with-sys-screenrc="%{_sysconfdir}/screenrc" \
 	--with-socket-dir="%{_localstatedir}/run/screen"
 
@@ -115,6 +113,9 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/screen
 
 %changelog
+* Fri May 16 2008 Miroslav Lichvar <mlichvar@redhat.com> - 4.0.3-12
+- fix multiuser support (#446049)
+
 * Mon Apr 07 2008 Miroslav Lichvar <mlichvar@redhat.com> - 4.0.3-11
 - don't include stropts.h (#440803)
 - fix compiler warnings in ipv6 patch