pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libre: remove patch which was included upstream
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Tue Apr 25 21:59:17 2017 +0200
Changeset: f95ea9a911394912c16aa722a87a422799cb00a1
Removed Files:
libre/patches/patch-src_dns_res.c
Log Message:
libre: remove patch which was included upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f95ea9a911394912c16aa722a87a422799cb00a1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libre/patches/patch-src_dns_res.c | 52 ---------------------------------------
1 file changed, 52 deletions(-)
diffs:
diff --git a/libre/patches/patch-src_dns_res.c b/libre/patches/patch-src_dns_res.c
deleted file mode 100644
index 4eb73b867f..0000000000
--- a/libre/patches/patch-src_dns_res.c
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_dns_res.c,v 1.1 2014/08/17 10:57:07 thomasklausner Exp $
-
-Fix NetBSD, from upstream.
-
---- src/dns/res.c.orig 2015-12-17 14:07:00.000000000 +0000
-+++ src/dns/res.c
-@@ -33,26 +33,28 @@
- */
- int get_resolv_dns(char *domain, size_t dsize, struct sa *nsv, uint32_t *n)
- {
-+ struct __res_state state;
- uint32_t i;
- int ret, err;
-
-- ret = res_init();
-+ memset(&state, 0, sizeof(state));
-+ ret = res_ninit(&state);
- if (0 != ret)
- return ENOENT;
-
-- if (_res.dnsrch[0])
-- str_ncpy(domain, _res.dnsrch[0], dsize);
-- else if ((char *)_res.defdname)
-- str_ncpy(domain, _res.defdname, dsize);
-+ if (state.dnsrch[0])
-+ str_ncpy(domain, state.dnsrch[0], dsize);
-+ else if (state.defdname)
-+ str_ncpy(domain, state.defdname, dsize);
-
-- if (!_res.nscount) {
-+ if (!state.nscount) {
- err = ENOENT;
- goto out;
- }
-
- err = 0;
-- for (i=0; i<min(*n, (uint32_t)_res.nscount) && !err; i++) {
-- struct sockaddr_in *addr = &_res.nsaddr_list[i];
-+ for (i=0; i<min(*n, (uint32_t)state.nscount) && !err; i++) {
-+ struct sockaddr_in *addr = &state.nsaddr_list[i];
- err |= sa_set_sa(&nsv[i], (struct sockaddr *)addr);
- }
- if (err)
-@@ -61,7 +63,7 @@ int get_resolv_dns(char *domain, size_t
- *n = i;
-
- out:
-- res_close();
-+ res_nclose(&state);
-
- return err;
- }
Home |
Main Index |
Thread Index |
Old Index