pool/procps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 264116 from Base:System

Browse Source 
- Add patch procps-ng-3.3.9-errno.patch to avoid leftover errno
  from setlocale() (bsc#908516)

OBS-URL: https://build.opensuse.org/request/show/264116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/procps?expand=0&rev=89
This commit is contained in:
Dominique Leuenberger 2014-12-06 12:45:37 +00:00 committed by Git OBS Bridge
parent 167a46d6dc
commit a6317178d7
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
procps-ng-3.3.9-errno.patch Normal file
View File

@ -0,0 +1,49 @@
setlocale() sets errno to ENOENT ...
open("/usr/lib/locale/de_DE.UTF-8/LC_NUMERIC", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
open("/usr/lib/locale/de_DE.utf8/LC_NUMERIC", O_RDONLY|O_CLOEXEC) = 3
and this causes a problem later on (bsc#908516)
---
free.c | 6 ++++++
1 file changed, 6 insertions(+)
+++ free.c 2014-12-05 10:00:37.282018794 +0000
@@ -189,6 +189,7 @@ int main(int argc, char **argv)
int c, flags = 0;
char *endptr;
struct commandline_arguments args;
+ int errsv;
/*
* For long options that have no equivalent short option, use a
@@ -226,10 +227,12 @@ int main(int argc, char **argv)
#ifdef HAVE_PROGRAM_INVOCATION_NAME
program_invocation_name = program_invocation_short_name;
#endif
+ errsv = errno;
setlocale (LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
atexit(close_stdout);
+ errno = errsv;
while ((c = getopt_long(argc, argv, "bkmghlotc:s:V", longopts, NULL)) != -1)
switch (c) {
@@ -265,12 +268,15 @@ int main(int argc, char **argv)
break;
case 's':
flags |= FREE_REPEAT;
+ errsv = errno;
+ errno = 0;
args.repeat_interval = (1000000 * strtof(optarg, &endptr));
if (errno || optarg == endptr || (endptr && *endptr))
xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg);
if (args.repeat_interval < 1)
xerrx(EXIT_FAILURE,
_("seconds argument `%s' is not positive number"), optarg);
+ errno = errsv;
break;
case 'c':
flags |= FREE_REPEAT;

6
procps.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 5 10:07:22 UTC 2014 - werner@suse.de
- Add patch procps-ng-3.3.9-errno.patch to avoid leftover errno
from setlocale() (bsc#908516)
-------------------------------------------------------------------
Thu Sep 11 20:36:54 UTC 2014 - jengelh@inai.de

3
procps.spec
View File

@ -79,6 +79,8 @@ Patch21: procps-v3.3.3-pwdx.patch
Patch28: procps-ng-3.3.8-vmstat-terabyte.dif
# PATCH-FIX-SUSE -- Ignore scan_unevictable_pages in sysctl
Patch31: procps-ng-3.3.8-ignore-scan_unevictable_pages.patch
# PATCH-FIX-SUSE -- Avoid errno set by setlocale()
Patch32: procps-ng-3.3.9-errno.patch
Patch60: 0024-sysctl-system-loads-default-config-file.patch
Patch61: 0025-Split-help-lines-to-help-translators.patch
@ -199,6 +201,7 @@ the process information pseudo-file system,
%patch21
%patch28
%patch31 -p1
%patch32
%patch60
%patch61
%patch62