packages: srp/srp.spec, srp/srp-getline.patch (NEW) - rel 2; build fixed
arekm
arekm at pld-linux.org
Fri Aug 28 20:56:26 CEST 2009
Author: arekm Date: Fri Aug 28 18:56:26 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; build fixed
---- Files affected:
packages/srp:
srp.spec (1.39 -> 1.40) , srp-getline.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/srp/srp.spec
diff -u packages/srp/srp.spec:1.39 packages/srp/srp.spec:1.40
--- packages/srp/srp.spec:1.39 Sat Nov 1 17:34:39 2008
+++ packages/srp/srp.spec Fri Aug 28 20:56:20 2009
@@ -7,7 +7,7 @@
Summary(pl.UTF-8): Protokół SRP (bezpieczny system autoryzacji)
Name: srp
Version: 2.1.2
-Release: 1
+Release: 2
License: SRP Open Source
Group: Applications/Networking
Source0: http://srp.stanford.edu/source/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@
Patch0: %{name}-shared.patch
Patch1: %{name}-paths.patch
Patch2: %{name}-cflags.patch
+Patch3: %{name}-getline.patch
URL: http://srp.stanford.edu/
BuildRequires: autoconf
BuildRequires: automake
@@ -132,6 +133,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
cd libsrp
@@ -287,6 +289,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2009/08/28 18:56:20 arekm
+- rel 2; build fixed
+
Revision 1.39 2008/11/01 16:34:39 qboosh
- more sane workarounds
- ghost soname symlinks
================================================================
Index: packages/srp/srp-getline.patch
diff -u /dev/null packages/srp/srp-getline.patch:1.1
--- /dev/null Fri Aug 28 20:56:26 2009
+++ packages/srp/srp-getline.patch Fri Aug 28 20:56:20 2009
@@ -0,0 +1,121 @@
+diff -ur srp-2.1.2.org/ftp/ftpd/ftpcmd.c srp-2.1.2/ftp/ftpd/ftpcmd.c
+--- srp-2.1.2.org/ftp/ftpd/ftpcmd.c 2002-02-13 07:49:25.000000000 +0100
++++ srp-2.1.2/ftp/ftpd/ftpcmd.c 2009-08-28 20:53:05.755904638 +0200
+@@ -2071,10 +2071,10 @@
+ #include <arpa/telnet.h>
+
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * getline_srp - a hacked up version of fgets to ignore TELNET escape codes.
+ */
+ char *
+-getline(s, n, iop)
++getline_srp(s, n, iop)
+ char *s;
+ register FILE *iop;
+ {
+@@ -2175,7 +2175,7 @@
+ *s = '\0';
+ return(s);
+ }
+- if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n",
++ if (debug) syslog(LOG_DEBUG, "getline_srp got %d from %s <%s>\n",
+ len, cs, mic?"MIC":"ENC");
+ #ifdef SRP
+ if (strcmp(auth_type, "SRP") == 0)
+@@ -2304,13 +2304,13 @@
+ case CMD:
+ (void) signal(SIGALRM, toolong);
+ (void) alarm((unsigned) timeout);
+- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++ if (getline_srp(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ reply(221, "You could at least say goodbye.");
+ dologout(0);
+ }
+ (void) alarm(0);
+
+- /* If getline() finds an error, the string is null */
++ /* If getline_srp() finds an error, the string is null */
+ if (*cbuf == '\0')
+ continue;
+
+diff -ur srp-2.1.2.org/ftp/ftpd/ftpcmd.y srp-2.1.2/ftp/ftpd/ftpcmd.y
+--- srp-2.1.2.org/ftp/ftpd/ftpcmd.y 2002-02-13 07:48:12.000000000 +0100
++++ srp-2.1.2/ftp/ftpd/ftpcmd.y 2009-08-28 20:53:05.759237045 +0200
+@@ -933,10 +933,10 @@
+ #include <arpa/telnet.h>
+
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * getline_srp - a hacked up version of fgets to ignore TELNET escape codes.
+ */
+ char *
+-getline(s, n, iop)
++getline_srp(s, n, iop)
+ char *s;
+ register FILE *iop;
+ {
+@@ -1037,7 +1037,7 @@
+ *s = '\0';
+ return(s);
+ }
+- if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n",
++ if (debug) syslog(LOG_DEBUG, "getline_srp got %d from %s <%s>\n",
+ len, cs, mic?"MIC":"ENC");
+ #ifdef SRP
+ if (strcmp(auth_type, "SRP") == 0)
+@@ -1166,13 +1166,13 @@
+ case CMD:
+ (void) signal(SIGALRM, toolong);
+ (void) alarm((unsigned) timeout);
+- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++ if (getline_srp(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ reply(221, "You could at least say goodbye.");
+ dologout(0);
+ }
+ (void) alarm(0);
+
+- /* If getline() finds an error, the string is null */
++ /* If getline_srp() finds an error, the string is null */
+ if (*cbuf == '\0')
+ continue;
+
+diff -ur srp-2.1.2.org/ftp/ftpd/ftpd.c srp-2.1.2/ftp/ftpd/ftpd.c
+--- srp-2.1.2.org/ftp/ftpd/ftpd.c 2003-05-16 09:54:33.000000000 +0200
++++ srp-2.1.2/ftp/ftpd/ftpd.c 2009-08-28 20:53:05.765904582 +0200
+@@ -173,7 +173,7 @@
+ extern char *home; /* pointer to home directory for glob */
+ extern FILE *ftpd_popen(), *fopen(), *freopen();
+ extern int ftpd_pclose(), fclose();
+-extern char *getline();
++extern char *getline_srp();
+ extern char cbuf[];
+ extern off_t restart_point;
+
+@@ -1831,7 +1831,7 @@
+ if (!transflag)
+ return;
+ cp = tmpline;
+- if (getline(cp, sizeof(tmpline), stdin) == NULL) {
++ if (getline_srp(cp, sizeof(tmpline), stdin) == NULL) {
+ reply(221, "You could at least say goodbye.");
+ dologout(0);
+ }
+diff -ur srp-2.1.2.org/telnet/telnet/commands.c srp-2.1.2/telnet/telnet/commands.c
+--- srp-2.1.2.org/telnet/telnet/commands.c 2003-06-26 11:43:34.000000000 +0200
++++ srp-2.1.2/telnet/telnet/commands.c 2009-08-28 20:53:05.775905015 +0200
+@@ -3084,12 +3084,12 @@
+ cnt--;
+ tbuf = 0;
+ if (cp == line || *--cp != '\n' || cp == line)
+- goto getline;
++ goto getline_srp;
+ *cp = '\0';
+ if (rlogin == _POSIX_VDISABLE)
+ printf("%s\r\n", line);
+ } else {
+- getline:
++ getline_srp:
+ if (rlogin != _POSIX_VDISABLE)
+ printf("%s> ", prompt);
+ if (fgets(line, sizeof(line), stdin) == NULL) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/srp/srp.spec?r1=1.39&r2=1.40&f=u
More information about the pld-cvs-commit
mailing list