[iputils] Always use posix locale when reading -i (#905840)
jsynacek
jsynacek at fedoraproject.org
Fri Feb 1 07:48:48 UTC 2013
commit 9d982d6a0e283afe3402adffba63ad63d9f2f136
Author: Jan Synacek <jsynacek at redhat.com>
Date: Fri Feb 1 08:47:50 2013 +0100
Always use posix locale when reading -i (#905840)
iputils-20121221-floodlocale.patch | 12 ++++++++++++
iputils.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/iputils-20121221-floodlocale.patch b/iputils-20121221-floodlocale.patch
new file mode 100644
index 0000000..832f21b
--- /dev/null
+++ b/iputils-20121221-floodlocale.patch
@@ -0,0 +1,12 @@
+--- iputils-s20121221-orig/ping_common.c 2013-02-01 08:28:29.836191171 +0100
++++ iputils-s20121221-new/ping_common.c 2013-02-01 08:28:11.013152725 +0100
+@@ -269,7 +269,9 @@ void common_options(int ch)
+ char *ep;
+
+ errno = 0;
++ setlocale(LC_ALL, "C");
+ dbl = strtod(optarg, &ep);
++ setlocale(LC_ALL, "");
+
+ if (errno || *ep != '\0' ||
+ !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
diff --git a/iputils.spec b/iputils.spec
index 9becb6b..07b56ec 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
Summary: Network monitoring tools including ping
Name: iputils
Version: 20121221
-Release: 1%{?dist}
+Release: 2%{?dist}
# some parts are under the original BSD (ping.c)
# some are under GPLv2+ (tracepath.c)
License: BSD and GPLv2+
@@ -17,6 +17,7 @@ Source6: ninfod.service
Patch0: iputils-20020927-rh.patch
Patch1: iputils-ifenslave.patch
+Patch2: iputils-20121221-floodlocale.patch
BuildRequires: docbook-utils perl-SGMLSpm
BuildRequires: glibc-kernheaders >= 2.4-8.19
@@ -66,6 +67,7 @@ Queries.
%patch0 -p1 -b .rh
%patch1 -p1 -b .addr
+%patch2 -p1 -b .floc
%build
%ifarch s390 s390x
@@ -173,6 +175,9 @@ mv -f RELNOTES.tmp RELNOTES
%attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
%changelog
+* Fri Feb 01 2013 Jan Synáček <jsynacek at redhat.com> - 20121221-2
+- Always use posix locale when reading -i (#905840)
+
* Mon Jan 07 2013 Jan Synáček <jsynacek at redhat.com> - 20121221-1
- Update to iputils-s20121207 (#890397) and remove unnecessary patches
More information about the scm-commits
mailing list