diff --git a/dev-libs/libpcre2/libpcre2-10.44.recipe b/dev-libs/libpcre2/libpcre2-10.45.recipe similarity index 89% rename from dev-libs/libpcre2/libpcre2-10.44.recipe rename to dev-libs/libpcre2/libpcre2-10.45.recipe index 0feb6e35c..1baa5706b 100644 --- a/dev-libs/libpcre2/libpcre2-10.44.recipe +++ b/dev-libs/libpcre2/libpcre2-10.45.recipe @@ -7,19 +7,23 @@ even for building proprietary software. PCRE2 is a re-working of the original PCRE library to provide an entirely new \ API." HOMEPAGE="https://www.pcre.org/" -COPYRIGHT="1997-2024 University of Cambridge" +COPYRIGHT="1997-2024 University of Cambridge + 2007-2024 Philip Hazel + 2010-2024 Zoltan Herczeg" LICENSE="PCRE" REVISION="1" SOURCE_URI="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$portVersion/pcre2-$portVersion.tar.bz2" -CHECKSUM_SHA256="d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96" +CHECKSUM_SHA256="21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f192033c4" +#SOURCE_SIG_URI="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$portVersion/pcre2-$portVersion.tar.bz2.sig" +#PGPKEYS=(A95536204A3BB489715231282A98E77EB6F24CA8) SOURCE_DIR="pcre2-$portVersion" PATCHES="libpcre2-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libpcre2Version="0.13.0" -libpcre2posixVersion="3.0.5" +libpcre2Version="0.14.0" +libpcre2posixVersion="3.0.6" libpcre2VersionCompat="$libpcre2Version compat >= ${libpcre2Version%%.*}" libpcre2posixVersionCompat="$libpcre2posixVersion compat >= ${libpcre2posixVersion%%.*}" portVersionCompat="$portVersion compat >= 10" diff --git a/dev-libs/libpcre2/licenses/PCRE b/dev-libs/libpcre2/licenses/PCRE index 3c1ef032d..f58ceb75a 100644 --- a/dev-libs/libpcre2/licenses/PCRE +++ b/dev-libs/libpcre2/licenses/PCRE @@ -1,5 +1,8 @@ -PCRE2 LICENCE -------------- +PCRE2 License +============= + +| SPDX-License-Identifier: | BSD-3-Clause WITH PCRE2-exception | +|---------|-------| PCRE2 is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. @@ -16,40 +19,46 @@ optimize pattern matching. This is an optional feature that can be omitted when the library is built. -THE BASIC LIBRARY FUNCTIONS ---------------------------- +COPYRIGHT +--------- -Written by: Philip Hazel -Email local part: Philip.Hazel -Email domain: gmail.com +### The basic library functions -Retired from University of Cambridge Computing Service, -Cambridge, England. + Written by: Philip Hazel + Email local part: Philip.Hazel + Email domain: gmail.com -Copyright (c) 1997-2024 University of Cambridge -All rights reserved. + Retired from University of Cambridge Computing Service, + Cambridge, England. + Copyright (c) 1997-2007 University of Cambridge + Copyright (c) 2007-2024 Philip Hazel + All rights reserved. -PCRE2 JUST-IN-TIME COMPILATION SUPPORT --------------------------------------- +### PCRE2 Just-In-Time compilation support -Written by: Zoltan Herczeg -Email local part: hzmester -Email domain: freemail.hu + Written by: Zoltan Herczeg + Email local part: hzmester + Email domain: freemail.hu -Copyright(c) 2010-2024 Zoltan Herczeg -All rights reserved. + Copyright (c) 2010-2024 Zoltan Herczeg + All rights reserved. +### Stack-less Just-In-Time compiler -STACK-LESS JUST-IN-TIME COMPILER --------------------------------- + Written by: Zoltan Herczeg + Email local part: hzmester + Email domain: freemail.hu -Written by: Zoltan Herczeg -Email local part: hzmester -Email domain: freemail.hu + Copyright (c) 2009-2024 Zoltan Herczeg + All rights reserved. -Copyright(c) 2009-2024 Zoltan Herczeg -All rights reserved. +### All other contributions + +Many other contributors have participated in the authorship of PCRE2. As PCRE2 +has never required a Contributor Licensing Agreement, or other copyright +assignment agreement, all contributions have copyright retained by each +original contributor or their employer. THE "BSD" LICENCE @@ -58,16 +67,16 @@ THE "BSD" LICENCE Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notices, - this list of conditions and the following disclaimer. +* Redistributions of source code must retain the above copyright notices, + this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notices, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. +* Redistributions in binary form must reproduce the above copyright + notices, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - * Neither the name of the University of Cambridge nor the names of any - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. +* Neither the name of the University of Cambridge nor the names of any + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/dev-libs/libpcre2/patches/libpcre2-10.44.patchset b/dev-libs/libpcre2/patches/libpcre2-10.45.patchset similarity index 60% rename from dev-libs/libpcre2/patches/libpcre2-10.44.patchset rename to dev-libs/libpcre2/patches/libpcre2-10.45.patchset index b22b22ee6..e9805eec3 100644 --- a/dev-libs/libpcre2/patches/libpcre2-10.44.patchset +++ b/dev-libs/libpcre2/patches/libpcre2-10.45.patchset @@ -1,14 +1,14 @@ -From 7f2885de779e2fd2fd48868b67722d41aefa3ebb Mon Sep 17 00:00:00 2001 +From a36e9cc9dfe0d11d923a4f94508124b0550d381e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 24 Nov 2019 11:14:44 +0100 Subject: workaround broken setrlimit on Haiku. diff --git a/src/pcre2test.c b/src/pcre2test.c -index 3790345..3d1498d 100644 +index 80ab4f8..fa8e65a 100644 --- a/src/pcre2test.c +++ b/src/pcre2test.c -@@ -9204,7 +9204,9 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0) +@@ -9652,7 +9652,9 @@ while (argc > 1 && argv[op][0] == '-' && argv[op][1] != 0) { fprintf(stderr, "pcre2test: setting stack size %luMiB failed: %s\n", (unsigned long int)stack_size, strerror(errno)); @@ -22,17 +22,17 @@ index 3790345..3d1498d 100644 2.45.2 -From 05ddf3451eba48c13b187df3ced1eeb357f37756 Mon Sep 17 00:00:00 2001 +From 6f464dbc51641ca7e10a54460456d19f02019326 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 1 Mar 2024 11:13:05 +0000 Subject: Disable AVX2 instructions for Haiku -diff --git a/src/sljit/sljitNativeX86_common.c b/src/sljit/sljitNativeX86_common.c -index ecb7e9b..e262d82 100644 ---- a/src/sljit/sljitNativeX86_common.c -+++ b/src/sljit/sljitNativeX86_common.c -@@ -543,8 +543,10 @@ static void get_cpu_features(void) +diff --git a/deps/sljit/sljit_src/sljitNativeX86_common.c b/deps/sljit/sljit_src/sljitNativeX86_common.c +index 9f599d5..4f7ba03 100644 +--- a/deps/sljit/sljit_src/sljitNativeX86_common.c ++++ b/deps/sljit/sljit_src/sljitNativeX86_common.c +@@ -554,8 +554,10 @@ static void get_cpu_features(void) if (info[1] & 0x8) feature_list |= CPU_FEATURE_TZCNT;