[arch-commits] Commit in bind/trunk (PKGBUILD fix-FS#60286.patch)

Sébastien Luttringer seblu at archlinux.org
Thu Apr 25 01:11:22 UTC 2019


    Date: Thursday, April 25, 2019 @ 01:11:21
  Author: seblu
Revision: 352104

upgpkg: bind 9.14.1-1

Modified:
  bind/trunk/PKGBUILD
Deleted:
  bind/trunk/fix-FS#60286.patch

--------------------+
 PKGBUILD           |    4 -
 fix-FS#60286.patch |  129 ---------------------------------------------------
 2 files changed, 2 insertions(+), 131 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-24 21:48:21 UTC (rev 352103)
+++ PKGBUILD	2019-04-25 01:11:21 UTC (rev 352104)
@@ -5,7 +5,7 @@
 
 pkgbase=bind
 pkgname=(bind bind-tools)
-_pkgver=9.14.0
+_pkgver=9.14.1
 pkgver=${_pkgver//-/.}
 pkgrel=1
 url='https://www.isc.org/software/bind/'
@@ -25,7 +25,7 @@
         'localhost.ip6.zone'
         '127.0.0.zone'
         'empty.zone')
-sha1sums=('8807e4736732300b75193885149807ce3ce99cd4'
+sha1sums=('29e43a99c059c5458822833b2267f237361feca6'
           'SKIP'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           '9537f4835a1f736788d0733c7996a10db2d4eee4'

Deleted: fix-FS#60286.patch
===================================================================
--- fix-FS#60286.patch	2019-04-24 21:48:21 UTC (rev 352103)
+++ fix-FS#60286.patch	2019-04-25 01:11:21 UTC (rev 352104)
@@ -1,129 +0,0 @@
-diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c
-index 1b2df6d71c9a3df0e75c1f336833a136e0d6a06c..d5481c7afa605880b7c9e5ca17815d5f80e6ea5a 100644
---- a/lib/irs/getaddrinfo.c
-+++ b/lib/irs/getaddrinfo.c
-@@ -181,6 +181,47 @@ static void _freeaddrinfo(struct addrinfo *ai);
- #define FOUND_IPV6	0x2
- #define FOUND_MAX	2
- 
-+/*%
-+ * Try converting the scope identifier in 'src' to a network interface index.
-+ * Upon success, return true and store the resulting index in 'dst'.  Upon
-+ * failure, return false.
-+ */
-+static bool
-+parse_scopeid(const char *src, uint32_t *dst) {
-+	uint32_t scopeid = 0;
-+
-+	REQUIRE(src != NULL);
-+	REQUIRE(dst != NULL);
-+
-+#ifdef HAVE_IF_NAMETOINDEX
-+	/*
-+	 * Try using if_nametoindex() first if it is available.  As it does not
-+	 * handle numeric scopes, we do not simply return if it fails.
-+	 */
-+	scopeid = (uint32_t)if_nametoindex(src);
-+#endif
-+
-+	/*
-+	 * Fall back to numeric scope processing if if_nametoindex() either
-+	 * fails or is unavailable.
-+	 */
-+	if (scopeid == 0) {
-+		char *endptr = NULL;
-+		scopeid = (uint32_t)strtoul(src, &endptr, 10);
-+		/*
-+		 * The scope identifier must not be empty and no trailing
-+		 * characters are allowed after it.
-+		 */
-+		if (src == endptr || endptr == NULL || *endptr != '\0') {
-+			return (false);
-+		}
-+	}
-+
-+	*dst = scopeid;
-+
-+	return (true);
-+}
-+
- #define ISC_AI_MASK (AI_PASSIVE|AI_CANONNAME|AI_NUMERICHOST)
- /*%
-  * Get a list of IP addresses and port numbers for host hostname and
-@@ -365,39 +406,24 @@ getaddrinfo(const char *hostname, const char *servname,
- 		char abuf[sizeof(struct in6_addr)];
- 		char nbuf[NI_MAXHOST];
- 		int addrsize, addroff;
--#ifdef IRS_HAVE_SIN6_SCOPE_ID
--		char *p, *ep;
- 		char ntmp[NI_MAXHOST];
--		uint32_t scopeid;
--#endif
-+		uint32_t scopeid = 0;
- 
--#ifdef IRS_HAVE_SIN6_SCOPE_ID
- 		/*
- 		 * Scope identifier portion.
- 		 */
- 		ntmp[0] = '\0';
- 		if (strchr(hostname, '%') != NULL) {
-+			char *p;
- 			strlcpy(ntmp, hostname, sizeof(ntmp));
- 			p = strchr(ntmp, '%');
--			ep = NULL;
--
--			/*
--			 * Vendors may want to support non-numeric
--			 * scopeid around here.
--			 */
- 
--			if (p != NULL)
--				scopeid = (uint32_t)strtoul(p + 1,
--								&ep, 10);
--			if (p != NULL && ep != NULL && ep[0] == '\0')
-+			if (p != NULL && parse_scopeid(p + 1, &scopeid)) {
- 				*p = '\0';
--			else {
-+			} else {
- 				ntmp[0] = '\0';
--				scopeid = 0;
- 			}
--		} else
--			scopeid = 0;
--#endif
-+		}
- 
- 		if (inet_pton(AF_INET, hostname, (struct in_addr *)abuf)
- 		    == 1) {
-@@ -415,7 +441,6 @@ getaddrinfo(const char *hostname, const char *servname,
- 			addroff = offsetof(struct sockaddr_in, sin_addr);
- 			family = AF_INET;
- 			goto common;
--#ifdef IRS_HAVE_SIN6_SCOPE_ID
- 		} else if (ntmp[0] != '\0' &&
- 			   inet_pton(AF_INET6, ntmp, abuf) == 1) {
- 			if (family && family != AF_INET6)
-@@ -424,7 +449,6 @@ getaddrinfo(const char *hostname, const char *servname,
- 			addroff = offsetof(struct sockaddr_in6, sin6_addr);
- 			family = AF_INET6;
- 			goto common;
--#endif
- 		} else if (inet_pton(AF_INET6, hostname, abuf) == 1) {
- 			if (family != 0 && family != AF_INET6)
- 				return (EAI_NONAME);
-@@ -444,12 +468,10 @@ getaddrinfo(const char *hostname, const char *servname,
- 			ai->ai_socktype = socktype;
- 			SIN(ai->ai_addr)->sin_port = port;
- 			memmove((char *)ai->ai_addr + addroff, abuf, addrsize);
-+			if (ai->ai_family == AF_INET6) {
-+				SIN6(ai->ai_addr)->sin6_scope_id = scopeid;
-+			}
- 			if ((flags & AI_CANONNAME) != 0) {
--#ifdef IRS_HAVE_SIN6_SCOPE_ID
--				if (ai->ai_family == AF_INET6)
--					SIN6(ai->ai_addr)->sin6_scope_id =
--						scopeid;
--#endif
- 				if (getnameinfo(ai->ai_addr,
- 						(socklen_t)ai->ai_addrlen,
- 						nbuf, sizeof(nbuf), NULL, 0,


More information about the arch-commits mailing list