rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-locale-archive sometimes created empty archives

Browse Source 
(fixed by David Shea) (#1262040)
This commit is contained in:
Mike FABIAN 2015-09-16 18:09:29 +02:00
parent a0be169239
commit 26f4d28240
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-locale-archive.c
View File

@ -313,8 +313,7 @@ fill_archive (struct locarhandle *tmpl_ah,
/* Add one for "_" and one for the null terminator. */ /* Add one for "_" and one for the null terminator. */
size_t len = strlen (install_langs_list[i]) + 2; size_t len = strlen (install_langs_list[i]) + 2;
char *install_lang = (char *)xmalloc (len); char *install_lang = (char *)xmalloc (len);
strncpy (install_lang, install_langs_list[i], len - 2); strcpy (install_lang, install_langs_list[i]);
install_lang[len - 1] = '\0';
if (strchr (install_lang, '_') == NULL) if (strchr (install_lang, '_') == NULL)
strcat (install_lang, "_"); strcat (install_lang, "_");
if (strncmp (name, install_lang, strlen (install_lang)) == 0) if (strncmp (name, install_lang, strlen (install_lang)) == 0)

5
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.22 %define glibcsrcdir glibc-2.22
%define glibcversion 2.22 %define glibcversion 2.22
%define glibcrelease 2%{?dist} %define glibcrelease 3%{?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:
# #
@ -1828,6 +1828,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Wed Sep 16 2015 Mike FABIAN <mfabian@redhat.com> - 2.22-3
- build-locale-archive sometimes created empty archives (fixed by David Shea) (#1262040)
* Fri Aug 14 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.22-2 * Fri Aug 14 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.22-2
- Remove initgroups from default nsswitch.conf (#751450). - Remove initgroups from default nsswitch.conf (#751450).