From 9d64c05a688739a678fc2323be322475484f03b9 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Nov 12 2010 13:45:05 +0000
Subject: 4.0.3-16


- create socket directory on start with tmpfs (#652348)
- add -4 and -6 options to man page (#650321)

---

diff --git a/screen-4.0.3-ipv6.patch b/screen-4.0.3-ipv6.patch
index b7b6f75..bc8ec1a 100644
--- a/screen-4.0.3-ipv6.patch
+++ b/screen-4.0.3-ipv6.patch
@@ -1,3 +1,19 @@
+diff -up screen-4.0.3/doc/screen.1.ipv6 screen-4.0.3/doc/screen.1
+--- screen-4.0.3/doc/screen.1.ipv6	2003-12-05 14:51:57.000000000 +0100
++++ screen-4.0.3/doc/screen.1	2010-11-12 14:29:52.125028912 +0100
+@@ -366,6 +366,12 @@ Send the specified command to a running 
+ the \fB-d\fP or \fB-r\fP option to tell screen to look only for
+ attached or detached screen sessions. Note that this command doesn't
+ work if the session is password protected.
++.TP 5
++.B \-4
++Resolve hostnames only to IPv4 addresses.
++.TP 5
++.B \-6
++Resolve hostnames only to IPv6 addresses.
+ 
+ 
+ .SH "DEFAULT KEY BINDINGS"
 --- screen-4.0.3/window.h.ipv6	2003-08-21 16:57:30.000000000 +0200
 +++ screen-4.0.3/window.h	2006-11-15 13:36:57.000000000 +0100
 @@ -254,7 +254,7 @@
@@ -264,9 +280,9 @@
    printf("Use: %s [-opts] [cmd [args]]\n", myname);
    printf(" or: %s -r [host.tty]\n\nOptions:\n", myname);
 +#ifdef BUILTIN_TELNET                                                                                                        
-+  printf("-4            Use IPv4.\n");                                                                                       
-+  printf("-6            Use IPv6.\n");                                                                                       
-+#endif    
++  printf("-4            Resolve hostnames only to IPv4 addresses.\n");
++  printf("-6            Resolve hostnames only to IPv6 addresses.\n");
++#endif
    printf("-a            Force all capabilities into each window's termcap.\n");
    printf("-A -[r|R]     Adapt all windows to the new display width & height.\n");
    printf("-c file       Read configuration file instead of '.screenrc'.\n");
diff --git a/screen.spec b/screen.spec
index cbb8167..70658ff 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: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -15,6 +15,7 @@ BuildRequires: ncurses-devel pam-devel libutempter-devel autoconf texinfo
 Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
 # Except for the PAM configuration, that is.
 Source1: screen.pam
+Source2: screen.tmpfs
 
 Patch1: screen-4.0.3-libs.patch
 # Some tweaks of the default screenrc
@@ -87,6 +88,10 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/screen
 # Create the socket dir
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/screen
 
+# And tell systemd to recreate it on start with tmpfs
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/screen.conf
+
 # Remove files from the buildroot which we don't want packaged
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -117,8 +122,13 @@ fi
 %attr(775,root,screen) %{_localstatedir}/run/screen
 %config(noreplace) %{_sysconfdir}/screenrc
 %config(noreplace) %{_sysconfdir}/pam.d/screen
+%{_sysconfdir}/tmpfiles.d/screen.conf
 
 %changelog
+* Fri Nov 12 2010 Miroslav Lichvar <mlichvar@redhat.com> - 4.0.3-16
+- create socket directory on start with tmpfs (#652348)
+- add -4 and -6 options to man page (#650321)
+
 * Fri Sep 25 2009 Miroslav Lichvar <mlichvar@redhat.com> - 4.0.3-15
 - fix crash when resizing (#515055)
 - try to improve default config (#523647, #506256, #492729)
diff --git a/screen.tmpfs b/screen.tmpfs
new file mode 100644
index 0000000..e693ce1
--- /dev/null
+++ b/screen.tmpfs
@@ -0,0 +1,2 @@
+# screen needs directory in /var/run
+d /var/run/screen 0775 root screen