rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Auto-sync with upstream branch master

Browse Source 
Upstream commit: da6d4404ecfd7eacba8c096b0761a5758a59da4b
This commit is contained in:
Florian Weimer 2018-03-12 11:44:45 +01:00
parent 9be86f04b3
commit a928b2e6c1
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glibc-rh1452750-libidn2.patch
View File

@ -19476,16 +19476,19 @@ index 0da6dcbb596f7608..2be9122469bd91c8 100644
@item @item
Geoffrey Keating for the port to Linux on PowerPC Geoffrey Keating for the port to Linux on PowerPC
diff --git a/nscd/gai.c b/nscd/gai.c diff --git a/nscd/gai.c b/nscd/gai.c
index d0817477976c0bdf..3825f929ca5529d5 100644 index 576fd0045b4abf36..24bdfee1db3791e2 100644
--- a/nscd/gai.c --- a/nscd/gai.c
+++ b/nscd/gai.c +++ b/nscd/gai.c
@@ -42,6 +42,3 @@ @@ -42,9 +42,6 @@
/* Support code. */ /* Support code. */
#include <check_pf.c> #include <check_pf.c>
#include <check_native.c> #include <check_native.c>
-#ifdef HAVE_LIBIDN -#ifdef HAVE_LIBIDN
-# include <libidn/idn-stub.c> -# include <libidn/idn-stub.c>
-#endif -#endif
/* Some variables normally defined in libc. */
service_user *__nss_hosts_database attribute_hidden;
diff --git a/resolv/Makefile b/resolv/Makefile diff --git a/resolv/Makefile b/resolv/Makefile
index 6e70ae9f6b4a29a9..ea395ac3eb4332e1 100644 index 6e70ae9f6b4a29a9..ea395ac3eb4332e1 100644
--- a/resolv/Makefile --- a/resolv/Makefile

8
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27.9000-144-g1a2f44a848 %define glibcsrcdir glibc-2.27.9000-188-gda6d4404ec
%define glibcversion 2.27.9000 %define glibcversion 2.27.9000
%define glibcrelease 8%{?dist} %define glibcrelease 9%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -1930,6 +1930,10 @@ fi
%endif %endif
%changelog %changelog
* Mon Mar 12 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-9
- Auto-sync with upstream branch master,
commit da6d4404ecfd7eacba8c096b0761a5758a59da4b.
* Tue Mar 6 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-8 * Tue Mar 6 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-8
- Enable annobin annotations (#1548438) - Enable annobin annotations (#1548438)

2
sources
View File

@ -1 +1 @@
SHA512 (glibc-2.27.9000-144-g1a2f44a848.tar.gz) = 3cb671e4d47599697c8331a37c90d38f030fe6662dc2ef1169b12b8098d9793f831b93350d67b701f23bde19ad94dd7fc88aa841a5f06f84e87bf5d5d946af63 SHA512 (glibc-2.27.9000-188-gda6d4404ec.tar.gz) = 88ca1f3699eed054887aff6eb5a77685db05b8082e7980632de66672d4ad9dd8e5a1a7389698c84d7b3c60477ee4b88c2e67df4784980d6e58566fbe0663363f