Accepting request 313180 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/313180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=192

getaddrinfo-ipv6-sanity.diff

@@ -1,47 +0,0 @@
-Index: glibc-2.18.90/sysdeps/posix/getaddrinfo.c
-===================================================================
---- glibc-2.18.90.orig/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.18.90/sysdeps/posix/getaddrinfo.c
-@@ -286,7 +286,7 @@ extern service_user *__nss_hosts_databas
- static int
- gaih_inet (const char *name, const struct gaih_service *service,
- 	   const struct addrinfo *req, struct addrinfo **pai,
--	   unsigned int *naddrs)
-+	   unsigned int *naddrs, bool usable_ipv6)
- {
-   const struct gaih_typeproto *tp = gaih_inet_typeproto;
-   struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
-@@ -855,7 +855,10 @@ gaih_inet (const char *name, const struc
- 	      if (req->ai_family == PF_UNSPEC)
- 		fct4 = __nss_lookup_function (nip, "gethostbyname4_r");
- 
--	      if (fct4 != NULL)
-+	      /* If we don't want ipv6, don't use gethostbyname4_r,
-+	         as it's using T_UNSPEC to libc_res_nsearch, which always
-+		 create T_A and T_AAAA queries.  */
-+	      if (usable_ipv6 && fct4 != NULL)
- 		{
- 		  int herrno;
- 
-@@ -958,7 +961,7 @@ gaih_inet (const char *name, const struc
- 		  if (fct != NULL)
- 		    {
- 		      if (req->ai_family == AF_INET6
--			  || req->ai_family == AF_UNSPEC)
-+			  || (req->ai_family == AF_UNSPEC && usable_ipv6))
- 			{
- 			  gethosts (AF_INET6, struct in6_addr);
- 			  no_inet6_data = no_data;
-@@ -2418,7 +2421,11 @@ getaddrinfo (const char *name, const cha
-   if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
-       || hints->ai_family == AF_INET6)
-     {
--      last_i = gaih_inet (name, pservice, hints, end, &naddrs);
-+      if (!check_pf_called)
-+	__check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
-+      check_pf_called = true;
-+
-+      last_i = gaih_inet (name, pservice, hints, end, &naddrs, seen_ipv6);
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);

glibc-2.3.locales.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2311caa4855d8269d8fae0c3aab97ce9f1a30abea4b40955471adf7b5413b93
+oid sha256:d6a14542a109c83551de0684d5ce7896e9574b8a6582ff1ed51a46b9897088a4
-size 329303
+size 328969

glibc-testsuite.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
+
+- getaddrinfo-ipv6-sanity.diff: Remove.  It breaks services that start
+  before IPv6 is up (bsc#931399)
+- glibc-2.3.locales.diff.bz2: Remove sh_YU locales, fix currency for en_BE.
+
 -------------------------------------------------------------------
 Tue Jun  9 08:16:46 UTC 2015 - schwab@suse.de
 

glibc-testsuite.spec

@@ -221,8 +221,6 @@ Patch103:       glibc-2.4-china.diff
 Patch300:       glibc-resolv-reload.diff
 # PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de
 Patch301:       glibc-2.2-sunrpc.diff
-# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534
-Patch302:       getaddrinfo-ipv6-sanity.diff
 # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv
 Patch304:       glibc-resolv-mdnshint.diff
 # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719
@@ -465,7 +463,6 @@ rm nscd/s-stamp
 
 %patch300 -p1
 %patch301 -p1
-%patch302 -p1
 %patch304 -p1
 %patch306 -p1
 

glibc-utils.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
+
+- getaddrinfo-ipv6-sanity.diff: Remove.  It breaks services that start
+  before IPv6 is up (bsc#931399)
+- glibc-2.3.locales.diff.bz2: Remove sh_YU locales, fix currency for en_BE.
+
 -------------------------------------------------------------------
 Tue Jun  9 08:16:46 UTC 2015 - schwab@suse.de
 

glibc-utils.spec

@@ -220,8 +220,6 @@ Patch103:       glibc-2.4-china.diff
 Patch300:       glibc-resolv-reload.diff
 # PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de
 Patch301:       glibc-2.2-sunrpc.diff
-# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534
-Patch302:       getaddrinfo-ipv6-sanity.diff
 # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv
 Patch304:       glibc-resolv-mdnshint.diff
 # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719
@@ -465,7 +463,6 @@ rm nscd/s-stamp
 
 %patch300 -p1
 %patch301 -p1
-%patch302 -p1
 %patch304 -p1
 %patch306 -p1
 

glibc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de
+
+- getaddrinfo-ipv6-sanity.diff: Remove.  It breaks services that start
+  before IPv6 is up (bsc#931399)
+- glibc-2.3.locales.diff.bz2: Remove sh_YU locales, fix currency for en_BE.
+
 -------------------------------------------------------------------
 Tue Jun  9 08:16:46 UTC 2015 - schwab@suse.de
 

glibc.spec

@@ -221,8 +221,6 @@ Patch103:       glibc-2.4-china.diff
 Patch300:       glibc-resolv-reload.diff
 # PATCH-FIX-OPENSUSE Fix hangs in UDP RPC calls bso#5379 bnc#257745 aj@suse.de
 Patch301:       glibc-2.2-sunrpc.diff
-# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534
-Patch302:       getaddrinfo-ipv6-sanity.diff
 # PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv
 Patch304:       glibc-resolv-mdnshint.diff
 # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719
@@ -465,7 +463,6 @@ rm nscd/s-stamp
 
 %patch300 -p1
 %patch301 -p1
-%patch302 -p1
 %patch304 -p1
 %patch306 -p1