rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 238380 from home:Andreas_Schwab:Factory

Browse Source 
- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
  (bnc#883217, BZ #17079)
- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
  the man-pages package (bnc#880703)
- manpages.patch: update

OBS-URL: https://build.opensuse.org/request/show/238380
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=370
This commit is contained in:
Andreas Schwab 2014-06-23 13:37:49 +00:00 committed by Git OBS Bridge
parent d604827ae2
commit 10a15f0fa7
9 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glibc-testsuite.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
(bnc#883217, BZ #17079)
- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
the man-pages package (bnc#880703)
- manpages.patch: update
-------------------------------------------------------------------
Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de

6
glibc-testsuite.spec
View File

@ -258,6 +258,8 @@ Patch1011: aarch64-setcontext.patch
Patch1012: nss-nis-stack-use.patch
# PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
Patch1013: psfaa.patch
# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
Patch1014: nss-files-long-lines.patch
###
# Patches awaiting upstream approval
@ -488,6 +490,7 @@ rm nscd/s-stamp
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
%patch1014 -p1
%patch2000 -p1
%patch2001 -p1
@ -1089,10 +1092,7 @@ exit 0
%config(noreplace) /etc/default/nss
%doc %{_mandir}/man1/gencat.1.gz
%doc %{_mandir}/man1/getconf.1.gz
%doc %{_mandir}/man1/locale.1.gz
%doc %{_mandir}/man1/localedef.1.gz
%doc %{_mandir}/man5/*
%doc %{_mandir}/man8/iconvconfig.8.gz
/%{_lib}/ld-%{glibc_major_version}.so
# Each architecture has a different name for the dynamic linker:

9
glibc-utils.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
(bnc#883217, BZ #17079)
- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
the man-pages package (bnc#880703)
- manpages.patch: update
-------------------------------------------------------------------
Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de

6
glibc-utils.spec
View File

@ -257,6 +257,8 @@ Patch1011: aarch64-setcontext.patch
Patch1012: nss-nis-stack-use.patch
# PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
Patch1013: psfaa.patch
# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
Patch1014: nss-files-long-lines.patch
###
# Patches awaiting upstream approval
@ -488,6 +490,7 @@ rm nscd/s-stamp
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
%patch1014 -p1
%patch2000 -p1
%patch2001 -p1
@ -1089,10 +1092,7 @@ exit 0
%config(noreplace) /etc/default/nss
%doc %{_mandir}/man1/gencat.1.gz
%doc %{_mandir}/man1/getconf.1.gz
%doc %{_mandir}/man1/locale.1.gz
%doc %{_mandir}/man1/localedef.1.gz
%doc %{_mandir}/man5/*
%doc %{_mandir}/man8/iconvconfig.8.gz
/%{_lib}/ld-%{glibc_major_version}.so
# Each architecture has a different name for the dynamic linker:

9
glibc.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jun 23 10:33:40 UTC 2014 - schwab@suse.de
- nss-files-long-lines.patch: Don't ignore too long lines in nss_files
(bnc#883217, BZ #17079)
- Remove locale.1, localedef.1 and iconvconfig.8 manpages, now included in
the man-pages package (bnc#880703)
- manpages.patch: update
-------------------------------------------------------------------
Mon Jun 16 08:27:38 UTC 2014 - schwab@suse.de

6
glibc.spec
View File

@ -258,6 +258,8 @@ Patch1011: aarch64-setcontext.patch
Patch1012: nss-nis-stack-use.patch
# PATCH-FIX-UPSTREAM posix_spawn_file_actions_addopen needs to copy the path argument (BZ #17048)
Patch1013: psfaa.patch
# PATCH-FIX-UPSTREAM Don't ignore too long lines in nss_files (BZ #17079)
Patch1014: nss-files-long-lines.patch
###
# Patches awaiting upstream approval
@ -488,6 +490,7 @@ rm nscd/s-stamp
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
%patch1014 -p1
%patch2000 -p1
%patch2001 -p1
@ -1089,10 +1092,7 @@ exit 0
%config(noreplace) /etc/default/nss
%doc %{_mandir}/man1/gencat.1.gz
%doc %{_mandir}/man1/getconf.1.gz
%doc %{_mandir}/man1/locale.1.gz
%doc %{_mandir}/man1/localedef.1.gz
%doc %{_mandir}/man5/*
%doc %{_mandir}/man8/iconvconfig.8.gz
/%{_lib}/ld-%{glibc_major_version}.so
# Each architecture has a different name for the dynamic linker:

22
manpages.patch
View File

@ -1,25 +1,3 @@
Index: manpages/locale.1
===================================================================
--- manpages/locale.1.orig
+++ manpages/locale.1
@@ -247,17 +247,6 @@ This environment variable can switch aga
\& The directory where locale data is stored. By default, /usr/lib/locale is used.
.Ve
-.SH "FILES"
-.IX Header "FILES"
-.PP
-.PD 0
-.TP 8
-\fI/usr/share/i18n/SUPPORTED\fP
-List of supported values (and their associated encoding) for the locale name.
-This representation is recommended over
-\fB\-\-all\-locales\fR one, due being the system wide supported values.
-.PP
-
.SH "AUTHOR"
.IX Header "AUTHOR"
\&\fIlocale\fR was written by Ulrich Drepper for the \s-1GNU\s0 C Library.
Index: manpages/locale.alias.5
===================================================================
--- manpages/locale.alias.5.orig

4
manpages.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19a74b49f1afe63adb4e79accb214e2ed77d74af7ca0054af31322d64f3e14f1
size 15972
oid sha256:f05635b9beaec8379f31f0f0bc4ce2382b4ba734e97319ae37077e1eaa97f826
size 11861

24
nss-files-long-lines.patch Normal file
View File

@ -0,0 +1,24 @@
2014-06-23 Andreas Schwab <schwab@suse.de>
[BZ #17079]
* nss/nss_files/files-XXX.c (get_contents): Store overflow marker
before reading the next line.
Index: glibc-2.19/nss/nss_files/files-XXX.c
===================================================================
--- glibc-2.19.orig/nss/nss_files/files-XXX.c
+++ glibc-2.19/nss/nss_files/files-XXX.c
@@ -198,10 +198,12 @@ get_contents (char *linebuf, size_t len,
{
int curlen = ((remaining_len > (size_t) INT_MAX) ? INT_MAX
: remaining_len);
- char *p = fgets_unlocked (curbuf, curlen, stream);
+ /* Terminate the line so that we can test for overflow. */
((unsigned char *) curbuf)[curlen - 1] = 0xff;
+ char *p = fgets_unlocked (curbuf, curlen, stream);
+
/* EOF or read error. */
if (p == NULL)
return gcr_error;