diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 832b377bb52..976de0d4a08 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -55,7 +55,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`jq`](jq/) | jq | 1.6 | https://stedolan.github.io/jq/ | | [`klong`](klong/) | Klong | 20190926 | http://t3x.org/klong/ | | [`less`](less/) | less | 530 | http://www.greenwoodsoftware.com/less/ | -| [`libarchive`](libarchive/) | libarchive | 3.4.0 | https://libarchive.org/ | +| [`libarchive`](libarchive/) | libarchive | 3.5.1 | https://libarchive.org/ | | [`libassuan`](libassuan/) | libassuan | 2.5.5 | https://gnupg.org/software/libassuan/index.html | | [`libexpat`](libexpat/) | Expat | 2.2.9 | https://libexpat.github.io/ | | [`libffi`](libffi/) | libffi | 3.4.2 | https://www.sourceware.org/libffi/ | diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh index bc29cfe1203..130227f60b9 100755 --- a/Ports/libarchive/package.sh +++ b/Ports/libarchive/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port=libarchive -version=3.4.0 +version=3.5.1 useconfigure=true configopts="--without-xml2" files="https://libarchive.org/downloads/libarchive-${version}.tar.gz libarchive-${version}.tar.gz diff --git a/Ports/libarchive/patches/fix-autoconf.patch b/Ports/libarchive/patches/fix-autoconf.patch index 16947faa4cd..57efd7537d6 100644 --- a/Ports/libarchive/patches/fix-autoconf.patch +++ b/Ports/libarchive/patches/fix-autoconf.patch @@ -1,19 +1,13 @@ ---- libarchive-3.4.0/build/autoconf/config.sub.orig 2019-10-03 23:14:02.281000072 +0100 -+++ libarchive-3.4.0/build/autoconf/config.sub 2019-10-03 23:14:36.896816822 +0100 -@@ -2,7 +2,7 @@ - # Configuration validation subroutine script. - # Copyright 1992-2019 Free Software Foundation, Inc. - --timestamp='2019-05-23' -+timestamp='2019-10-12' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -1342,6 +1342,7 @@ - # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | serenity* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* - | sym* | kopensolaris* | plan9* \ +diff --git a/build/autoconf/config.sub.orig b/build/autoconf/config.sub +index 1d8e98bce..e1d397a3c 100755 +--- a/build/autoconf/config.sub.orig ++++ b/build/autoconf/config.sub +@@ -1390,7 +1390,7 @@ case $os in + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ +- | -midnightbsd*) ++ | -midnightbsd* | -serenity*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*)