From 9d0a7bf439fa2b80232087568c76c448dd3aedd6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 3 Dec 2024 13:31:05 +0100 Subject: [PATCH] net-libs/http-parser, dev-libs/libpcre: Drop unused packages --- .../portage-stable/dev-libs/libpcre/Manifest | 1 - ...ibpcre-8.41-fix-stack-size-detection.patch | 17 --- ...ibpcre-8.45-fix-stack-size-detection.patch | 18 --- .../dev-libs/libpcre/libpcre-8.45-r2.ebuild | 106 ----------------- .../dev-libs/libpcre/libpcre-8.45-r3.ebuild | 109 ------------------ .../dev-libs/libpcre/metadata.xml | 29 ----- .../net-libs/http-parser/Manifest | 1 - .../http-parser-2.9.4-non-x86-test.patch | 20 ---- .../http-parser/http-parser-2.9.4-r2.ebuild | 38 ------ .../net-libs/http-parser/metadata.xml | 11 -- 10 files changed, 350 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.45-fix-stack-size-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/http-parser/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/http-parser/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest deleted file mode 100644 index 295a352e94..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch deleted file mode 100644 index b539267794..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.exim.org/show_bug.cgi?id=2173#c4 - ---- a/pcre_exec.c -+++ b/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/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.45-fix-stack-size-detection.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.45-fix-stack-size-detection.patch deleted file mode 100644 index 2b5af062d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.45-fix-stack-size-detection.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.exim.org/show_bug.cgi?id=2173#c4 -https://bugs.gentoo.org/910188 -https://github.com/MariaDB/server/pull/2700 ---- a/pcre_exec.c -+++ b/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__((optnone,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/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild deleted file mode 100644 index 936ebeb6e2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit libtool multilib-minimal preserve-libs usr-ldscript - -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=" - https://downloads.sourceforge.net/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib" -REQUIRED_USE=" - readline? ( !libedit ) - libedit? ( !readline ) -" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:= ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND="virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-8.45-fix-stack-size-detection.patch -) - -src_prepare() { - default - - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - $(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 valgrind) - $(multilib_native_use_enable zlib pcregrep-libz) - - --enable-pcre8 - --enable-shared - ) - - 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 || echo "bin_PROGRAMS= dist_html_DATA=") \ - install - - gen_usr_ldscript -a pcre -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libpcre.so.0 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r3.ebuild deleted file mode 100644 index 94bfbcdd85..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal preserve-libs - -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=" - https://downloads.sourceforge.net/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib" -REQUIRED_USE=" - readline? ( !libedit ) - libedit? ( !readline ) -" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:= ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-debug/valgrind ) -" -BDEPEND="virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-8.45-fix-stack-size-detection.patch -) - -src_prepare() { - default - - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - - # We do a full autoreconf because: - # - the software is end of life and never getting new dist tarballs - # - it uses a frankensteined "2.4.6.42-b88ce-dirty" libtool, which - # means elibtoolize can't find patches to apply - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(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 valgrind) - $(multilib_native_use_enable zlib pcregrep-libz) - - --enable-pcre8 - --enable-shared - ) - - 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 || echo "bin_PROGRAMS= dist_html_DATA=") \ - install -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libpcre.so.0 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml deleted file mode 100644 index e7bcdb6d6d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - - Add support for pcregrep command to search within - bzip2-compressed files (via app-arch/bzip2). - - Build PCRE library for 16 bit characters (e.g. UTF-16). - Build PCRE library for 32 bit characters (e.g. UTF-32). - - Add support for command line editing to pcretest, through - sys-libs/readline. - - - Add support for pcregrep command to search within - gzip-compressed files (via sys-libs/zlib). - - - - https://bugs.exim.org/describecomponents.cgi?product=PCRE - cpe:/a:pcre:pcre - pcre - - diff --git a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/http-parser/Manifest deleted file mode 100644 index b2fb6df908..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST http-parser-2.9.4.tar.gz 52056 BLAKE2B 988ebc3f3e1a7d53ed4147dac2e09c4d6021bb1a287990d83130c24e9fee01a3123b4c5ad9e1b86c0f123248484dae272010aa1f3ebd3bd4574d8407ede94e62 SHA512 b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd diff --git a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch b/sdk_container/src/third_party/portage-stable/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch deleted file mode 100644 index 8bcbbf3589..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/files/http-parser-2.9.4-non-x86-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/test.c b/test.c -index 53a3163..49c4b7a 100644 ---- a/test.c -+++ b/test.c -@@ -4343,7 +4343,13 @@ main (void) - printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); - - printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); -- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); -+ -+#if defined(__i386__) || defined(__x86_64__) -+ /* Should be 32 on both 32 bits and 64 bits x86 because of struct padding, -+ * see https://github.com/nodejs/http-parser/issues/507. -+ */ -+ assert(sizeof(http_parser) == 24 + sizeof(void*)); -+#endif - - //// API - test_preserve_data(); - diff --git a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r2.ebuild deleted file mode 100644 index 797273aa6b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="HTTP request/response parser for C" -HOMEPAGE="https://github.com/nodejs/http-parser" -SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -# 2.9.4 restored ABI compatibility with 2.9.0 but since we failed -# to set subslot in 2.9.3, we want to provoke another rebuild -SLOT="0/2.9.4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" - -PATCHES=( - "${FILESDIR}"/${P}-non-x86-test.patch -) - -src_configure() { - tc-export CC AR -} - -src_compile() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library -} - -src_test() { - emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - - einstalldocs -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/http-parser/metadata.xml deleted file mode 100644 index 8210ad81b9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/http-parser/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mgorny@gentoo.org - Michał Górny - - - nodejs/http-parser - -