diff options
| -rw-r--r-- | net/socks4/distinfo | 13 | ||||
| -rw-r--r-- | net/socks4/patches/patch-aa | 20 | ||||
| -rw-r--r-- | net/socks4/patches/patch-af | 34 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ah | 21 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ai | 18 | ||||
| -rw-r--r-- | net/socks4/patches/patch-aj | 12 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ak | 20 | ||||
| -rw-r--r-- | net/socks4/patches/patch-al | 12 | ||||
| -rw-r--r-- | net/socks4/patches/patch-am | 12 | ||||
| -rw-r--r-- | net/socks4/patches/patch-an | 13 |
10 files changed, 152 insertions, 23 deletions
diff --git a/net/socks4/distinfo b/net/socks4/distinfo index dba5c6d7a5a..0b63276203b 100644 --- a/net/socks4/distinfo +++ b/net/socks4/distinfo @@ -1,12 +1,19 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 12:14:04 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/12/27 13:48:56 joerg Exp $ SHA1 (export.socks.cstc.4.2.2.tar.gz) = 7d8d041c82213f9fd60f64aadf9c1ade418e15db RMD160 (export.socks.cstc.4.2.2.tar.gz) = 03dc72b80f2223c7462ecf168a0fbbf3effd5223 Size (export.socks.cstc.4.2.2.tar.gz) = 278805 bytes -SHA1 (patch-aa) = f95f67f90ddf1cf0dbf9c56a97dc7eafe1b5bfe5 +SHA1 (patch-aa) = 0ec9255cf3e9a04da5cb035f85e3fbd1ac1c5e45 SHA1 (patch-ab) = fd3f119add1144b24eb2cec578c011bcb397e875 SHA1 (patch-ac) = d3988d7ae5103bd7849305bb555d7cf3b1574ddc SHA1 (patch-ad) = 321d88cf5863f8c3f0b5b3623a1af2c4753f5eb3 SHA1 (patch-ae) = 6bb9ffb57bb45f3a427059ddeee1f8cfd5489ab4 -SHA1 (patch-af) = 5704cb3f03fd3179977c6a2e890578bed0ea19f3 +SHA1 (patch-af) = fc08b324b19be9ea35d8f7c0f59073ac6c0349b7 SHA1 (patch-ag) = 859f310ba8e699c4ac568d1d672f54261f500557 +SHA1 (patch-ah) = 71af7c7706f60f02b7b2fe936cdb7163b0054220 +SHA1 (patch-ai) = 31ab5443177a211f34afebb7c110a5c45a307c25 +SHA1 (patch-aj) = 277772e951c26ad1ff7f767e3a0943b8cad84982 +SHA1 (patch-ak) = a36dea113c30fa951b9eb96e49eb00667a63a868 +SHA1 (patch-al) = d955ca99b0d73b47281144776c09d4380b5d939e +SHA1 (patch-am) = 712ccb9bdc0bebc40e5fa752e6a25944275b33e0 +SHA1 (patch-an) = 23b930373ecc06711cdcb869e5e4b6c8bdb410b4 diff --git a/net/socks4/patches/patch-aa b/net/socks4/patches/patch-aa index 278b4377e0c..4c71304789d 100644 --- a/net/socks4/patches/patch-aa +++ b/net/socks4/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ +$NetBSD: patch-aa,v 1.8 2005/12/27 13:48:56 joerg Exp $ ---- Makefile.orig Wed Sep 6 22:24:02 1995 +--- Makefile.orig 1995-09-07 02:24:02.000000000 +0000 +++ Makefile @@ -3,9 +3,11 @@ @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ # If the second definition of SOCKS is used, you MUST also # define SHORTENED_RBIND -@@ -19,7 +21,7 @@ +@@ -19,7 +21,7 @@ SHORTENED_RBIND=-DSHORTENED_RBIND # It should be this current directory. # If your system has getcwd() but no getwd(), uncomment the next line: @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ #If your system doesn't have waitpid(), uncomment the nextline: #NO_WAITPID=-DNO_WAITPID -@@ -43,15 +45,15 @@ +@@ -43,15 +45,15 @@ TRY_PASV=-DTRY_PASV # Define RCMD and SUPPORT_RCMD if you want to support Rrcmd, which is required # for SOCKSified rlogin, rsh, and rcp. @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ #OPTIMIZE=-O # Be careful with the OPTIMIZE flag. SunPro's SC2.0.1, for example, is # knwon to produce incorrect code when -O is used. -@@ -73,13 +75,13 @@ +@@ -73,13 +75,13 @@ OPTIMIZE=-g #BIND_RESOLVER=-DBIND_RESOLVER # Directory into which to install the man pages @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ # SunOS 4.1.x should use #CC=cc -@@ -103,13 +105,13 @@ +@@ -103,13 +105,13 @@ CLIENTS_BIN_DIR = /usr/local/bin #GETPASS=getpass.o # IRIX 5 should use @@ -81,7 +81,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ # Ultrix 4.0 should use #CC=cc -@@ -156,13 +158,15 @@ +@@ -156,13 +158,15 @@ GETPASS=getpass.o #GETPASS= # SOLARIS should use @@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ # Interactive Systems Unix should use #OTHER_CFLAGS = -DISC -DSVR3 -Dindex=strchr -Drindex=strrchr -D_XOPEN_SOURCE -DGETCWD $(FASCIST) $(SHORTENED_RBIND) -DCOMPAT $(TRY_PASV) -@@ -174,13 +178,15 @@ +@@ -174,13 +178,15 @@ GETPASS=getpass.o #RESOLV_LIB=-linet -lc_s # netBSD should use @@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ -#INSTALL=install -#GETPASS= -#RESOLV_LIB= -+.if ${OPSYS} == "NetBSD" ++.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" +OTHER_CFLAGS = $(GETCWD) $(SHORTENED_RBIND) $(FASCIST) $(TRY_PASV) -Dunix=1 +CC=cc +RANLIB=ranlib @@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $ # FreeBSD should use: #CC=cc -@@ -413,3 +419,11 @@ +@@ -413,3 +419,11 @@ clean: ( cd $$i ; $(MAKE) clean) done diff --git a/net/socks4/patches/patch-af b/net/socks4/patches/patch-af index 36bffa3fa8e..424c6fb1992 100644 --- a/net/socks4/patches/patch-af +++ b/net/socks4/patches/patch-af @@ -1,10 +1,8 @@ -$NetBSD: patch-af,v 1.2 2004/09/08 15:03:15 sketch Exp $ +$NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $ -Solaris 2.6 appears to have herror(), so don't redefine it. - ---- rftp/ftp.c.orig 1995-09-07 03:24:03.000000000 +0100 -+++ rftp/ftp.c 2004-09-08 15:55:37.000000000 +0100 -@@ -74,7 +74,7 @@ +--- rftp/ftp.c.orig 1995-09-07 02:24:03.000000000 +0000 ++++ rftp/ftp.c +@@ -74,7 +74,7 @@ static char sccsid[] = "@(#)ftp.c 5.38 ( #include <netdb.h> #include <fcntl.h> #include <pwd.h> @@ -13,7 +11,13 @@ Solaris 2.6 appears to have herror(), so don't redefine it. #ifdef FASCIST #include <syslog.h> -@@ -112,7 +112,7 @@ +@@ -107,12 +107,12 @@ unsigned long socks_bind_remoteAddr; /* + int pasvmode = 0; + + extern char *strerror(); +-extern int connected, errno; ++extern int connected; + FILE *cin, *cout; FILE *dataconn(); @@ -22,12 +26,22 @@ Solaris 2.6 appears to have herror(), so don't redefine it. /* >>> YDL */ #if !defined(BSD) || (BSD - 43 <= 0) -@@ -358,11 +358,9 @@ +@@ -158,6 +158,8 @@ herror(s) + + #endif /* !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) */ + ++int command(char *fmt, ...); ++ + + char * + hookup(host, port) +@@ -358,11 +360,10 @@ cmdabort() } /*VARARGS*/ -command(va_alist) -va_dcl ++int +command(char *fmt, ...) { va_list ap; @@ -35,7 +49,7 @@ Solaris 2.6 appears to have herror(), so don't redefine it. int r; sig_t oldintr; void cmdabort(); -@@ -370,8 +368,7 @@ +@@ -370,8 +371,7 @@ va_dcl abrtflag = 0; if (debug) { printf("---> "); @@ -45,7 +59,7 @@ Solaris 2.6 appears to have herror(), so don't redefine it. if (strncmp("PASS ", fmt, 5) == 0) printf("PASS XXXX"); else -@@ -386,8 +383,7 @@ +@@ -386,8 +386,7 @@ va_dcl return (0); } oldintr = signal(SIGINT, cmdabort); diff --git a/net/socks4/patches/patch-ah b/net/socks4/patches/patch-ah new file mode 100644 index 00000000000..359f9f086e1 --- /dev/null +++ b/net/socks4/patches/patch-ah @@ -0,0 +1,21 @@ +$NetBSD: patch-ah,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- lib/Rconnect.c.orig 2005-12-18 19:23:30.000000000 +0000 ++++ lib/Rconnect.c +@@ -2,7 +2,7 @@ + #include <sys/time.h> + #include <sys/socket.h> + #include <netinet/in.h> +-#include <sys/errno.h> ++#include <errno.h> + #if defined(ISC) + #include <net/errno.h> + #endif /* #if defined(ISC) */ +@@ -40,7 +40,6 @@ char *socks_serverlist; + + char socks_cmd[] = "connect"; + +-extern int errno; + extern char *getenv(); + extern char *getlogin(); + static struct sockaddr_in cursin; diff --git a/net/socks4/patches/patch-ai b/net/socks4/patches/patch-ai new file mode 100644 index 00000000000..c2cd92883c8 --- /dev/null +++ b/net/socks4/patches/patch-ai @@ -0,0 +1,18 @@ +$NetBSD: patch-ai,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- lib/SendGetDst.c.orig 2005-12-18 19:24:40.000000000 +0000 ++++ lib/SendGetDst.c +@@ -4,12 +4,11 @@ + #endif /* #if defined(ISC) */ + #include <sys/time.h> + #include <syslog.h> +-#include <sys/errno.h> ++#include <errno.h> + #if defined(ISC) + #include <net/errno.h> + #endif /* #if defined(ISC) */ + #include "socks.h" +-extern int errno; + + #define NULL ((char *)0) + diff --git a/net/socks4/patches/patch-aj b/net/socks4/patches/patch-aj new file mode 100644 index 00000000000..0726b6378c9 --- /dev/null +++ b/net/socks4/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- rfinger/finger.c.orig 1995-02-21 22:30:11.000000000 +0000 ++++ rfinger/finger.c +@@ -14,7 +14,6 @@ + #endif /* #if defined(ISC) */ + #include "socks.h" + +-extern int errno; + extern char *strrchr(); + char *Progname; + extern char *getenv(); diff --git a/net/socks4/patches/patch-ak b/net/socks4/patches/patch-ak new file mode 100644 index 00000000000..c237cbf998b --- /dev/null +++ b/net/socks4/patches/patch-ak @@ -0,0 +1,20 @@ +$NetBSD: patch-ak,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- rftp/ftp_var.h.orig 1994-08-22 19:52:16.000000000 +0000 ++++ rftp/ftp_var.h +@@ -136,14 +136,13 @@ extern char *tail(); + extern char *index(); + extern char *rindex(); + extern char *remglob(); +-extern int errno; + extern char *mktemp(); + extern char *strncpy(); + extern char *strncat(); + extern char *strcat(); + extern char *strcpy(); + +-#if defined (COMPAT) || defined (ultrix) || defined(SCO) ++#if !defined(__DragonFly__) && (defined (COMPAT) || defined (ultrix) || defined(SCO)) + typedef void (*sig_t)(); + + static char *strerror(errnum) { diff --git a/net/socks4/patches/patch-al b/net/socks4/patches/patch-al new file mode 100644 index 00000000000..f17a5bbf425 --- /dev/null +++ b/net/socks4/patches/patch-al @@ -0,0 +1,12 @@ +$NetBSD: patch-al,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- rftp/glob.c.orig 1994-10-17 20:21:37.000000000 +0000 ++++ rftp/glob.c +@@ -82,7 +82,6 @@ static int tglob(); + char **ftpglob(); + char *globerr; + char *home; +-extern int errno; + static char *strspl(), *strend(); + char **copyblk(); + diff --git a/net/socks4/patches/patch-am b/net/socks4/patches/patch-am new file mode 100644 index 00000000000..5dc37eafa8d --- /dev/null +++ b/net/socks4/patches/patch-am @@ -0,0 +1,12 @@ +$NetBSD: patch-am,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- rftp/cmds.c.orig 2005-12-18 19:30:53.000000000 +0000 ++++ rftp/cmds.c +@@ -80,7 +80,6 @@ extern char *getenv(); + extern char *index(); + extern char *rindex(); + extern char *strerror(); +-extern int errno; + extern off_t restart_point; + extern char reply_string[]; + diff --git a/net/socks4/patches/patch-an b/net/socks4/patches/patch-an new file mode 100644 index 00000000000..1fd201b2798 --- /dev/null +++ b/net/socks4/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2005/12/27 13:48:56 joerg Exp $ + +--- rtelnet/telnet/externs.h.orig 2005-12-18 19:47:51.000000000 +0000 ++++ rtelnet/telnet/externs.h +@@ -73,8 +73,6 @@ typedef unsigned char cc_t; + + #define SUBBUFSIZE 256 + +-extern int errno; /* outside this world */ +- + #if !defined(P) + # ifdef __STDC__ + # define P(x) x |