diff options
Diffstat (limited to 'net/socks4/patches')
| -rw-r--r-- | net/socks4/patches/patch-aa | 16 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ag | 98 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ao | 21 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ap | 22 | ||||
| -rw-r--r-- | net/socks4/patches/patch-aq | 20 | ||||
| -rw-r--r-- | net/socks4/patches/patch-ar | 67 | ||||
| -rw-r--r-- | net/socks4/patches/patch-as | 13 |
7 files changed, 243 insertions, 14 deletions
diff --git a/net/socks4/patches/patch-aa b/net/socks4/patches/patch-aa index 4c71304789d..78625be00ab 100644 --- a/net/socks4/patches/patch-aa +++ b/net/socks4/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2005/12/27 13:48:56 joerg Exp $ +$NetBSD: patch-aa,v 1.9 2009/02/08 00:16:00 joerg Exp $ ---- Makefile.orig 1995-09-07 02:24:02.000000000 +0000 +--- Makefile.orig 1995-09-07 04:24:02.000000000 +0200 +++ Makefile @@ -3,9 +3,11 @@ @@ -48,15 +48,15 @@ $NetBSD: patch-aa,v 1.8 2005/12/27 13:48:56 joerg Exp $ # Directory into which to install the man pages -MAN_DEST_DIR = /usr/local/man -+MAN_DEST_DIR = ${PREFIX}/man ++MAN_DEST_DIR = ${DESTDIR}${PREFIX}/man # Directory into which the SOCKS server should be installed -SERVER_BIN_DIR = /usr/etc -+SERVER_BIN_DIR = ${PREFIX}/libexec ++SERVER_BIN_DIR = ${DESTDIR}${PREFIX}/libexec # Directory into the client programs should be installed -CLIENTS_BIN_DIR = /usr/local/bin -+CLIENTS_BIN_DIR = ${PREFIX}/bin ++CLIENTS_BIN_DIR = ${DESTDIR}${PREFIX}/bin # SunOS 4.1.x should use #CC=cc @@ -131,10 +131,10 @@ $NetBSD: patch-aa,v 1.8 2005/12/27 13:48:56 joerg Exp $ +install.conf: -+ ${INSTALL} -m 0644 socks.conf ${PREFIX}/share/examples/socks4 ++ ${INSTALL} -m 0644 socks.conf ${DESTDIR}${PREFIX}/share/examples/socks4 + +install.lib: -+ ${INSTALL} -m 0644 lib/libsocks.a ${PREFIX}/lib/libsocks4.a -+ ${RANLIB} ${PREFIX}/lib/libsocks4.a ++ ${INSTALL} -m 0644 lib/libsocks.a ${DESTDIR}${PREFIX}/lib/libsocks4.a ++ ${RANLIB} ${DESTDIR}${PREFIX}/lib/libsocks4.a + +install: install.server install.clients install.man install.conf install.lib diff --git a/net/socks4/patches/patch-ag b/net/socks4/patches/patch-ag index 431befab4f9..5bfc4acceb1 100644 --- a/net/socks4/patches/patch-ag +++ b/net/socks4/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2004/09/08 15:03:15 sketch Exp $ +$NetBSD: patch-ag,v 1.2 2009/02/08 00:16:00 joerg Exp $ ---- rtelnet/telnet/commands.c.orig 1995-02-25 00:36:16.000000000 +0000 -+++ rtelnet/telnet/commands.c 2004-09-08 15:57:55.000000000 +0100 -@@ -43,7 +43,7 @@ +--- rtelnet/telnet/commands.c.orig 1995-02-25 01:36:16.000000000 +0100 ++++ rtelnet/telnet/commands.c +@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)commands.c 5 #include <netdb.h> #include <ctype.h> #include <pwd.h> @@ -11,16 +11,102 @@ $NetBSD: patch-ag,v 1.1 2004/09/08 15:03:15 sketch Exp $ #include <errno.h> #if defined(ISC) #include <net/errno.h> -@@ -112,7 +112,7 @@ +@@ -112,7 +112,16 @@ extern int isprefix(); extern char **genget(); extern int Ambiguous(); -static call(); +static int call(void *, ...); ++static int help(int argc, char *argvp[]); ++static int send_esc(); ++ ++#ifndef SOLARIS ++static void send_do(); ++static void send_dont(); ++static void send_will(); ++static void send_wont(); ++#endif typedef struct { char *name; /* command name */ -@@ -2345,17 +2345,15 @@ +@@ -265,7 +274,7 @@ struct sendlist { + }; + + +-extern int ++static int + send_esc P((void)), + send_help P((void)), + send_docmd P((char *)), +@@ -406,9 +415,6 @@ send_esc() + send_docmd(name) + char *name; + { +-#ifndef SOLARIS +- void send_do(); +-#endif + return(send_tncmd(send_do, "do", name)); + } + +@@ -416,27 +422,18 @@ send_docmd(name) + send_dontcmd(name) + char *name; + { +-#ifndef SOLARIS +- void send_dont(); +-#endif + return(send_tncmd(send_dont, "dont", name)); + } + static int + send_willcmd(name) + char *name; + { +-#ifndef SOLARIS +- void send_will(); +-#endif + return(send_tncmd(send_will, "will", name)); + } + static int + send_wontcmd(name) + char *name; + { +-#ifndef SOLARIS +- void send_wont(); +-#endif + return(send_tncmd(send_wont, "wont", name)); + } + +@@ -635,9 +632,9 @@ togxbinary(val) + } + + +-extern int togglehelp P((void)); ++static int togglehelp P((void)); + #if defined(AUTHENTICATE) +-extern int auth_togdebug P((int)); ++static int auth_togdebug P((int)); + #endif + + struct togglelist { +@@ -1477,7 +1474,7 @@ struct slclist { + int arg; + }; + +-extern void slc_help(); ++static void slc_help(); + + struct slclist SlcList[] = { + { "export", "Use local special character definitions", +@@ -1555,7 +1552,7 @@ struct envlist { + + extern struct env_lst * + env_define P((unsigned char *, unsigned char *)); +-extern void ++static void + env_undefine P((unsigned char *)), + env_export P((unsigned char *)), + env_unexport P((unsigned char *)), +@@ -2345,17 +2342,15 @@ static Command cmdtab2[] = { /*VARARGS1*/ static diff --git a/net/socks4/patches/patch-ao b/net/socks4/patches/patch-ao new file mode 100644 index 00000000000..871c17c5301 --- /dev/null +++ b/net/socks4/patches/patch-ao @@ -0,0 +1,21 @@ +$NetBSD: patch-ao,v 1.1 2009/02/08 00:16:00 joerg Exp $ + +--- lib/check_cconf.c.orig 1995-02-10 21:22:51.000000000 +0100 ++++ lib/check_cconf.c +@@ -29,6 +29,7 @@ extern char *socks_serverlist; + static struct config *confPtr, **confNtries = NULL; + static int Ntries = 0; + static int no_conf = 0; ++static int read_cconf(void); + + socks_check_cconf(src, dst) + /* Return 0 if sockd should be used, +@@ -84,7 +85,7 @@ GotIt: + + } + +-static read_cconf() ++static read_cconf(void) + { + FILE *fd; + static char buf[1024]; diff --git a/net/socks4/patches/patch-ap b/net/socks4/patches/patch-ap new file mode 100644 index 00000000000..46b8e3f27d7 --- /dev/null +++ b/net/socks4/patches/patch-ap @@ -0,0 +1,22 @@ +$NetBSD: patch-ap,v 1.1 2009/02/08 00:16:00 joerg Exp $ + +--- lib/check_user.c.orig 2009-02-08 00:44:57.000000000 +0100 ++++ lib/check_user.c +@@ -19,6 +19,7 @@ + #include "bstring.h" + #endif + ++static int check_userfile(char *userfile, char *src_user); + + /* + * These functions are used by both Validate (for sockd) +@@ -147,8 +148,7 @@ char *userlist, *src_user; + #include <string.h> + #include <syslog.h> + +-static int check_userfile(userfile, src_user) +-char *userfile, *src_user; ++static int check_userfile(char *userfile, char *src_user) + /* return 1 if match, 0 otherwise */ + /* return -1 if cannot open file */ + { diff --git a/net/socks4/patches/patch-aq b/net/socks4/patches/patch-aq new file mode 100644 index 00000000000..d3df42cf88c --- /dev/null +++ b/net/socks4/patches/patch-aq @@ -0,0 +1,20 @@ +$NetBSD: patch-aq,v 1.1 2009/02/08 00:16:00 joerg Exp $ + +--- rftp/ruserpass.c.orig 2009-02-08 01:01:36.000000000 +0100 ++++ rftp/ruserpass.c +@@ -65,6 +65,7 @@ static FILE *cfile; + #define MACH 11 + + static char tokval[100]; ++static int token(); + + static struct toktab { + char *tokstr; +@@ -87,7 +88,6 @@ ruserpass(host, aname, apass, aacct) + char myname[MAXHOSTNAMELEN], *mydomain; + int t, i, c, usedefault = 0; + struct stat stb; +- static int token(); + + hdir = getenv("HOME"); + if (hdir == NULL) diff --git a/net/socks4/patches/patch-ar b/net/socks4/patches/patch-ar new file mode 100644 index 00000000000..1ae428ee75d --- /dev/null +++ b/net/socks4/patches/patch-ar @@ -0,0 +1,67 @@ +$NetBSD: patch-ar,v 1.1 2009/02/08 00:16:00 joerg Exp $ + +--- rtelnet/telnet/sys_bsd.c.orig 1995-02-25 01:16:07.000000000 +0100 ++++ rtelnet/telnet/sys_bsd.c +@@ -66,6 +66,8 @@ static char sccsid[] = "@(#)sys_bsd.c 5. + #define SIG_FUNC_RET int + #endif + ++extern int termdata; ++ + int + tout, /* Output file descriptor */ + tin, /* Input file descriptor */ +@@ -121,6 +123,19 @@ struct termio old_tc = { 0 }; + + static fd_set ibits, obits, xbits; + ++#if defined(SOLARIS) || defined(_SEQUENT_) ++static void xmitAO(), xmitEL(), xmitEC(); ++#else ++static void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk(); ++#endif ++ ++#ifdef SIGTSTP ++static SIG_FUNC_RET susp(); ++#endif /* SIGTSTP */ ++#ifdef SIGINFO ++static SIG_FUNC_RET ayt(); ++static SIG_FUNC_RET ayt_status(); ++#endif /* SIGINFO */ + + void + init_sys() +@@ -187,11 +202,6 @@ extern int kludgelinemode; + TerminalSpecialChars(c) + int c; + { +-#if defined(SOLARIS) || defined(_SEQUENT_) +- void xmitAO(), xmitEL(), xmitEC(); +-#else +- void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk(); +-#endif + + if (c == termIntChar) { + intp(); +@@ -616,12 +626,6 @@ TerminalNewMode(f) + } + + if (f != -1) { +-#ifdef SIGTSTP +- static SIG_FUNC_RET susp(); +-#endif /* SIGTSTP */ +-#ifdef SIGINFO +- static SIG_FUNC_RET ayt(); +-#endif /* SIGINFO */ + + #ifdef SIGTSTP + (void) signal(SIGTSTP, susp); +@@ -669,8 +673,6 @@ TerminalNewMode(f) + #endif + } else { + #ifdef SIGINFO +- SIG_FUNC_RET ayt_status(); +- + (void) signal(SIGINFO, ayt_status); + #endif /* SIGINFO */ + diff --git a/net/socks4/patches/patch-as b/net/socks4/patches/patch-as new file mode 100644 index 00000000000..6ae66afbffb --- /dev/null +++ b/net/socks4/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2009/02/08 00:16:00 joerg Exp $ + +--- rtelnet/Makefile.orig 2009-02-08 01:06:41.000000000 +0100 ++++ rtelnet/Makefile +@@ -91,7 +91,7 @@ all: echocwd + cd telnet; ${MAKE} ${OS} CC="${CC}" OTHER_CFLAGS="$(OTHER_CFLAGS)" SOCKS="${SOCKS}" SOCKS_LIB=${SOCKS_LIB} RESOLV_LIB="${RESOLV_LIB}" OPTIMIZE="${OPTIMIZE}" + + install: echocwd rtelnet +- $(INSTALL) -s -o bin -g bin -m 111 rtelnet ${CLIENTS_BIN_DIR} ++ ${INSTALL} -m 555 rtelnet ${CLIENTS_BIN_DIR} + + install.man: echocwd + $(INSTALL) -m 444 ../doc/socks_clients.1 $(MAN_DEST_DIR)/man1 |