[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/, dev-libs/libpcre/files/

[Lars Wendler]

commit: d8c6db460e2de44b3d4db179687ca5a6334ac3cf
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar 21 06:59:50 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 21 07:05:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c6db46

dev-libs/libpcre: Bump to version 8.42

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/libpcre/Manifest  |  1 +
 .../libpcre-8.41-fix-stack-size-detection.patch|  4 +-
 dev-libs/libpcre/libpcre-8.42.ebuild   | 96 ++
 3 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 6cdfc4655c5..9c138703d64 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,2 +1,3 @@
 DIST pcre-8.40.tar.bz2 1560119 BLAKE2B 
121d2c9f8c403a663fe27a68030faf09a06dec5e6a25ae8d62e06887850e219e87c71a14f6ded084fa25b719067acb71c89c66c81f6f09f55dcc51feaf41e737
 SHA512 
b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 
2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79
 SHA512 
cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
+DIST pcre-8.42.tar.bz2 1570171 BLAKE2B 
f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a
 SHA512 
b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d

diff --git a/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch 
b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
index 0fd6b5f3b22..a0e71ab3f30 100644
--- a/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
+++ b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
@@ -1,8 +1,8 @@
 https://bugs.exim.org/show_bug.cgi?id=2173#c4
 
 diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
 a/pcre/pcre_exec.c
-+++ b/pcre/pcre_exec.c
+--- a/pcre_exec.c
 b/pcre_exec.c
 @@ -509,6 +509,12 @@
   (e.g. stopped by repeated call or recursion limit)
  */

diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild 
b/dev-libs/libpcre/libpcre-8.42.ebuild
new file mode 100644
index 000..613e96bb360
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/;
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+   # Only the final releases are available here.
+   SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+   
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2;
+else
+   
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2;
+fi
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit 
static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+   libedit? ( !readline )"
+
+RDEPEND="
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   libedit? ( dev-libs/libedit )
+   readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/pcre-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
+)
+
+src_prepare() {
+   default
+   sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+   elibtoolize
+}
+
+multilib_src_configure() {
+   local myeconfargs=(
+   --with-match-limit-recursion=$(usex recursion-limit 8192 
MATCH_LIMIT)
+   $(multilib_native_use_enable bzip2 pcregrep-libbz2)
+   $(use_enable cxx cpp)
+   $(use_enable jit)
+   $(use_enable jit pcregrep-jit)
+   $(use_enable pcre16)
+   $(use_enable pcre32)
+   $(multilib_native_use_enable libedit pcretest-libedit)
+   $(multilib_native_use_enable readline pcretest-libreadline)
+   $(use_enable static-libs static)
+   $(use_enable unicode utf)
+   $(use_enable unicode unicode-properties)
+   $(multilib_native_use_enable zlib pcregrep-libz)
+   

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/, dev-libs/libpcre/files/

[Thomas Deutschmann]

commit: 181bc2b406fcf7c401b543181d0af6f6562602e7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct 30 22:26:59 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct 30 22:31:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181bc2b4

dev-libs/libpcre: Rev bump to fix stack size detection

Needed for dev-db/mariadb and friends.

Bug: https://jira.mariadb.org/browse/MDEV-13412
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../libpcre-8.41-fix-stack-size-detection.patch|  18 
 dev-libs/libpcre/libpcre-8.41-r1.ebuild| 104 +
 2 files changed, 122 insertions(+)

diff --git a/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch 
b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
new file mode 100644
index 000..0fd6b5f3b22
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
@@ -0,0 +1,18 @@
+https://bugs.exim.org/show_bug.cgi?id=2173#c4
+
+diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
+--- a/pcre/pcre_exec.c
 b/pcre/pcre_exec.c
+@@ -509,6 +509,12 @@
+  (e.g. stopped by repeated call or recursion limit)
+ */
+ 
++#ifdef __GNUC__
++static int
++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
++  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
++  unsigned int rdepth) __attribute__((noinline,noclone));
++#endif
+ static int
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild 
b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
new file mode 100644
index 000..eed796ef4bf
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/;
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+   # Only the final releases are available here.
+   SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+   
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2;
+else
+   
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2;
+fi
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit 
static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+   libedit? ( !readline )"
+
+RDEPEND="
+   bzip2? ( app-arch/bzip2 )
+   zlib? ( sys-libs/zlib )
+   libedit? ( dev-libs/libedit )
+   readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig
+"
+RDEPEND="
+   ${RDEPEND}
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-baselibs-20131008-r2
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/pcre-config
+)
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch
+   "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+   sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+   elibtoolize
+}
+
+multilib_src_configure() {
+   local myeconfargs=(
+   --with-match-limit-recursion=$(usex recursion-limit 8192 
MATCH_LIMIT)
+   $(multilib_native_use_enable bzip2 pcregrep-libbz2)
+   $(use_enable cxx cpp)
+   $(use_enable jit) $(use_enable jit pcregrep-jit)
+   $(use_enable pcre16)
+   $(use_enable pcre32)
+   $(multilib_native_use_enable libedit pcretest-libedit)
+   $(multilib_native_use_enable readline pcretest-libreadline)
+   $(use_enable static-libs static)
+   $(use_enable unicode utf) $(use_enable unicode 
unicode-properties)
+   $(multilib_native_use_enable zlib pcregrep-libz)
+   --enable-pcre8
+   --enable-shared
+   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+   --docdir="${EPREFIX}"/usr/share/doc/${PF}
+   )
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+   emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+   emake \
+   DESTDIR="${D}" \
+   $(multilib_is_native_abi || 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/, dev-libs/libpcre/files/

[Joshua Kinard]

commit: 25f864c733b97212f71e3677f4f1a2fbaca4e857
Author: Joshua Kinard  gentoo  org>
AuthorDate: Sat Jul 29 22:48:00 2017 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Sat Jul 29 22:49:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f864c7

dev-libs/libpcre: Fix compile error on MIPS.  Fixes #626564

Fixes a compile error on certain MIPS platforms that leads to a
violation of C grammar in sljit/sljitNativeMIPS_common.c.  Patch
has been upstreamed:
https://bugs.exim.org/show_bug.cgi?id=2154

Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../libpcre-8.41-sljit_mips-label-statement-fix.patch | 15 +++
 dev-libs/libpcre/libpcre-8.41.ebuild  |  7 ---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git 
a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch 
b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch
new file mode 100644
index 000..0494ccc25eb
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch
@@ -0,0 +1,15 @@
+diff -Naurp pcre-8.41.orig/sljit/sljitNativeMIPS_common.c 
pcre-8.41/sljit/sljitNativeMIPS_common.c
+--- pcre-8.41.orig/sljit/sljitNativeMIPS_common.c  2017-05-07 
11:32:25.0 -0400
 pcre-8.41/sljit/sljitNativeMIPS_common.c   2017-07-29 17:50:24.508909742 
-0400
+@@ -503,9 +503,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
+ #ifdef SLJIT_IS_FPU_AVAILABLE
+   return SLJIT_IS_FPU_AVAILABLE;
+ #elif defined(__GNUC__)
++  {
+   sljit_sw fir;
+   asm ("cfc1 %0, $0" : "=r"(fir));
+   return (fir >> 22) & 0x1;
++  }
+ #else
+ #error "FIR check is not implemented for this architecture"
+ #endif

diff --git a/dev-libs/libpcre/libpcre-8.41.ebuild 
b/dev-libs/libpcre/libpcre-8.41.ebuild
index a681e836fee..397cbd7f417 100644
--- a/dev-libs/libpcre/libpcre-8.41.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41.ebuild
@@ -47,11 +47,12 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/pcre-config
 )
 
-#PATCHES=(
-#)
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch
+)
 
 src_prepare() {
-   #epatch "${PATCHES[@]}"
+   epatch "${PATCHES[@]}"
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/, dev-libs/libpcre/files/

[Mike Frysinger]

commit: 6ef97cb24a97b21cf46d077f8ba9dd363db4e44d
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 30 23:29:53 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 30 23:47:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef97cb2

dev-libs/libpcre: drop old 8.3[567] versions

 dev-libs/libpcre/Manifest  |  3 -
 .../libpcre/files/libpcre-8.37-CVE-2015-3210.patch | 91 -
 .../libpcre/files/libpcre-8.37-CVE-2015-5073.patch | 72 
 dev-libs/libpcre/libpcre-8.35.ebuild   | 95 --
 dev-libs/libpcre/libpcre-8.36.ebuild   | 95 --
 dev-libs/libpcre/libpcre-8.37-r2.ebuild| 93 -
 6 files changed, 449 deletions(-)

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index c0cadfd..1e875c9 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,5 +1,2 @@
 DIST pcre-7.9.tar.bz2 861580 SHA256 
40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740 SHA512 
b4c47a9b196750d4bead9e3904702fc793d282a22af1b34e24081077b4c167ec787cf7dec9a565fa9df4dafb5927b7accdd49568f5c2f8733842cbbec5d4d25c
 WHIRLPOOL 
412cf0a128861cbb991a0424e9f4ba551093b7853465776e17465f9c2b4222002a8b26d7a234b91a49e055a04ae840ad5d6c1613615c98db3d44413a723a6152
-DIST pcre-8.35.tar.bz2 150 SHA256 
a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b SHA512 
e94c652b40de60b391e28afbddc67b5a034650f6f62027e52f2d7aef53caf5f0da9f2d4f6872d1558f965dd9d4d696e5e23d2a50f20a4fbc9f0a707fb6f55fae
 WHIRLPOOL 
677dd9673299438c4d76c68947124069b9c2b88ac837e59d00fc4e92113498357041f173ec4ae1cd61e760debad0a2392710f986794796678e596b9a22ba62a2
-DIST pcre-8.36.tar.bz2 1533818 SHA256 
ef833457de0c40e82f573e34528f43a751ff20257ad0e86d272ed5637eb845bb SHA512 
acd2bc6911be7b518ad4aca3c3ccbe98bdbeabf0e77d6b04009838c7825b563a001377f8c3a6a8a0583ec32ee9fefe05e3c1a69f272fe5084469a6b6c2148fbf
 WHIRLPOOL 
4c144e3c468a76d8bac3d8a0d4642f7b2e2bd03f84ca915d51a81af7128d7d9c6ed7272bf25e2b9c5eb435037b77ffc41b871bd7257efde0a14a20f5fb4b8432
-DIST pcre-8.37.tar.bz2 1557603 SHA256 
51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d SHA512 
19344c9add2ebbd26c528505d07d3b028d79bc3e6103d51453a449cebd76bc76f5bc7ddd9ef0de41f98c50be74a2d9a65db539ed60f1add1086d99bde8a81466
 WHIRLPOOL 
43f723a9107fd6d78a88d4682502d79d5b9b0df90a579667a80b9862611a1c7bee25a1d5a1f9facec7c077f89605d7d96e3843d4aa5b94113b49b06a974331e5
 DIST pcre-8.38.tar.bz2 1562265 SHA256 
b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 
ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0
 WHIRLPOOL 
68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df

diff --git a/dev-libs/libpcre/files/libpcre-8.37-CVE-2015-3210.patch 
b/dev-libs/libpcre/files/libpcre-8.37-CVE-2015-3210.patch
deleted file mode 100644
index 8199b08..000
--- a/dev-libs/libpcre/files/libpcre-8.37-CVE-2015-3210.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://bugs.exim.org/show_bug.cgi?id=1636
-https://bugs.gentoo.org/551240
-https://bugzilla.redhat.com/1236659
-
-From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
-From: ph10 
-Date: Fri, 15 May 2015 17:17:03 +
-Subject: [PATCH] Fix buffer overflow for named recursive back reference when
- the name is duplicated.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream commit ported to pcre-8.37:
-
-commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
-Author: ph10 
-Date:   Fri May 15 17:17:03 2015 +
-
-Fix buffer overflow for named recursive back reference when the name is
-duplicated.
-
-git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 
2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-This fixes CVE-2015-3210.
-
-Signed-off-by: Petr Písař 

- pcre_compile.c   | 16 ++--
- testdata/testinput2  |  2 ++
- testdata/testoutput2 |  2 ++
- 3 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 0efad26..6f06912 100644
 a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7173,14 +7173,26 @@ for (;; ptr++)
-   number. If the name is not found, set the value to 0 for a forward
-   reference. */
- 
-+  recno = 0;
-   ng = cd->named_groups;
-   for (i = 0; i < cd->names_found; i++, ng++)
- {
- if (namelen == ng->length &&
- STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--  break;
-+  {
-+  open_capitem *oc;
-+  recno = ng->number;
-+  if (is_recurse) break;
-+  for (oc = cd->open_caps; oc !=