pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/socks4 varargs->stdarg, fixes build with GCC3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b95e39bf181
branches: trunk
changeset: 480409:2b95e39bf181
user: sketch <sketch%pkgsrc.org@localhost>
date: Wed Sep 08 15:03:15 2004 +0000
description:
varargs->stdarg, fixes build with GCC3.
Add dante to CONFLICTS as they install files with the same name (dante already
has socks4 in its own CONFLICTS).
diffstat:
net/socks4/Makefile | 4 +-
net/socks4/distinfo | 5 ++-
net/socks4/patches/patch-af | 48 ++++++++++++++++++++++++++++++++++++++++++--
net/socks4/patches/patch-ag | 43 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 93 insertions(+), 7 deletions(-)
diffs (143 lines):
diff -r b145000ea116 -r 2b95e39bf181 net/socks4/Makefile
--- a/net/socks4/Makefile Wed Sep 08 14:33:01 2004 +0000
+++ b/net/socks4/Makefile Wed Sep 08 15:03:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/18 14:25:04 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/09/08 15:03:15 sketch Exp $
#
DISTNAME= export.socks.cstc.4.2.2
@@ -11,7 +11,7 @@
HOMEPAGE= http://www.socks.nec.com/socksv4.html
COMMENT= Old library, server and client for using proxy firewall software
-CONFLICTS= socks5-[0-9]*
+CONFLICTS= socks5-[0-9]* dante*
LICENSE= no-commercial-use
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff -r b145000ea116 -r 2b95e39bf181 net/socks4/distinfo
--- a/net/socks4/distinfo Wed Sep 08 14:33:01 2004 +0000
+++ b/net/socks4/distinfo Wed Sep 08 15:03:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/05/01 22:03:49 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/09/08 15:03:15 sketch Exp $
SHA1 (export.socks.cstc.4.2.2.tar.gz) = 7d8d041c82213f9fd60f64aadf9c1ade418e15db
Size (export.socks.cstc.4.2.2.tar.gz) = 278805 bytes
@@ -7,4 +7,5 @@
SHA1 (patch-ac) = d3988d7ae5103bd7849305bb555d7cf3b1574ddc
SHA1 (patch-ad) = 321d88cf5863f8c3f0b5b3623a1af2c4753f5eb3
SHA1 (patch-ae) = 6bb9ffb57bb45f3a427059ddeee1f8cfd5489ab4
-SHA1 (patch-af) = a45528fcd2d4526e7c4b5dcd1519368aa40a3056
+SHA1 (patch-af) = 5704cb3f03fd3179977c6a2e890578bed0ea19f3
+SHA1 (patch-ag) = 859f310ba8e699c4ac568d1d672f54261f500557
diff -r b145000ea116 -r 2b95e39bf181 net/socks4/patches/patch-af
--- a/net/socks4/patches/patch-af Wed Sep 08 14:33:01 2004 +0000
+++ b/net/socks4/patches/patch-af Wed Sep 08 15:03:15 2004 +0000
@@ -1,9 +1,18 @@
-$NetBSD: patch-af,v 1.1 1999/08/05 13:09:28 agc Exp $
+$NetBSD: patch-af,v 1.2 2004/09/08 15:03:15 sketch Exp $
Solaris 2.6 appears to have herror(), so don't redefine it.
---- rftp/ftp.c 1999/08/05 12:56:00 1.1
-+++ rftp/ftp.c 1999/08/05 12:56:45
+--- 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 @@
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+
+ #ifdef FASCIST
+ #include <syslog.h>
@@ -112,7 +112,7 @@
FILE *cin, *cout;
FILE *dataconn();
@@ -13,3 +22,36 @@
/* >>> YDL */
#if !defined(BSD) || (BSD - 43 <= 0)
+@@ -358,11 +358,9 @@
+ }
+
+ /*VARARGS*/
+-command(va_alist)
+-va_dcl
++command(char *fmt, ...)
+ {
+ va_list ap;
+- char *fmt;
+ int r;
+ sig_t oldintr;
+ void cmdabort();
+@@ -370,8 +368,7 @@
+ abrtflag = 0;
+ if (debug) {
+ printf("---> ");
+- va_start(ap);
+- fmt = va_arg(ap, char *);
++ va_start(ap, fmt);
+ if (strncmp("PASS ", fmt, 5) == 0)
+ printf("PASS XXXX");
+ else
+@@ -386,8 +383,7 @@
+ return (0);
+ }
+ oldintr = signal(SIGINT, cmdabort);
+- va_start(ap);
+- fmt = va_arg(ap, char *);
++ va_start(ap, fmt);
+ vfprintf(cout, fmt, ap);
+ va_end(ap);
+ fprintf(cout, "\r\n");
diff -r b145000ea116 -r 2b95e39bf181 net/socks4/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/socks4/patches/patch-ag Wed Sep 08 15:03:15 2004 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-ag,v 1.1 2004/09/08 15:03:15 sketch 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 @@
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ #if defined(ISC)
+ #include <net/errno.h>
+@@ -112,7 +112,7 @@
+ extern char **genget();
+ extern int Ambiguous();
+
+-static call();
++static int call(void *, ...);
+
+ typedef struct {
+ char *name; /* command name */
+@@ -2345,17 +2345,15 @@
+
+ /*VARARGS1*/
+ static
+-call(va_alist)
+- va_dcl
++call(void *func, ...)
+ {
+ va_list ap;
+ typedef int (*intrtn_t)();
+- intrtn_t routine;
++ intrtn_t routine = (intrtn_t) func;
+ char *args[100];
+ int argno = 0;
+
+- va_start(ap);
+- routine = (va_arg(ap, intrtn_t));
++ va_start(ap, func);
+ while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ ;
+ }
Home |
Main Index |
Thread Index |
Old Index