regen patches

This commit is contained in:
naddy 2004-01-14 17:18:12 +00:00
parent 9105616be7
commit d385e92527
16 changed files with 82 additions and 65 deletions

View File

@ -1,11 +0,0 @@
--- abuse/src/net/mac/tcpip.c.orig Fri May 24 17:58:22 1996
+++ abuse/src/net/mac/tcpip.c Sun Nov 7 20:32:54 1999
@@ -119,7 +119,7 @@
else
{
printf("Enter ip address:");
- gets(my_name);
+ fgets(my_name, 99, stdin);
}
}

View File

@ -1,6 +1,7 @@
--- abuse/Makefile.in.orig Wed Jul 9 09:55:21 1997
+++ abuse/Makefile.in Fri Mar 16 18:53:26 2001
@@ -37,10 +37,10 @@
$OpenBSD: patch-abuse_Makefile_in,v 1.1 2004/01/14 17:18:12 naddy Exp $
--- abuse/Makefile.in.orig 1997-07-09 09:55:21.000000000 +0200
+++ abuse/Makefile.in 2004-01-14 18:14:33.000000000 +0100
@@ -37,10 +37,10 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
@ -15,7 +16,7 @@
transform = @program_transform_name@
NORMAL_INSTALL = true
@@ -103,7 +103,7 @@
@@ -103,7 +103,7 @@ INCLUDES = -I$(srcdir)/inc -I$(srcdir)/.
-I$(srcdir)/src/net/inc -I$(srcdir)/src/net/unix
MYDEFS = -DMANAGE_MEM -DNO_CHECK
@ -24,7 +25,7 @@
COMPILE = $(CXX) $(DEFS) $(MYDEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(ADDCXXFLAGS) -o $@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -239,11 +239,11 @@
@@ -239,11 +239,11 @@ maintainer-clean-pkglibPROGRAMS:
install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
@$(NORMAL_INSTALL)

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-abuse_abuse_in,v 1.1 2004/01/14 17:18:12 naddy Exp $
--- abuse/abuse.in.orig 1997-07-09 09:54:43.000000000 +0200
+++ abuse/abuse.in 2004-01-14 18:14:33.000000000 +0100
@@ -27,5 +27,5 @@ export PATH
if [ x$TERM = xlinux ]; then
abuse.console ${1:+"$@"}
else
- abuse.x11R6 ${1:+"$@"}
+ @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"}
fi

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abuse_src_net_mac_tcpip_c,v 1.1 2004/01/14 17:18:12 naddy Exp $
--- abuse/src/net/mac/tcpip.c.orig 1996-05-24 23:58:22.000000000 +0200
+++ abuse/src/net/mac/tcpip.c 2004-01-14 18:14:32.000000000 +0100
@@ -119,7 +119,7 @@ net_address *tcpip_protocol::get_local_a
else
{
printf("Enter ip address:");
- gets(my_name);
+ fgets(my_name, 99, stdin);
}
}

View File

@ -1,9 +0,0 @@
--- abuse/abuse.in.orig Wed Jul 9 00:54:43 1997
+++ abuse/abuse.in Sat Aug 29 04:26:04 1998
@@ -27,5 +27,5 @@
if [ x$TERM = xlinux ]; then
abuse.console ${1:+"$@"}
else
- abuse.x11R6 ${1:+"$@"}
+ @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"}
fi

View File

