Sync with upstream master

- Adjusted nscd.service patch
- Added fix for #1078355
This commit is contained in:
Siddhesh Poyarekar 2014-03-19 22:17:32 +05:30
parent 5e984e4f24
commit b7b25cd2fa
3 changed files with 12 additions and 10 deletions

View File

@ -8,13 +8,7 @@
[Service] [Service]
Type=forking Type=forking
@@ -12,8 +13,10 @@ @@ -17,3 +18,4 @@
ExecReload=/usr/sbin/nscd -i group
ExecReload=/usr/sbin/nscd -i hosts
ExecReload=/usr/sbin/nscd -i services
+ExecReload=/usr/sbin/nscd -i netgroup
Restart=always
PIDFile=/run/nscd/nscd.pid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.19-146-gabe6d90 %define glibcsrcdir glibc-2.19-195-gd71aeee
%define glibcversion 2.19.90 %define glibcversion 2.19.90
%define glibcrelease 6%{?dist} %define glibcrelease 7%{?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:
# #
@ -224,6 +224,9 @@ Patch2028: %{name}-rh1025126.patch
Patch2031: %{name}-rh1070416.patch Patch2031: %{name}-rh1070416.patch
# Upstream 16724
Patch2032: %{name}-rh1078355.patch
############################################################################## ##############################################################################
# End of glibc patches. # End of glibc patches.
############################################################################## ##############################################################################
@ -549,6 +552,7 @@ package or when debugging this package.
%patch2028 -p1 %patch2028 -p1
%patch2031 -p1 %patch2031 -p1
%patch0047 -p1 %patch0047 -p1
%patch2032 -p1
############################################################################## ##############################################################################
# %%prep - Additional prep required... # %%prep - Additional prep required...
@ -1635,6 +1639,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Wed Mar 19 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-7
- Sync with upstream master.
- Fix offset computation for append+ mode on switching from read (#1078355).
* Wed Mar 12 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-6 * Wed Mar 12 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-6
- Sync with upstream master. - Sync with upstream master.
- Use cleaner upstream solution for -ftree-loop-distribute-patterns (#911307). - Use cleaner upstream solution for -ftree-loop-distribute-patterns (#911307).

View File

@ -1 +1 @@
43ad927c308051b566d36234c575d4ac glibc-2.19-146-gabe6d90.tar.gz 731ff6eb9ba1a5c69784ec7b356c90aa glibc-2.19-195-gd71aeee.tar.gz