mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 09:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-libs/libpcre: update to 8.44

Browse Source 
Update dev-libs/libpcre to 8.44, mainly to address security issues
like CVE-2019-20838, CVE-2020-14155 .
This commit is contained in:
Dongsu Park 2021-03-09 12:24:06 +01:00
parent 6b20fe0f08
commit 6904a001b1
5 changed files with 57 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a

15
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch vendored
View File

@ -1,15 +0,0 @@
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.000000000 -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

28
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41-r1.ebuild → sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.44.ebuild vendored
View File

@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
inherit libtool multilib-minimal preserve-libs usr-ldscript
DESCRIPTION="Perl-compatible regular expression library"
HOMEPAGE="http://www.pcre.org/"
@ -18,7 +18,7 @@ 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"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
@ -29,13 +29,10 @@ RDEPEND="
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline:0= )
"
DEPEND="
${RDEPEND}
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
RDEPEND="
${RDEPEND}
"
S="${WORKDIR}/${MY_P}"
@ -44,12 +41,11 @@ MULTILIB_CHOST_TOOLS=(
)
PATCHES=(
"${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch
"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
)
src_prepare() {
epatch "${PATCHES[@]}"
default
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize
}
@ -59,18 +55,18 @@ multilib_src_configure() {
--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 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)
$(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[@]}"
}
@ -88,7 +84,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
prune_libtool_files
find "${ED}" -type f -name "*.la" -delete || die
}
pkg_preinst() {

25
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.42.ebuild → sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45.ebuild vendored
View File

@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal
inherit libtool multilib-minimal preserve-libs usr-ldscript
DESCRIPTION="Perl-compatible regular expression library"
HOMEPAGE="http://www.pcre.org/"
@ -11,14 +11,17 @@ 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
https://ftp.pcre.org/pub/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
S="${WORKDIR}/${MY_P}"
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"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
@ -29,12 +32,8 @@ RDEPEND="
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline:0= )
"
DEPEND="
${RDEPEND}
virtual/pkgconfig
"
S="${WORKDIR}/${MY_P}"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
MULTILIB_CHOST_TOOLS=(
/usr/bin/pcre-config
@ -46,6 +45,7 @@ PATCHES=(
src_prepare() {
default
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize
}
@ -65,9 +65,11 @@ multilib_src_configure() {
$(use_enable unicode utf)
$(use_enable unicode unicode-properties)
$(multilib_native_use_enable zlib pcregrep-libz)
--enable-pcre8
--enable-shared
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
@ -80,11 +82,12 @@ multilib_src_install() {
DESTDIR="${D}" \
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
install
gen_usr_ldscript -a pcre
}
multilib_src_install_all() {
find "${ED}" -name "*.la" -delete || die
find "${ED}" -type f -name "*.la" -delete || die
}
pkg_preinst() {

57
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml vendored
View File

@ -1,32 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<use>
<flag name="bzip2">
Add support for pcregrep command to search within
bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
</flag>
<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
<flag name="readline">
Add support for command line editing to pcretest, through
<pkg>sys-libs/readline</pkg>.
</flag>
<flag name="recursion-limit">
Limit match recursion to 8192; if disabled, the default limit is
used, which is the same as the match limit.
</flag>
<flag name="zlib">
Add support for pcregrep command to search within
gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
<remote-id type="sourceforge">pcre</remote-id>
</upstream>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<use>
<flag name="bzip2">
Add support for pcregrep command to search within
bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
</flag>
<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
<flag name="readline">
Add support for command line editing to pcretest, through
<pkg>sys-libs/readline</pkg>.
</flag>
<flag name="recursion-limit">
Limit match recursion to 8192; if disabled, the default limit is
used, which is the same as the match limit.
</flag>
<flag name="zlib">
Add support for pcregrep command to search within
gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
</flag>
</use>
<upstream>
<bugs-to>https://bugs.exim.org/describecomponents.cgi?product=PCRE</bugs-to>
<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
<remote-id type="sourceforge">pcre</remote-id>
</upstream>
</pkgmetadata>