Sync with upstream master.

Use cleaner upstream solution for -ftree-loop-distribute-patterns (#911307).
This commit is contained in:
Carlos O'Donell 2014-03-12 18:13:23 -04:00
parent 6b37058532
commit 43bff16613
4 changed files with 17 additions and 18 deletions

View File

@ -1,6 +1,8 @@
--- a/nscd/nscd.service 2014-02-27 00:04:13.684640521 +0530 diff --git a/nscd/nscd.service b/nscd/nscd.service
+++ b/nscd/nscd.service 2014-02-27 00:06:14.996635380 +0530 index b7428a3..19ba185 100644
@@ -6,7 +6,8 @@ --- a/nscd/nscd.service
+++ b/nscd/nscd.service
@@ -5,7 +5,8 @@ Description=Name Service Cache Daemon
[Service] [Service]
Type=forking Type=forking

View File

@ -1,20 +1,14 @@
diff --git a/nscd/nscd.service b/nscd/nscd.service
index 99c7563..a970186 100644
--- a/nscd/nscd.service --- a/nscd/nscd.service
+++ b/nscd/nscd.service +++ b/nscd/nscd.service
@@ -2,17 +2,20 @@ @@ -2,6 +2,7 @@
[Unit] [Unit]
Description=Name Service Cache Daemon Description=Name Service Cache Daemon
+After=syslog.target +After=syslog.target
[Service] [Service]
-Type=simple Type=forking
-ExecStart=/usr/sbin/nscd --foreground @@ -12,8 +13,10 @@
+Type=forking
+ExecStart=/usr/sbin/nscd
ExecStop=/usr/sbin/nscd --shutdown
ExecReload=/usr/sbin/nscd -i passwd
ExecReload=/usr/sbin/nscd -i group ExecReload=/usr/sbin/nscd -i group
ExecReload=/usr/sbin/nscd -i hosts ExecReload=/usr/sbin/nscd -i hosts
ExecReload=/usr/sbin/nscd -i services ExecReload=/usr/sbin/nscd -i services

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.19-112-gd4b1725 %define glibcsrcdir glibc-2.19-146-gabe6d90
%define glibcversion 2.19.90 %define glibcversion 2.19.90
%define glibcrelease 5%{?dist} %define glibcrelease 6%{?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:
# #
@ -162,8 +162,8 @@ Patch0032: %{name}-fedora-elf-rh737223.patch
Patch0033: %{name}-fedora-elf-ORIGIN.patch Patch0033: %{name}-fedora-elf-ORIGIN.patch
Patch0034: %{name}-fedora-elf-init-hidden_undef.patch Patch0034: %{name}-fedora-elf-init-hidden_undef.patch
# Needs to be sent upstream # Needs to be sent upstream.
Patch0035: %{name}-rh911307.patch # Support mangling and demangling null pointers.
Patch0037: %{name}-rh952799.patch Patch0037: %{name}-rh952799.patch
# rtkaio and c_stubs. Note that despite the numbering, these are always # rtkaio and c_stubs. Note that despite the numbering, these are always
@ -540,7 +540,6 @@ package or when debugging this package.
%patch0032 -p1 %patch0032 -p1
%patch0033 -p1 %patch0033 -p1
%patch0034 -p1 %patch0034 -p1
%patch0035 -p1
%patch0037 -p1 %patch0037 -p1
%patch0040 -p1 %patch0040 -p1
%patch0041 -p1 %patch0041 -p1
@ -1636,6 +1635,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Wed Mar 12 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-6
- Sync with upstream master.
- Use cleaner upstream solution for -ftree-loop-distribute-patterns (#911307).
* Tue Mar 04 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-5 * Tue Mar 04 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-5
- Sync with upstream master. - Sync with upstream master.

View File

@ -1 +1 @@
3811b8039821aacd918e17560e812e6d glibc-2.19-112-gd4b1725.tar.gz 43ad927c308051b566d36234c575d4ac glibc-2.19-146-gabe6d90.tar.gz