From f8fad516b36ff1fea06504c7da6bc59cc1c4af68 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 18 Dec 2005 18:37:16 +0000 Subject: Deorbit some pre-ANSI crap which breaks on DragonFly: - errno from errno.h - calloc and malloc from stdlib.h - strdup from string.h --- net/yale-tftpd/distinfo | 8 ++++---- net/yale-tftpd/patches/patch-ad | 35 ++++++++++++++++++----------------- net/yale-tftpd/patches/patch-ae | 12 ++++++++++-- net/yale-tftpd/patches/patch-af | 15 +++++++++++++-- 4 files changed, 45 insertions(+), 25 deletions(-) (limited to 'net/yale-tftpd') diff --git a/net/yale-tftpd/distinfo b/net/yale-tftpd/distinfo index 02659d37165..72ddc205063 100644 --- a/net/yale-tftpd/distinfo +++ b/net/yale-tftpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 12:14:07 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/12/18 18:37:16 joerg Exp $ SHA1 (yale-tftpd-3.0.tar.gz) = 5f87e3d37feb5c5c8b7f2db34a0c87ee537727af RMD160 (yale-tftpd-3.0.tar.gz) = 207b88c4383b283e3c0d81a50061a65513031854 @@ -6,9 +6,9 @@ Size (yale-tftpd-3.0.tar.gz) = 33469 bytes SHA1 (patch-aa) = e6e9b368db8f70bdb4fbb2a1b032bd4ce66206f2 SHA1 (patch-ab) = e6eb66ed95139b47ee1df07014a636803e89ad47 SHA1 (patch-ac) = bd44bf8d19079e1a74850dbcc8cfea3d82f36c3e -SHA1 (patch-ad) = fba4253b24ad9950508736288c52bee421d95189 -SHA1 (patch-ae) = 0b431f5a4f769dbc560fc55231ea2cf478616987 -SHA1 (patch-af) = c6815c58d6ce91dbe0478cbb4fcf0c01126b3c4a +SHA1 (patch-ad) = 50f41566a0f985719a54c9f3d96d48b69ab1fa2d +SHA1 (patch-ae) = 61ae35f5e8d5d8f3cd60ba515a925a4098628fb1 +SHA1 (patch-af) = 028ffa7fb05d3961d4cedd979e5ea130f19f7489 SHA1 (patch-ag) = 7e14bea74c2d94222cc5f13b03b7735fbe442487 SHA1 (patch-ah) = 623a09bbb11ae354007cd90e55a98dea3555ec68 SHA1 (patch-ai) = 1b216b650d1d31c403f0bc7f32009e9d7c92186a diff --git a/net/yale-tftpd/patches/patch-ad b/net/yale-tftpd/patches/patch-ad index 2862f1864b0..64de776271e 100644 --- a/net/yale-tftpd/patches/patch-ad +++ b/net/yale-tftpd/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ +$NetBSD: patch-ad,v 1.3 2005/12/18 18:37:16 joerg Exp $ ---- tftpd.c.orig Mon Mar 20 21:14:39 1995 +--- tftpd.c.orig 1995-03-20 20:14:39.000000000 +0000 +++ tftpd.c -@@ -56,6 +56,8 @@ +@@ -56,17 +56,18 @@ static char sccsid[] = "@(#)tftpd.c 5.12 #include #include @@ -10,8 +10,9 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ + #define TIMEOUT 5 - extern int errno; -@@ -66,9 +68,9 @@ +-extern int errno; + struct sockaddr_in sock_in = { AF_INET }; + int peer; int rexmtval = TIMEOUT; int maxtimeout = 5*TIMEOUT; @@ -24,7 +25,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ struct sockaddr_in from; int fromlen; -@@ -105,6 +107,8 @@ +@@ -105,6 +106,8 @@ char **argv; if (argc > 1 && strcmp (argv[1], "-d") == 0) { setUpForDebugging(); @@ -33,7 +34,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ } if (ioctl(0, FIONBIO, &on) < 0) { syslog(LOG_ERR, "ioctl(FIONBIO): %m\n"); -@@ -202,7 +206,7 @@ +@@ -202,7 +205,7 @@ setUpForDebugging() awaitInput(chan) int chan; { @@ -42,7 +43,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ int nready; struct timeval tv; extern int maxInputWait; -@@ -212,8 +216,9 @@ +@@ -212,8 +215,9 @@ int chan; else tv.tv_sec = 5*60; /* default: wait for 5 minutes */ tv.tv_usec = 0; @@ -54,7 +55,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ return nready; } -@@ -294,7 +299,10 @@ +@@ -294,7 +298,10 @@ int n; } int validate_access(); @@ -66,7 +67,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ struct formats { char *f_mode; -@@ -303,8 +311,8 @@ +@@ -303,8 +310,8 @@ struct formats { int (*f_recv)(); int f_convert; } formats[] = { @@ -77,7 +78,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ #ifdef notdef { "mail", validate_user, sendmail, recvmail, 1 }, #endif -@@ -355,13 +363,13 @@ +@@ -355,13 +362,13 @@ again: exit(1); } if (tftpDebugLevel > 0) { @@ -94,7 +95,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ } ecode = (*pf->f_validate)(filename, tp->th_opcode); if (ecode) { -@@ -459,17 +467,25 @@ +@@ -459,17 +466,25 @@ validate_access(filename, mode) /* Rule 2: */ @@ -123,7 +124,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ /* Insure our temporary space is big enough */ maxPath = ((sizeof _tmp) - 1) - rootLen; -@@ -481,6 +497,8 @@ +@@ -481,6 +496,8 @@ validate_access(filename, mode) return EACCESS; } @@ -132,7 +133,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ /* Squeeze out any '.' or '..' components */ strcpy (tmpPath, filename); if (realPath (tmpPath, _tmp) < 0) { -@@ -492,21 +510,54 @@ +@@ -492,21 +509,54 @@ validate_access(filename, mode) /* Create the full pathname, prefixed by the * virtual root. */ @@ -191,7 +192,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ /* Check access lists */ /* Rules 4&5: */ -@@ -593,7 +644,7 @@ +@@ -593,7 +643,7 @@ void timer() /* * Send the requested file. */ @@ -200,7 +201,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ struct formats *pf; { struct tftphdr *dp, *r_init(); -@@ -664,7 +715,7 @@ +@@ -664,7 +714,7 @@ void justquit() /* * Receive a file. */ @@ -209,7 +210,7 @@ $NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $ struct formats *pf; { struct tftphdr *dp, *w_init(); -@@ -739,7 +739,7 @@ +@@ -688,7 +738,7 @@ send_ack: write_behind(file, pf->f_convert); for ( ; ; ) { alarm(rexmtval); diff --git a/net/yale-tftpd/patches/patch-ae b/net/yale-tftpd/patches/patch-ae index 52f691069b3..61960327295 100644 --- a/net/yale-tftpd/patches/patch-ae +++ b/net/yale-tftpd/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1 2002/04/01 00:04:43 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.2 2005/12/18 18:37:16 joerg Exp $ ---- classes/access.c.orig Wed Oct 5 01:20:44 1994 +--- classes/access.c.orig 1994-10-05 05:20:44.000000000 +0000 +++ classes/access.c @@ -1,4 +1,6 @@ #include @@ -9,3 +9,11 @@ $NetBSD: patch-ae,v 1.1 2002/04/01 00:04:43 dmcmahill Exp $ #include #include #include +@@ -92,7 +94,6 @@ AccessGroup + accessGroup_new () + { + AccessGroup self; +- extern char* calloc(); + + self = (AccessGroup)calloc (1, sizeof (*self)); + return self; diff --git a/net/yale-tftpd/patches/patch-af b/net/yale-tftpd/patches/patch-af index 33d7b43bba3..b4bdd19c0c0 100644 --- a/net/yale-tftpd/patches/patch-af +++ b/net/yale-tftpd/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1 2002/04/01 00:04:44 dmcmahill Exp $ +$NetBSD: patch-af,v 1.2 2005/12/18 18:37:16 joerg Exp $ ---- classes/config.c.orig Wed Oct 5 01:18:21 1994 +--- classes/config.c.orig 1994-10-05 05:18:21.000000000 +0000 +++ classes/config.c @@ -1,6 +1,7 @@ #define CLASS_Config_PRIVATE @@ -10,3 +10,14 @@ $NetBSD: patch-af,v 1.1 2002/04/01 00:04:44 dmcmahill Exp $ #include #include +@@ -35,10 +36,6 @@ static Config config_expand(); + static unsigned char* config_copy(); + static unsigned char* get_quoted_string(); + +-extern char* malloc(); +-extern char* realloc(); +-extern char* strdup(); +- + static int dflt_options = CFG_OPT_UCASE; + + Config -- cgit v1.2.3