diff --git a/net/libpsl/Makefile b/net/libpsl/Makefile index 58ec084d1e9..dfb627ade05 100644 --- a/net/libpsl/Makefile +++ b/net/libpsl/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2017/02/22 13:25:36 jca Exp $ +# $OpenBSD: Makefile,v 1.10 2017/02/27 23:32:15 jca Exp $ COMMENT = public suffix list library -DISTNAME = libpsl-0.15.0 -REVISION = 0 +DISTNAME = libpsl-0.17.0 -SHARED_LIBS += psl 1.0 # 5.0 +SHARED_LIBS += psl 1.1 # 6.1 CATEGORIES = net www diff --git a/net/libpsl/distinfo b/net/libpsl/distinfo index d9c3167914a..7c222d4ff31 100644 --- a/net/libpsl/distinfo +++ b/net/libpsl/distinfo @@ -1,2 +1,2 @@ -SHA256 (libpsl-0.15.0.tar.gz) = tZRjVdgQ/gOtxBlPG1r+hhVHKIwt26JL06o5qPGIqXI= -SIZE (libpsl-0.15.0.tar.gz) = 568878 +SHA256 (libpsl-0.17.0.tar.gz) = Alcp1qJv/VPLVLTYYZb2LAHRgTpDYMYnVGxutgzj3Us= +SIZE (libpsl-0.17.0.tar.gz) = 567193 diff --git a/net/libpsl/patches/patch-src_psl2c_c b/net/libpsl/patches/patch-src_psl2c_c deleted file mode 100644 index 079c531e0c7..00000000000 --- a/net/libpsl/patches/patch-src_psl2c_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_psl2c_c,v 1.4 2016/12/01 09:24:23 jca Exp $ - -Correct the name of the sha1sum command. - ---- src/psl2c.c.orig Mon Nov 7 11:02:15 2016 -+++ src/psl2c.c Thu Dec 1 09:39:50 2016 -@@ -266,7 +266,7 @@ int main(int argc, const char **argv) - - _print_psl_entries_dafsa(fpout, psl->suffixes); - -- snprintf(cmd, cmdsize, "sha1sum %s", argv[argpos]); -+ snprintf(cmd, cmdsize, "gsha1sum %s", argv[argpos]); - if ((pp = popen(cmd, "r"))) { - if (fscanf(pp, "%63[0-9a-zA-Z]", checksum) < 1) - *checksum = 0; diff --git a/net/libpsl/patches/patch-src_psl_c b/net/libpsl/patches/patch-src_psl_c deleted file mode 100644 index 4329e213e07..00000000000 --- a/net/libpsl/patches/patch-src_psl_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_psl_c,v 1.2 2016/05/10 11:34:54 jca Exp $ - -Missing includes for in6_addr / AF_INET*. - ---- src/psl.c.orig Fri Feb 12 12:22:39 2016 -+++ src/psl.c Mon May 9 16:25:20 2016 -@@ -68,6 +68,8 @@ - - #include - #include -+#include -+#include - #include - #include - #include