From 211c3dfce259e9c51a87e44fdf6c14cf890282b6 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Feb 27 2017 14:19:18 +0000
Subject: Document pcretest input cannot contain binary zeroes


---

diff --git a/pcre-8.40-Minor-doc-update.patch b/pcre-8.40-Minor-doc-update.patch
new file mode 100644
index 0000000..d7c2ca1
--- /dev/null
+++ b/pcre-8.40-Minor-doc-update.patch
@@ -0,0 +1,39 @@
+From e7991eb5273b5b4162656f4b3d32e68a7430805a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Thu, 23 Feb 2017 17:25:44 +0000
+Subject: [PATCH] Minor doc update.
+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@1687 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.40.
+
+diff --git a/doc/pcretest.1 b/doc/pcretest.1
+index 92640da..1b89071 100644
+--- a/doc/pcretest.1
++++ b/doc/pcretest.1
+@@ -50,6 +50,10 @@ newline as data characters. However, in some Windows environments character 26
+ (hex 1A) causes an immediate end of file, and no further data is read. For
+ maximum portability, therefore, it is safest to use only ASCII characters in
+ \fBpcretest\fP input files.
++.P
++The input is processed using using C's string functions, so must not          
++contain binary zeroes, even though in Unix-like environments, \fBfgets()\fP
++treats any bytes other than newline as data characters.
+ .
+ .
+ .SH "PCRE's 8-BIT, 16-BIT AND 32-BIT LIBRARIES"
+@@ -1151,6 +1155,6 @@ Cambridge CB2 3QH, England.
+ .rs
+ .sp
+ .nf
+-Last updated: 09 February 2014
+-Copyright (c) 1997-2014 University of Cambridge.
++Last updated: 23 February 2017
++Copyright (c) 1997-2017 University of Cambridge.
+ .fi
+-- 
+2.7.4
+
diff --git a/pcre.spec b/pcre.spec
index 6990b28..9454c6f 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -52,6 +52,9 @@ Patch6:     pcre-8.40-Check-character-256-for-isprint-in-pcretest.patch
 # Fix a crash in pcretest when \O directive was supplied with too big number,
 # upstream bug #2044, in upstream after 8.40
 Patch7:     pcre-8.40-Make-pcretest-check-size-of-O-argument.patch
+# Document pcretest input cannot contain binary zeroes, upstream bug #2045,
+# in upstream after 8.40
+Patch8:     pcre-8.40-Minor-doc-update.patch
 BuildRequires:  readline-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -147,6 +150,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 # Because of rpath patch
 libtoolize --copy --force
 autoreconf -vif
@@ -246,6 +250,7 @@ make %{?_smp_mflags} check VERBOSE=yes
 * Fri Feb 24 2017 Petr Pisar <ppisar@redhat.com> - 8.40-5
 - Fix a crash in pcretest when \O directive was supplied with too big number
   (upstream bug #2044)
+- Document pcretest input cannot contain binary zeroes (upstream bug #2045)
 
 * Thu Feb 23 2017 Petr Pisar <ppisar@redhat.com> - 8.40-4
 - Fix a crash in pcretest when printing non-ASCII characters