rpms/pcre
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix an error message and locale handling in pcregrep tool

Browse Source
This commit is contained in:
Petr Písař 2018-06-28 09:56:47 +02:00
parent f5618215fc
commit dadcc54184
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcre-8.42-Fix-typos-in-pcrgrep.patch Normal file
View File

@ -0,0 +1,36 @@
From 6d8fa98d5167bdd915ce1e32bcb6aaed078e5938 Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Tue, 26 Jun 2018 17:04:02 +0000
Subject: [PATCH] Fix typos in pcrgrep.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1736 2f5784b3-3f2a-0410-8824-cb99058d5e15
Petr Písař: Ported to 8.42.
diff --git a/pcregrep.c b/pcregrep.c
index a406be9..5982406 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -2252,7 +2252,7 @@ if (isdirectory(pathname))
int fnlength = strlen(pathname) + strlen(nextfile) + 2;
if (fnlength > 2048)
{
- fprintf(stderr, "pcre2grep: recursive filename is too long\n");
+ fprintf(stderr, "pcregrep: recursive filename is too long\n");
rc = 2;
break;
}
@@ -3034,7 +3034,7 @@ LC_ALL environment variable is set, and if so, use it. */
if (locale == NULL)
{
locale = getenv("LC_ALL");
- locale_from = "LCC_ALL";
+ locale_from = "LC_ALL";
}
if (locale == NULL)
--
2.14.4

5
pcre.spec
View File

@ -38,6 +38,9 @@ Patch2: pcre-8.41-fix_stack_estimator.patch
# Fix handling UTF and start-of-pattern options in C++ wrapper, # Fix handling UTF and start-of-pattern options in C++ wrapper,
# upstream bug #2283, in upstream after 8.42 # upstream bug #2283, in upstream after 8.42
Patch3: pcre-8.42-Fix-two-C-wrapper-bugs-unnoticed-for-years.patch Patch3: pcre-8.42-Fix-two-C-wrapper-bugs-unnoticed-for-years.patch
# Fix an error message and locale handling in pcregrep tool,
# in upstream after 8.42
Patch4: pcre-8.42-Fix-typos-in-pcrgrep.patch
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -123,6 +126,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
%patch1 -p1 %patch1 -p1
%patch2 -p2 %patch2 -p2
%patch3 -p1 %patch3 -p1
%patch4 -p1
# Because of rpath patch # Because of rpath patch
libtoolize --copy --force libtoolize --copy --force
autoreconf -vif autoreconf -vif
@ -220,6 +224,7 @@ make %{?_smp_mflags} check VERBOSE=yes
* Thu Jun 28 2018 Petr Pisar <ppisar@redhat.com> - 8.42-2 * Thu Jun 28 2018 Petr Pisar <ppisar@redhat.com> - 8.42-2
- Fix handling UTF and start-of-pattern options in C++ wrapper - Fix handling UTF and start-of-pattern options in C++ wrapper
(upstream bug #2283) (upstream bug #2283)
- Fix an error message and locale handling in pcregrep tool
* Tue Mar 20 2018 Petr Pisar <ppisar@redhat.com> - 8.42-1 * Tue Mar 20 2018 Petr Pisar <ppisar@redhat.com> - 8.42-1
- 8.42 bump - 8.42 bump