diff --git a/net-libs/libpsl/libpsl-0.20.1.recipe b/net-libs/libpsl/libpsl-0.20.2.recipe similarity index 92% rename from net-libs/libpsl/libpsl-0.20.1.recipe rename to net-libs/libpsl/libpsl-0.20.2.recipe index 5d56b62e6..6f09a8241 100644 --- a/net-libs/libpsl/libpsl-0.20.1.recipe +++ b/net-libs/libpsl/libpsl-0.20.2.recipe @@ -8,8 +8,7 @@ COPYRIGHT="2014-2018 Tim Rühsen" LICENSE="libpsl" REVISION="1" SOURCE_URI="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$portVersion/libpsl-$portVersion.tar.gz" -CHECKSUM_SHA256="95199613158dd773257ef4feccf1acdf5f791479ab4537bd984ca8598447219f" -PATCHES="libpsl-$portVersion.patchset" +CHECKSUM_SHA256="f8fd0aeb66252dfcc638f14d9be1e2362fdaf2ca86bde0444ff4d5cc961b560f" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -19,7 +18,7 @@ if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then IDNA=libidn fi -libVersion="5.3.0" +libVersion="5.3.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -30,6 +29,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix lib:libunistring$secondaryArchSuffix lib:$IDNA$secondaryArchSuffix " diff --git a/net-libs/libpsl/patches/libpsl-0.20.1.patchset b/net-libs/libpsl/patches/libpsl-0.20.1.patchset deleted file mode 100644 index 33bada406..000000000 --- a/net-libs/libpsl/patches/libpsl-0.20.1.patchset +++ /dev/null @@ -1,45 +0,0 @@ -From b60ef1f09415e86bfb68aec8ca429759b4b4dd0b Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Thu, 15 Mar 2018 18:20:28 +0000 -Subject: tiny gcc2 patch - - -diff --git a/src/psl.c b/src/psl.c -index 4860ca0..f61de20 100644 ---- a/src/psl.c -+++ b/src/psl.c -@@ -1059,6 +1059,7 @@ const char *psl_unregistrable_domain(const psl_ctx_t *psl, const char *domain) - * To avoid nasty CPU hogging, we limit the lookup to max. 8 domain labels to the right. - */ - -+ { - int nlabels = 0; - const char *p; - for (p = domain + strlen(domain) - 1; p >= domain; p--) { -@@ -1067,6 +1068,7 @@ const char *psl_unregistrable_domain(const psl_ctx_t *psl, const char *domain) - break; - } - } -+ } - - /* - * We check from left to right to catch special PSL entries like 'forgot.his.name': -@@ -1115,6 +1117,7 @@ const char *psl_registrable_domain(const psl_ctx_t *psl, const char *domain) - * To avoid nasty CPU hogging, we limit the lookup to max. 8 domain labels to the right. - */ - -+ { - int nlabels = 0; - for (p = domain + strlen(domain) - 1; p >= domain; p--) { - if (*p == '.' && ++nlabels > 8) { -@@ -1122,6 +1125,7 @@ const char *psl_registrable_domain(const psl_ctx_t *psl, const char *domain) - break; - } - } -+ } - - /* - * We check from left to right to catch special PSL entries like 'forgot.his.name': --- -2.16.2 -