From 0f1e744ae84d484bc621af5a85d61d62bd3e5f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 4 Jul 2016 10:06:33 +0200 Subject: [PATCH] Correct pcre2unicode(3) documentation --- ...-again-hopefully-correctly-this-time.patch | 68 ++++++++++++++ ...d-add-clarification-to-documentation.patch | 89 +++++++++++++++++++ pcre2.spec | 7 ++ 3 files changed, 164 insertions(+) create mode 100644 pcre2-10.22-RC1-Fix-typo-again-hopefully-correctly-this-time.patch create mode 100644 pcre2-10.22-RC1-Fix-typos-and-add-clarification-to-documentation.patch diff --git a/pcre2-10.22-RC1-Fix-typo-again-hopefully-correctly-this-time.patch b/pcre2-10.22-RC1-Fix-typo-again-hopefully-correctly-this-time.patch new file mode 100644 index 0000000..83969d5 --- /dev/null +++ b/pcre2-10.22-RC1-Fix-typo-again-hopefully-correctly-this-time.patch @@ -0,0 +1,68 @@ +From c9290e0e852d5af7a209d154c32135286da2d4c4 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sun, 3 Jul 2016 15:21:01 +0000 +Subject: [PATCH] Fix typo again - hopefully correctly this time. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@543 6239d852-aaf2-0410-a92c-79f79f948069 +Signed-off-by: Petr Písař +--- + doc/pcre2unicode.3 | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/doc/pcre2unicode.3 b/doc/pcre2unicode.3 +index 607d40e..253d4b6 100644 +--- a/doc/pcre2unicode.3 ++++ b/doc/pcre2unicode.3 +@@ -1,4 +1,4 @@ +-.TH PCRE2UNICODE 3 "02 July 2016" "PCRE2 10.22" ++.TH PCRE2UNICODE 3 "03 July 2016" "PCRE2 10.22" + .SH NAME + PCRE - Perl-compatible regular expressions (revised API) + .SH "UNICODE AND UTF SUPPORT" +@@ -63,7 +63,7 @@ characters (see the description of \eC in the + .\" HREF + \fBpcre2pattern\fP + .\" +-documentation). ++documentation). + .P + The use of \eC is not supported by the alternative matching function + \fBpcre2_dfa_match()\fP when in UTF-8 or UTF-16 mode, that is, when a character +@@ -235,9 +235,9 @@ never occur in a valid UTF-8 string. + .sp + The following negative error codes are given for invalid UTF-16 strings: + .sp +- PCRE2_UTF16_ERR1 Missing low surrogate at end of string +- PCRE2_UTF16_ERR2 Invalid low surrogate follows high surrogate +- PCRE2_UTF16_ERR3 Isolated low surrogate ++ PCRE2_ERROR_UTF16_ERR1 Missing low surrogate at end of string ++ PCRE2_ERROR_UTF16_ERR2 Invalid low surrogate follows high surrogate ++ PCRE2_ERROR_UTF16_ERR3 Isolated low surrogate + .sp + . + . +@@ -247,8 +247,8 @@ The following negative error codes are given for invalid UTF-16 strings: + .sp + The following negative error codes are given for invalid UTF-32 strings: + .sp +- PCRE2_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff) +- PCRE2_UTF32_ERR2 Code point is greater than 0x10ffff ++ PCRE2_ERROR_UTF32_ERR1 Surrogate character (0xd800 to 0xdfff) ++ PCRE2_ERROR_UTF32_ERR2 Code point is greater than 0x10ffff + .sp + . + . +@@ -266,6 +266,6 @@ Cambridge, England. + .rs + .sp + .nf +-Last updated: 02 July 2016 ++Last updated: 03 July 2016 + Copyright (c) 1997-2016 University of Cambridge. + .fi +-- +2.5.5 + diff --git a/pcre2-10.22-RC1-Fix-typos-and-add-clarification-to-documentation.patch b/pcre2-10.22-RC1-Fix-typos-and-add-clarification-to-documentation.patch new file mode 100644 index 0000000..203c927 --- /dev/null +++ b/pcre2-10.22-RC1-Fix-typos-and-add-clarification-to-documentation.patch @@ -0,0 +1,89 @@ +From 4acd03a5ae1acb5361233d469b19e7e954805a2a Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sat, 2 Jul 2016 16:34:01 +0000 +Subject: [PATCH] Fix typos and add clarification to documentation. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@542 6239d852-aaf2-0410-a92c-79f79f948069 +Signed-off-by: Petr Písař +--- + doc/pcre2unicode.3 | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +diff --git a/doc/pcre2unicode.3 b/doc/pcre2unicode.3 +index 59e226e..607d40e 100644 +--- a/doc/pcre2unicode.3 ++++ b/doc/pcre2unicode.3 +@@ -1,4 +1,4 @@ +-.TH PCRE2UNICODE 3 "16 October 2015" "PCRE2 10.21" ++.TH PCRE2UNICODE 3 "02 July 2016" "PCRE2 10.22" + .SH NAME + PCRE - Perl-compatible regular expressions (revised API) + .SH "UNICODE AND UTF SUPPORT" +@@ -57,18 +57,21 @@ individual code units. + In UTF modes, the dot metacharacter matches one UTF character instead of a + single code unit. + .P +-The escape sequence \eC can be used to match a single code unit, in a UTF mode, ++The escape sequence \eC can be used to match a single code unit in a UTF mode, + but its use can lead to some strange effects because it breaks up multi-unit + characters (see the description of \eC in the + .\" HREF + \fBpcre2pattern\fP + .\" +-documentation). The use of \eC is not supported by the alternative matching +-function \fBpcre2_dfa_match()\fP when in UTF mode. Its use provokes a +-match-time error. The JIT optimization also does not support \eC in UTF mode. +-If JIT optimization is requested for a UTF pattern that contains \eC, it will +-not succeed, and so the matching will be carried out by the normal interpretive +-function. ++documentation). ++.P ++The use of \eC is not supported by the alternative matching function ++\fBpcre2_dfa_match()\fP when in UTF-8 or UTF-16 mode, that is, when a character ++may consist of more than one code unit. The use of \eC in these modes provokes ++a match-time error. Also, the JIT optimization does not support \eC in these ++modes. If JIT optimization is requested for a UTF-8 or UTF-16 pattern that ++contains \eC, it will not succeed, and so when \fBpcre2_match()\fP is called, ++the matching will be carried out by the normal interpretive function. + .P + The character escapes \eb, \eB, \ed, \eD, \es, \eS, \ew, and \eW correctly test + characters of any code value, but, by default, the characters that PCRE2 +@@ -232,9 +235,9 @@ never occur in a valid UTF-8 string. + .sp + The following negative error codes are given for invalid UTF-16 strings: + .sp +- PCRE_UTF16_ERR1 Missing low surrogate at end of string +- PCRE_UTF16_ERR2 Invalid low surrogate follows high surrogate +- PCRE_UTF16_ERR3 Isolated low surrogate ++ PCRE2_UTF16_ERR1 Missing low surrogate at end of string ++ PCRE2_UTF16_ERR2 Invalid low surrogate follows high surrogate ++ PCRE2_UTF16_ERR3 Isolated low surrogate + .sp + . + . +@@ -244,8 +247,8 @@ The following negative error codes are given for invalid UTF-16 strings: + .sp + The following negative error codes are given for invalid UTF-32 strings: + .sp +- PCRE_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff) +- PCRE_UTF32_ERR2 Code point is greater than 0x10ffff ++ PCRE2_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff) ++ PCRE2_UTF32_ERR2 Code point is greater than 0x10ffff + .sp + . + . +@@ -263,6 +266,6 @@ Cambridge, England. + .rs + .sp + .nf +-Last updated: 16 October 2015 +-Copyright (c) 1997-2015 University of Cambridge. ++Last updated: 02 July 2016 ++Copyright (c) 1997-2016 University of Cambridge. + .fi +-- +2.5.5 + diff --git a/pcre2.spec b/pcre2.spec index b9053e3..c5281d2 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -30,6 +30,10 @@ Patch2: pcre2-10.22-RC1-Additional-test-for-recent-JIT-bugfix.patch # Bump pcre2posix SONAME because of ABI change in 10.22-RC1, in upstream after # 10.22-RC1 Patch3: pcre2-10.22-RC1-Fix-incorrect-SONAME-for-pcre2posix-wrapper-library.patch +# Correct pcre2unicode(3) documentation, in upstream after 10.22-RC1 +Patch4: pcre2-10.22-RC1-Fix-typos-and-add-clarification-to-documentation.patch +# Correct pcre2unicode(3) documentation, in upstream after 10.22-RC1 +Patch5: pcre2-10.22-RC1-Fix-typo-again-hopefully-correctly-this-time.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf @@ -111,6 +115,8 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -211,6 +217,7 @@ make %{?_smp_mflags} check VERBOSE=yes - 10.22-RC1 bump - libpcre2-posix library changed ABI - Fix register overwite in JIT when SSE2 acceleration is enabled +- Correct pcre2unicode(3) documentation * Mon Jun 20 2016 Petr Pisar - 10.21-6 - Fix repeated pcregrep output if -o with -M options were used and the match