Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/
Date: Tue, 23 Apr 2019 09:55:36
Message-Id: 1556013163.eb9538ad53013b6d66c70c686806acdbbe9f4629.soap@gentoo
1 commit: eb9538ad53013b6d66c70c686806acdbbe9f4629
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 22 07:56:30 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 23 09:52:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9538ad
7
8 net-dns/bind-tools: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/11781
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../files/bind-tools-9.5.0_p1-lwconfig.patch | 63 ----------------------
15 1 file changed, 63 deletions(-)
16
17 diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
18 deleted file mode 100644
19 index ba615d5ac6e..00000000000
20 --- a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
21 +++ /dev/null
22 @@ -1,63 +0,0 @@
23 ---- a/lib/lwres/lwconfig.c
24 -+++ b/lib/lwres/lwconfig.c
25 -@@ -175,13 +175,8 @@
26 - REQUIRE(buffer != NULL);
27 - REQUIRE(size > 0U);
28 -
29 -- *p = '\0';
30 --
31 - ch = eatwhite(fp);
32 -
33 -- if (ch == EOF)
34 -- return (EOF);
35 --
36 - do {
37 - *p = '\0';
38 -
39 -@@ -592,23 +587,37 @@
40 - if (strlen(word) == 0U)
41 - rval = LWRES_R_SUCCESS;
42 - else if (strcmp(word, "nameserver") == 0)
43 -- rval = lwres_conf_parsenameserver(ctx, fp);
44 -+ rval = (stopchar != '\n')? /* fail instantly if EOL is reached */
45 -+ lwres_conf_parsenameserver(ctx, fp)
46 -+ : LWRES_R_FAILURE;
47 - else if (strcmp(word, "lwserver") == 0)
48 -- rval = lwres_conf_parselwserver(ctx, fp);
49 -+ rval = (stopchar != '\n')?
50 -+ lwres_conf_parselwserver(ctx, fp)
51 -+ : LWRES_R_FAILURE;
52 - else if (strcmp(word, "domain") == 0)
53 -- rval = lwres_conf_parsedomain(ctx, fp);
54 -+ rval = (stopchar != '\n')?
55 -+ lwres_conf_parsedomain(ctx, fp)
56 -+ : LWRES_R_FAILURE;
57 - else if (strcmp(word, "search") == 0)
58 -- rval = lwres_conf_parsesearch(ctx, fp);
59 -+ rval = (stopchar != '\n')?
60 -+ lwres_conf_parsesearch(ctx, fp)
61 -+ : LWRES_R_FAILURE;
62 - else if (strcmp(word, "sortlist") == 0)
63 -- rval = lwres_conf_parsesortlist(ctx, fp);
64 -+ rval = (stopchar != '\n')?
65 -+ lwres_conf_parsesortlist(ctx, fp)
66 -+ : LWRES_R_FAILURE;
67 - else if (strcmp(word, "options") == 0)
68 -- rval = lwres_conf_parseoption(ctx, fp);
69 -+ rval = (stopchar != '\n')?
70 -+ lwres_conf_parseoption(ctx, fp)
71 -+ : LWRES_R_FAILURE;
72 - else {
73 - /* unrecognised word. Ignore entire line */
74 - rval = LWRES_R_SUCCESS;
75 -- stopchar = eatline(fp);
76 -- if (stopchar == EOF) {
77 -- break;
78 -+ if (stopchar != '\n') { /* do not eat the next line */
79 -+ stopchar = eatline(fp);
80 -+ if (stopchar == EOF) {
81 -+ break;
82 -+ }
83 - }
84 - }
85 - if (ret == LWRES_R_SUCCESS && rval != LWRES_R_SUCCESS)