diff options
| author | soren <soren> | 2000-06-17 19:48:44 +0000 |
|---|---|---|
| committer | soren <soren> | 2000-06-17 19:48:44 +0000 |
| commit | 33c7c31ed9d3ea763b9f33082c7451a82da8b13d (patch) | |
| tree | ff34459e956121d8bcbd73e51746ffb422ad0c07 /net/pchar | |
| parent | b6373e4ab3df19f5ce298d6bd36cc2787a589b22 (diff) | |
| download | pkgsrc-33c7c31ed9d3ea763b9f33082c7451a82da8b13d.tar.gz | |
Patch now integrated.
Diffstat (limited to 'net/pchar')
| -rw-r--r-- | net/pchar/files/patch-sum | 7 | ||||
| -rw-r--r-- | net/pchar/patches/patch-aa | 59 |
2 files changed, 5 insertions, 61 deletions
diff --git a/net/pchar/files/patch-sum b/net/pchar/files/patch-sum index 0cbed497736..b097e18bcf4 100644 --- a/net/pchar/files/patch-sum +++ b/net/pchar/files/patch-sum @@ -1,3 +1,6 @@ -$NetBSD: patch-sum,v 1.1 2000/05/27 08:46:57 itojun Exp $ +$NetBSD: patch-sum,v 1.2 2000/06/17 19:48:44 soren Exp $ -MD5 (patch-aa) = 0a7f0af5473afac9e15ec106e17301a9 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/net/pchar/patches/patch-aa b/net/pchar/patches/patch-aa deleted file mode 100644 index d20fc0e775a..00000000000 --- a/net/pchar/patches/patch-aa +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/05/27 08:46:58 itojun Exp $ - -Index: PctestIpv6.cc -=================================================================== -RCS file: /cvsroot/apps/pchar/PctestIpv6.cc,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- PctestIpv6.cc 2000/05/27 08:18:36 1.1.1.1 -+++ PctestIpv6.cc 2000/05/27 08:41:33 1.3 -@@ -210,28 +210,28 @@ - // - char *PctestIpv6::GetName(void *a) - { -- struct addrinfo *host, hints; -- char *h_name; -- int error_num; -+ static char hbuf[NI_MAXHOST]; -+ struct sockaddr_in6 sin6; -+ int niflags; - -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = PF_INET6; -- getaddrinfo((char *) a, NULL, &hints, &host); -+ memset(&sin6, 0, sizeof(sin6)); -+ sin6.sin6_family = AF_INET6; -+#ifdef HAVE_SOCKADDR_SA_LEN -+ sin6.sin6_len = sizeof(struct sockaddr_in6); -+#endif -+ memcpy(&sin6.sin6_addr, a, sizeof(sin6.sin6_addr)); -+ /* XXX scope */ - -- if (host) { -- -- h_name = host->ai_canonname; -- /* -- * XXX We don't free the addrinfo, since we return the canonname field. -- */ -- -- /* freeaddrinfo(host); */ -- return h_name; -- } -- else { -- return (GetPrintableAddress(a)); -- } -- -+#if 0 -+ niflags = NumericFlag ? NI_NUMERICHOST : 0; -+#else -+ niflags = NI_NUMERICHOST; -+#endif -+ if (getnameinfo((struct sockaddr *)&sin6, sizeof(struct sockaddr_in6), -+ hbuf, sizeof(hbuf), NULL, 0, niflags) == 0) { -+ return hbuf; -+ } else -+ return "(invalid)"; - } - - // |