From d6947687f41d556c1bba4082ea71d7324922d451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 7 Jul 2017 09:43:48 +0200
Subject: [PATCH] 8.41 bump

---
 .gitignore                              |  1 +
 pcre-8.41-RC1-JIT-compiler-update.patch | 44 -------------------------
 pcre.spec                               |  8 ++---
 sources                                 |  2 +-
 4 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 pcre-8.41-RC1-JIT-compiler-update.patch

diff --git a/.gitignore b/.gitignore
index 9a59dd8..28e7d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ pcre-8.10.tar.bz2
 /pcre-8.40-RC1.tar.bz2
 /pcre-8.40.tar.bz2
 /pcre-8.41-RC1.tar.bz2
+/pcre-8.41.tar.bz2
diff --git a/pcre-8.41-RC1-JIT-compiler-update.patch b/pcre-8.41-RC1-JIT-compiler-update.patch
deleted file mode 100644
index c228f1f..0000000
--- a/pcre-8.41-RC1-JIT-compiler-update.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 90f29ca7fd20f31bf05ba8f996944663b1e7c5ed Mon Sep 17 00:00:00 2001
-From: zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Thu, 15 Jun 2017 11:32:38 +0000
-Subject: [PATCH] JIT compiler 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@1704 2f5784b3-3f2a-0410-8824-cb99058d5e15
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- sljit/sljitNativeARM_32.c | 2 +-
- sljit/sljitNativeARM_64.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sljit/sljitNativeARM_32.c b/sljit/sljitNativeARM_32.c
-index baa816d..745da99 100644
---- a/sljit/sljitNativeARM_32.c
-+++ b/sljit/sljitNativeARM_32.c
-@@ -2285,7 +2285,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil
- #endif
- 	}
- 
--	return push_inst(compiler, (EMIT_DATA_PROCESS_INS(MOV_DP, 0, dst_reg, SLJIT_UNUSED, src) & ~COND_MASK) | cc);
-+	return push_inst(compiler, (EMIT_DATA_PROCESS_INS(MOV_DP, 0, dst_reg, SLJIT_UNUSED, RM(src)) & ~COND_MASK) | cc);
- }
- 
- SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value)
-diff --git a/sljit/sljitNativeARM_64.c b/sljit/sljitNativeARM_64.c
-index cea8b33..fd67f50 100644
---- a/sljit/sljitNativeARM_64.c
-+++ b/sljit/sljitNativeARM_64.c
-@@ -2063,7 +2063,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil
- 	cc = get_cc(type & 0xff);
- 	dst_reg &= ~SLJIT_I32_OP;
- 
--	return push_inst(compiler, (CSEL ^ inv_bits) | (cc << 12) | RD(dst_reg) | RN(src) | RM(dst_reg));
-+	return push_inst(compiler, (CSEL ^ inv_bits) | (cc << 12) | RD(dst_reg) | RN(dst_reg) | RM(src));
- }
- 
- SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value)
--- 
-2.9.4
-
diff --git a/pcre.spec b/pcre.spec
index 39852c1..702a2a1 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,5 +1,5 @@
 # Is this a stable/testing release:
-%global rcversion RC1
+#%%global rcversion RC1
 Name:       pcre
 Version:    8.41
 Release:    %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
@@ -33,8 +33,6 @@ Source:     ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversio
 Patch0:     pcre-8.21-multilib.patch
 # Refused by upstream, bug #675477
 Patch1:     pcre-8.32-refused_spelling_terminated.patch
-# Fix JIT on ARM, in upstream after 8.41-RC1
-Patch2:     pcre-8.41-RC1-JIT-compiler-update.patch
 BuildRequires:  readline-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,7 +116,6 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 # Get rid of rpath
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 # Because of rpath patch
 libtoolize --copy --force
 autoreconf -vif
@@ -220,6 +217,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Fri Jul 07 2017 Petr Pisar <ppisar@redhat.com> - 8.41-1
+- 8.41 bump
+
 * Wed Jun 14 2017 Petr Pisar <ppisar@redhat.com> - 8.41-0.1.RC1
 - 8.41 RC1 bump
 
diff --git a/sources b/sources
index 32951bf..11cfcaf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcre-8.41-RC1.tar.bz2) = 5d29f96af022a6fa8c6ca484f3c6756838f745423030102612138ed252f5bd1185e7b9e361b465332150d24af0361961765d4f872aa56518a32f709e014c845a
+SHA512 (pcre-8.41.tar.bz2) = cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551