rpms/screen/devel screen-4.0.3-stropts.patch, NONE, 1.1 screen-4.0.3-ipv6.patch, 1.1, 1.2 screen.spec, 1.46, 1.47

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/screen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7658

Modified Files:
	screen-4.0.3-ipv6.patch screen.spec 
Added Files:
	screen-4.0.3-stropts.patch 
Log Message:
- don't include stropts.h (#440803)
- fix compiler warnings in ipv6 patch


screen-4.0.3-stropts.patch:

--- NEW FILE screen-4.0.3-stropts.patch ---
diff -up screen-4.0.3/tty.sh.stropts screen-4.0.3/tty.sh
--- screen-4.0.3/tty.sh.stropts	2003-09-08 16:24:25.000000000 +0200
+++ screen-4.0.3/tty.sh	2008-04-07 11:28:34.000000000 +0200
@@ -76,7 +76,7 @@ exit 0
 #endif
 
 #include "config.h"
-#ifdef SVR4
+#if 0
 #include <sys/stropts.h>	/* for I_POP */
 #endif
 
diff -up screen-4.0.3/screen.c.stropts screen-4.0.3/screen.c
--- screen-4.0.3/screen.c.stropts	2008-04-07 11:25:21.000000000 +0200
+++ screen-4.0.3/screen.c	2008-04-07 11:29:14.000000000 +0200
@@ -50,7 +50,7 @@
 
 #include "config.h"
 
-#ifdef SVR4
+#if 0
 # include <sys/stropts.h>
 #endif
 
diff -up screen-4.0.3/process.c.stropts screen-4.0.3/process.c
--- screen-4.0.3/process.c.stropts	2003-09-18 14:53:54.000000000 +0200
+++ screen-4.0.3/process.c	2008-04-07 11:29:47.000000000 +0200
@@ -37,7 +37,7 @@
 #include "config.h"
 
 /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
-#ifdef SVR4
+#if 0 
 # include <sys/stropts.h>
 #endif
 
diff -up screen-4.0.3/pty.c.stropts screen-4.0.3/pty.c
--- screen-4.0.3/pty.c.stropts	2003-09-08 16:26:18.000000000 +0200
+++ screen-4.0.3/pty.c	2008-04-07 11:30:07.000000000 +0200
@@ -34,7 +34,7 @@
 #endif
 
 /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
-#ifdef HAVE_SVR4_PTYS
+#if 0 
 # include <sys/stropts.h>
 #endif
 

screen-4.0.3-ipv6.patch:

Index: screen-4.0.3-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/screen/devel/screen-4.0.3-ipv6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- screen-4.0.3-ipv6.patch	15 Nov 2006 13:15:08 -0000	1.1
+++ screen-4.0.3-ipv6.patch	7 Apr 2008 11:10:45 -0000	1.2
@@ -199,7 +199,7 @@
 +  hints.ai_protocol = IPPROTO_TCP;                                                                                           
 +  if(getaddrinfo(p->w_cmdargs[1], p->w_cmdargs[2] ? p->w_cmdargs[2] : TEL_DEFPORT,                                           
 +                 &hints, &res0)) {                                                                                           
-+     Msg(errno, "TelOpenAndConnect: getaddrinfo", p->w_cmdargs[1]);                                                           
++     Msg(0, "unknown host: %s", p->w_cmdargs[1]);
 +     return -1;                                                                                                              
 +  }                                                                                                                          
 +                                                                                                                             
@@ -246,14 +246,14 @@
 +    }                                                                                                                        
 +    else                                                                                                                     
 +      WriteString(p, "connected.\r\n", 12);                                                                                  
-+    if (p->w_cmdargs[2] == TEL_DEFPORT)                                                                                      
++    if (!(p->w_cmdargs[2] && strcmp(p->w_cmdargs[2], TEL_DEFPORT)))
 +      TelReply(p, (char *)tn_init, sizeof(tn_init));                                                                         
-+                                                                                                                             
 +    p->w_ptyfd = fd;                                                                                                         
 +    memcpy(&p->w_telsa, &res->ai_addr, sizeof(res->ai_addr));                                                                
 +    freeaddrinfo(res0);                                                                                                      
 +    return 0;                                                                                                                
 +  }                  
++  return -1;
  }
  
  int


Index: screen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/screen/devel/screen.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- screen.spec	26 Feb 2008 17:11:59 -0000	1.46
+++ screen.spec	7 Apr 2008 11:10:45 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -20,6 +20,7 @@
 # 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
 Patch11: screen-4.0.2-maxstr.patch
@@ -40,6 +41,7 @@
 %patch1 -p1 -b .libs
 %patch2 -p1 -b .screenrc
 %patch3 -p1 -b .ptygroup
+%patch4 -p1 -b .stropts
 %patch7 -p0 -b .args
 %patch11 -p1 -b .maxstr
 %patch12 -p1 -b .ipv6
@@ -113,6 +115,10 @@
 %config(noreplace) %{_sysconfdir}/pam.d/screen
 
 %changelog
+* Mon Apr 07 2008 Miroslav Lichvar <mlichvar at redhat.com> - 4.0.3-11
+- don't include stropts.h (#440803)
+- fix compiler warnings in ipv6 patch
+
 * Tue Feb 26 2008 Miroslav Lichvar <mlichvar at redhat.com> - 4.0.3-10
 - don't set xterm function keys in default config (#151556)
 - always return 0 in scriptlet (#433882)