packages: opie/opie.spec, opie/opie-getline.patch (NEW) - getline patch - r...

[tommat]

Author: tommat                       Date: Thu Aug 27 15:31:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- getline patch - rename internal getline function to avoid conflict from stdio.h

---- Files affected:
packages/opie:
   opie.spec (1.47 -> 1.48) , opie-getline.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opie/opie.spec
diff -u packages/opie/opie.spec:1.47 packages/opie/opie.spec:1.48
--- packages/opie/opie.spec:1.47	Wed Sep  5 16:46:26 2007
+++ packages/opie/opie.spec	Thu Aug 27 17:31:19 2009
@@ -16,6 +16,7 @@
 Patch4:		%{name}-errno.patch
 Patch5:		%{name}-suse.patch
 Patch6:		%{name}-uint4.patch
+Patch7:		%{name}-getline.patch
 URL:		http://inner.net/opie
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	bison
@@ -87,6 +88,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p0
+%patch7 -p1
 
 %build
 %{__autoconf}
@@ -148,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2009/08/27 15:31:19  tommat
+- getline patch - rename internal getline function to avoid conflict from stdio.h
+
 Revision 1.47  2007/09/05 14:46:26  baggins
 - rel 12
 

================================================================
Index: packages/opie/opie-getline.patch
diff -u /dev/null packages/opie/opie-getline.patch:1.1
--- /dev/null	Thu Aug 27 17:31:24 2009
+++ packages/opie/opie-getline.patch	Thu Aug 27 17:31:19 2009
@@ -0,0 +1,45 @@
+diff -Nur opie-2.4.orig/ftpcmd.y opie-2.4/ftpcmd.y
+--- opie-2.4.orig/ftpcmd.y	2009-08-27 15:22:38.000000000 +0200
++++ opie-2.4/ftpcmd.y	2009-08-27 16:49:54.000000000 +0200
+@@ -875,9 +875,9 @@
+ #include <arpa/telnet.h>
+ 
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * telnet_getline - a hacked up version of fgets to ignore TELNET escape codes.
+  */
+-char *getline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop)
++char *telnet_getline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop)
+ {
+ 	register c;
+ 	register char *cs;
+@@ -958,7 +958,7 @@
+ 		case CMD:
+ 			(void) signal(SIGALRM, toolong);
+ 			(void) alarm((unsigned) timeout);
+-			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++			if (telnet_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ 				reply(221, "You could at least say goodbye.");
+ 				dologout(0);
+ 			}
+diff -Nur opie-2.4.orig/opieftpd.c opie-2.4/opieftpd.c
+--- opie-2.4.orig/opieftpd.c	2000-07-16 18:44:09.000000000 +0200
++++ opie-2.4/opieftpd.c	2009-08-27 16:50:13.000000000 +0200
+@@ -229,7 +229,7 @@
+ 
+ VOIDRET perror_reply __P((int, char *));
+ VOIDRET dologout __P((int));
+-char *getline __P((char *, int, FILE *));
++char *telnet_getline __P((char *, int, FILE *));
+ VOIDRET upper __P((char *));
+ 
+ static VOIDRET lostconn __P((int));
+@@ -1290,7 +1290,7 @@
+   if (!transflag)
+     return;
+   cp = tmpline;
+-  if (getline(cp, 7, stdin) == NULL) {
++  if (telnet_getline(cp, 7, stdin) == NULL) {
+     reply(221, "You could at least say goodbye.");
+     dologout(0);
+   }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opie/opie.spec?r1=1.47&r2=1.48&f=u