OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jan-2006 14:43:43
Branch: HEAD Handle: 2006012313434300
Modified files:
openpkg-src/inetutils inetutils.patch inetutils.spec
Log:
fix two gcc hickups, that eventually depend on gcc4 ?
Summary:
Revision Changes Path
1.2 +64 -0 openpkg-src/inetutils/inetutils.patch
1.11 +1 -1 openpkg-src/inetutils/inetutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/inetutils/inetutils.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 inetutils.patch
--- openpkg-src/inetutils/inetutils.patch 12 Sep 2003 14:30:29 -0000
1.1
+++ openpkg-src/inetutils/inetutils.patch 23 Jan 2006 13:43:43 -0000
1.2
@@ -64,3 +64,67 @@
/*
* p_error prints the system error message on the standard location
+Index: libinetutils/ttymsg.c
+--- libinetutils/ttymsg.c.orig 2001-11-01 16:52:19 +0100
++++ libinetutils/ttymsg.c 2006-01-23 11:52:04 +0100
+@@ -132,7 +132,7 @@
+ }
+ if (wret)
+ {
+- (char *)iov->iov_base += wret;
++ iov->iov_base += wret;
+ iov->iov_len -= wret;
+ }
+ continue;
+Index: ftp/ftp_var.h
+--- ftp/ftp_var.h.orig 2000-07-08 03:00:53 +0200
++++ ftp/ftp_var.h 2006-01-23 14:39:09 +0100
+@@ -36,6 +36,24 @@
+ #include <sys/param.h>
+ #include <setjmp.h>
+
++/*
++ * Format of command table.
++ */
++struct cmd {
++ char *c_name; /* name of command */
++ char *c_help; /* help string */
++ char c_bell; /* give bell when command completes */
++ char c_conn; /* must be connected to use command */
++ char c_proxy; /* proxy server may execute */
++ void (*c_handler) __P((int, char **)); /* function to call */
++};
++
++struct macel {
++ char mac_name[9]; /* macro name */
++ char *mac_start; /* start of macro in macbuf */
++ char *mac_end; /* end of macro in macbuf */
++};
++
+ #include "extern.h"
+
+ #ifndef FTP_EXTERN
+@@ -108,23 +126,6 @@
+
+ FTP_EXTERN int options; /* used during socket creation */
+
+-/*
+- * Format of command table.
+- */
+-struct cmd {
+- char *c_name; /* name of command */
+- char *c_help; /* help string */
+- char c_bell; /* give bell when command completes */
+- char c_conn; /* must be connected to use command */
+- char c_proxy; /* proxy server may execute */
+- void (*c_handler) __P((int, char **)); /* function to call */
+-};
+-
+-struct macel {
+- char mac_name[9]; /* macro name */
+- char *mac_start; /* start of macro in macbuf */
+- char *mac_end; /* end of macro in macbuf */
+-};
+
+ FTP_EXTERN int macnum; /* number of defined macros */
+ FTP_EXTERN struct macel macros[16];
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inetutils/inetutils.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 inetutils.spec
--- openpkg-src/inetutils/inetutils.spec 1 Jan 2006 13:14:42 -0000
1.10
+++ openpkg-src/inetutils/inetutils.spec 23 Jan 2006 13:43:43 -0000
1.11
@@ -35,7 +35,7 @@
Group: Network
License: GPL
Version: 1.4.2
-Release: 20050910
+Release: 20060123
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
