mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
dev-libs/libpcre2: update to 10.40
Update dev-libs/libpcre2 to 10.40, mainly to address CVE-2022-1586 and CVE-2022-1587.
This commit is contained in:
Krzesimir Nowak
Dongsu Park
parent
18ca39598f
commit
f5434aa597
@ -1,3 +1,4 @@
|
||||
DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
|
||||
DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
|
||||
DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
|
||||
DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
|
||||
DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4
|
||||
DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
|
||||
DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
|
||||
inherit libtool multilib-minimal usr-ldscript
|
||||
|
||||
PATCH_SET="${P}-patchset-01.tar.xz"
|
||||
PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
|
||||
|
||||
DESCRIPTION="Perl-compatible regular expression library"
|
||||
HOMEPAGE="https://www.pcre.org/"
|
||||
MY_P="pcre2-${PV/_rc/-RC}"
|
||||
if [[ ${PV} != *_rc* ]] ; then
|
||||
# Only the final releases are available here.
|
||||
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
|
||||
SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
|
||||
https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
|
||||
else
|
||||
SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
|
||||
@ -24,14 +24,13 @@ if [[ -n "${PATCH_SET}" ]] ; then
|
||||
fi
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
|
||||
SLOT="0/3" # libpcre2-posix.so version
|
||||
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"
|
||||
IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
|
||||
REQUIRED_USE="?? ( libedit readline )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
"
|
||||
RDEPEND="
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
@ -48,7 +47,10 @@ MULTILIB_CHOST_TOOLS=(
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
|
||||
if [[ -d "${WORKDIR}/patches" ]] ; then
|
||||
rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
|
||||
eapply "${WORKDIR}"/patches
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
@ -59,7 +61,6 @@ multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--enable-pcre2-8
|
||||
--enable-shared
|
||||
--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
|
||||
$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
|
||||
$(multilib_native_use_enable libedit pcre2test-libedit)
|
||||
$(multilib_native_use_enable readline pcre2test-libreadline)
|
||||
@ -1,19 +1,21 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc
|
||||
inherit libtool multilib-minimal usr-ldscript verify-sig
|
||||
|
||||
PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
|
||||
PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
|
||||
MY_P="pcre2-${PV/_rc/-RC}"
|
||||
|
||||
DESCRIPTION="Perl-compatible regular expression library"
|
||||
HOMEPAGE="https://www.pcre.org/"
|
||||
MY_P="pcre2-${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"
|
||||
SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
|
||||
https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
|
||||
verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )"
|
||||
else
|
||||
SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
|
||||
fi
|
||||
@ -23,32 +25,40 @@ if [[ -n "${PATCH_SET}" ]] ; then
|
||||
https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
|
||||
SLOT="0/3" # libpcre2-posix.so version
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
|
||||
IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
|
||||
REQUIRED_USE="?? ( libedit readline )"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
"
|
||||
RDEPEND="
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
RDEPEND="bzip2? ( app-arch/bzip2 )
|
||||
libedit? ( dev-libs/libedit )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
readline? ( sys-libs/readline:= )
|
||||
zlib? ( sys-libs/zlib )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
BDEPEND="virtual/pkgconfig
|
||||
verify-sig? ( sec-keys/openpgp-keys-philiphazel )"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/pcre2-config
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
if use verify-sig ; then
|
||||
# Needed for downloaded patch (which is unsigned, which is fine)
|
||||
verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.sig}
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
|
||||
if [[ -d "${WORKDIR}/patches" ]] ; then
|
||||
rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
|
||||
eapply "${WORKDIR}"/patches
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
@ -59,7 +69,6 @@ multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--enable-pcre2-8
|
||||
--enable-shared
|
||||
--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
|
||||
$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
|
||||
$(multilib_native_use_enable libedit pcre2test-libedit)
|
||||
$(multilib_native_use_enable readline pcre2test-libreadline)
|
||||
@ -71,6 +80,7 @@ multilib_src_configure() {
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable unicode)
|
||||
)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
@ -78,6 +88,10 @@ multilib_src_compile() {
|
||||
emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check VERBOSE=yes
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
@ -16,17 +16,16 @@
|
||||
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>
|
||||
<slots>
|
||||
<subslots>Reflects binary compatibility for libpcre2-posix.so.</subslots>
|
||||
</slots>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
|
||||
<remote-id type="sourceforge">pcre</remote-id>
|
||||
<remote-id type="github">PhilipHazel/pcre2</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user