@ -1,6 +1,7 @@
--- configure.old Mon Jul 7 11:23:01 1997
+++ configure Tue Jun 9 22:24:33 1998
@@ -988,10 +988,10 @@
$OpenBSD: patch-configure,v 1.1 2004/01/14 17:18:12 naddy Exp $
--- configure.orig 1997-07-07 20:23:01.000000000 +0200
+++ configure 2004-01-14 18:14:33.000000000 +0100
@@ -988,10 +988,10 @@ for ac_file in .. $CONFIG_FILES; do if t
top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
@ -15,7 +16,7 @@
echo creating "$ac_file"
rm -f "$ac_file"
@@ -1103,10 +1103,10 @@
@@ -1103,10 +1103,10 @@ if test "$no_recursion" != yes; then
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-filesel_c,v 1.1 2000/07/26 20:57:20 rohee Exp $
$OpenBSD: patch-filesel_c,v 1.2 2004/01/14 17:18:12 naddy Exp $
Match patch-filesel_hpp
--- imlib/filesel.c.orig Wed Jul 26 22:04:25 2000
+++ imlib/filesel.c Wed Jul 26 22:04:55 2000
@@ -108,7 +108,7 @@
--- imlib/filesel.c.orig 1996-04-12 02:06:07.000000000 +0200
+++ imlib/filesel.c 2004-01-14 18:14:33.000000000 +0100
@@ -108,7 +108,7 @@ file_picker::file_picker(int X, int Y, i
reconfigure();
}

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-imlib_Makefile_in,v 1.2 2004/01/14 17:18:12 naddy Exp $
--- imlib/Makefile.in.orig Wed Jul 9 09:55:05 1997
+++ imlib/Makefile.in Fri Mar 16 18:50:57 2001
@@ -102,7 +102,7 @@ EXTRA_libtime_a_SOURCES = port/unix/timi

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-input_c,v 1.1 2000/07/26 20:57:20 rohee Exp $
$OpenBSD: patch-input_c,v 1.2 2004/01/14 17:18:12 naddy Exp $
Match patch-input_hpp
--- imlib/input.c.orig Wed Jul 26 22:10:46 2000
+++ imlib/input.c Wed Jul 26 22:11:41 2000
@@ -318,7 +318,7 @@
--- imlib/input.c.orig 1996-04-12 02:06:11.000000000 +0200
+++ imlib/input.c 2004-01-14 18:14:33.000000000 +0100
@@ -318,7 +318,7 @@ void text_field::area(int &x1, int &y1,
}
text_field::text_field(int X, int Y, int ID, char *Prompt, char *Format,

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-input_hpp,v 1.1 2000/07/26 20:57:21 rohee Exp $
$OpenBSD: patch-input_hpp,v 1.2 2004/01/14 17:18:12 naddy Exp $
"foobar" is now a const char *, so adjust the proto.
--- imlib/include/input.hpp.orig Wed Jul 26 22:08:49 2000
+++ imlib/include/input.hpp Wed Jul 26 22:09:31 2000
@@ -64,7 +64,7 @@
--- imlib/include/input.hpp.orig 1996-04-12 02:08:02.000000000 +0200
+++ imlib/include/input.hpp 2004-01-14 18:14:33.000000000 +0100
@@ -64,7 +64,7 @@ class text_field : public ifield
}
public :
text_field(int X, int Y, int ID, char *Prompt, char *Format,

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-jnet.c,v 1.3 2004/01/14 17:18:12 naddy Exp $
Using the good type to make it compile with g++-2.95.x
--- imlib/port/unix/jnet.c.orig Fri Oct 29 00:07:47 1999
+++ imlib/port/unix/jnet.c Fri Oct 29 00:09:28 1999
@@ -146,7 +146,7 @@
--- imlib/port/unix/jnet.c.orig 1996-05-24 22:48:19.000000000 +0200
+++ imlib/port/unix/jnet.c 2004-01-14 18:14:33.000000000 +0100
@@ -146,7 +146,7 @@ out_socket *unix_in_socket::check_for_co
if (FD_ISSET(fd,&set))
{

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-nfclient.c,v 1.3 2004/01/14 17:18:12 naddy Exp $
Make the method prototypes match the new superclass
--- abuse/src/nfclient.c.orig Fri Oct 29 00:26:21 1999
+++ abuse/src/nfclient.c Fri Oct 29 00:27:59 1999
@@ -32,7 +32,7 @@
--- abuse/src/nfclient.c.orig 1996-04-12 02:12:52.000000000 +0200
+++ abuse/src/nfclient.c 2004-01-14 18:14:33.000000000 +0100
@@ -32,7 +32,7 @@ class nfs_file : public bFILE
virtual int open_failure();
virtual int unbuffered_read(void *buf, size_t count); // returns number of bytes read
int new_read(void *buf, size_t count); // returns number of bytes read
@ -11,7 +13,7 @@ Make the method prototypes match the new superclass
virtual int unbuffered_seek(long offset, int whence); // whence=SEEK_SET, SEEK_CUR, SEEK_END, ret=0=success
virtual int unbuffered_tell();
virtual int file_size();
@@ -143,7 +143,7 @@
@@ -143,7 +143,7 @@ int nfs_file::unbuffered_read(void *buf,
else return 0;
}

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-specs.c,v 1.3 2004/01/14 17:18:12 naddy Exp $
Need const because of stricter type checking with g++-2.95.x...
--- imlib/specs.c.orig Tue Jul 8 12:00:50 1997
+++ imlib/specs.c Thu Oct 28 23:52:45 1999
@@ -180,7 +180,7 @@
--- imlib/specs.c.orig 1997-07-08 12:00:50.000000000 +0200
+++ imlib/specs.c 2004-01-14 18:14:33.000000000 +0100
@@ -180,7 +180,7 @@ int bFILE::read(void *buf, size_t count)
}
@ -11,7 +13,7 @@ Need const because of stricter type checking with g++-2.95.x...
{
if (allow_write_buffering())
{
@@ -359,7 +359,7 @@
@@ -359,7 +359,7 @@ class null_file : public bFILE // th
public :
virtual int open_failure() { return 1; }
virtual int unbuffered_read(void *buf, size_t count) { return 0; }
@ -20,7 +22,7 @@ Need const because of stricter type checking with g++-2.95.x...
virtual int unbuffered_seek(long offset, int whence) { return 0; }
virtual int unbuffered_tell() { return 0; }
@@ -523,7 +523,7 @@
@@ -523,7 +523,7 @@ int jFILE::unbuffered_read(void *buf, si
return len;
}

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-specs.hpp,v 1.3 2004/01/14 17:18:12 naddy Exp $
Need const here...
--- imlib/include/specs.hpp.orig Mon Apr 15 21:25:42 1996
+++ imlib/include/specs.hpp Thu Oct 28 23:47:46 1999
@@ -76,7 +76,7 @@
--- imlib/include/specs.hpp.orig 1996-04-15 21:25:42.000000000 +0200
+++ imlib/include/specs.hpp 2004-01-14 18:14:33.000000000 +0100
@@ -76,7 +76,7 @@ class bFILE // base file type which
int flush_writes(); // returns 0 on failure, else # of bytes written
virtual int unbuffered_read(void *buf, size_t count) = 0;
@ -11,7 +13,7 @@ Need const here...
virtual int unbuffered_tell() = 0;
virtual int unbuffered_seek(long offset, int whence) = 0; // whence=SEEK_SET, SEEK_CUR,
// SEEK_END, ret=0=success
@@ -85,9 +85,9 @@
@@ -85,9 +85,9 @@ class bFILE // base file type which
public :
bFILE();
virtual int open_failure() = 0;
@ -24,7 +26,7 @@ Need const here...
int tell();
virtual int file_size() = 0;
@@ -126,7 +126,7 @@
@@ -126,7 +126,7 @@ public :
jFILE(FILE *file_pointer); // assumes fp is at begining of file
virtual int open_failure() { return fd<0; }
virtual int unbuffered_read(void *buf, size_t count); // returns number of bytes read

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-tcpip.hpp,v 1.3 2004/01/14 17:18:12 naddy Exp $
Use the good type, stricter type checking now...
--- abuse/src/net/mac/tcpip.hpp.orig Tue Jul 8 01:03:29 1997
+++ abuse/src/net/mac/tcpip.hpp Fri Oct 29 00:23:58 1999
@@ -176,7 +176,7 @@
--- abuse/src/net/mac/tcpip.hpp.orig 1997-07-08 01:03:29.000000000 +0200
+++ abuse/src/net/mac/tcpip.hpp 2004-01-14 18:14:33.000000000 +0100
@@ -176,7 +176,7 @@ class tcp_socket : public unix_fd
if (listening)
{
struct sockaddr_in from;
@ -11,7 +13,7 @@ Use the good type, stricter type checking now...
int new_fd=::accept(fd,(sockaddr *)&from,&addr_len);
if (new_fd>=0)
{
@@ -200,7 +200,7 @@
@@ -200,7 +200,7 @@ class udp_socket : public unix_fd
if (addr)
{
*addr=new ip_address;

View File

@ -1,9 +1,11 @@
$OpenBSD: patch-view.c,v 1.3 2004/01/14 17:18:12 naddy Exp $
"foo" is now a 'const char *' in C++ and thus can't be passed to a method
requiring a 'char *'.
--- abuse/src/view.c.orig Wed Oct 20 23:24:07 1999
+++ abuse/src/view.c Wed Oct 20 23:25:13 1999
@@ -179,7 +179,7 @@
--- abuse/src/view.c.orig 1996-04-12 20:20:43.000000000 +0200
+++ abuse/src/view.c 2004-01-14 18:14:33.000000000 +0100
@@ -179,7 +179,7 @@ char *get_login()
#else
char *get_login()