From 444f62867e26c64e6b0dd7d6d7cd1589099d143a Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Thu, 2 Nov 2023 22:22:30 +0000 Subject: [PATCH 1/2] bsdunzip: remove package. Hasn't been updated in 6 years. --- srcpkgs/bsdunzip/patches/add-license.patch | 38 ---------------------- srcpkgs/bsdunzip/template | 20 ------------ 2 files changed, 58 deletions(-) delete mode 100644 srcpkgs/bsdunzip/patches/add-license.patch delete mode 100644 srcpkgs/bsdunzip/template diff --git a/srcpkgs/bsdunzip/patches/add-license.patch b/srcpkgs/bsdunzip/patches/add-license.patch deleted file mode 100644 index e50e55da9c9e2..0000000000000 --- a/srcpkgs/bsdunzip/patches/add-license.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e8ce52e84c17944c8ee38786d2c401006f4962c7 Mon Sep 17 00:00:00 2001 -From: Kylie McClain -Date: Sun, 10 Jul 2016 22:32:16 -0400 -Subject: [PATCH] Add LICENSE (closes #1) - ---- - LICENSE | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 LICENSE - ---- /dev/null -+++ b/LICENSE -@@ -0,0 +1,24 @@ -+This license file only applies to the Makefile and README.md within the root -+of this repository. I claim no copyright on `/usr.bin/unzip`, or any files -+within it. The changes are likely too small to warrant a copyright claim. -+ -+All files in `/usr.bin/unzip` are under a two-clause BSD license as of last -+sync from upstream. -+ -+`Makefile` and `README.md` are licensed under the ISC license, which is -+reproduced here: -+ -+Copyright (c) 2015-2016 Kylie McClain -+ -+Permission to use, copy, modify, and/or distribute this software for any -+purpose with or without fee is hereby granted, provided that the above -+copyright notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ - diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template deleted file mode 100644 index e6ac1e4a369f3..0000000000000 --- a/srcpkgs/bsdunzip/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'bsdunzip' -pkgname=bsdunzip -version=20160115 -revision=2 -build_style=gnu-makefile -makedepends="libarchive-devel" -short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD" -maintainer="Orphaned " -license="BSD-2-Clause, ISC" -homepage="https://github.com/somasis/bsdunzip" -distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz" -checksum=06c52c77fa518732665aa2daa73f364cd2470a5d47a83c9c79f86f207cf3ecc1 - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" -fi - -post_install() { - vlicense LICENSE -} From 05da0935d4bea829b278f86ccf02a37a72f45126 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Sat, 14 Oct 2023 00:20:11 +0100 Subject: [PATCH 2/2] libarchive: update to 3.7.2. --- srcpkgs/bsdunzip | 1 + srcpkgs/libarchive/template | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 120000 srcpkgs/bsdunzip diff --git a/srcpkgs/bsdunzip b/srcpkgs/bsdunzip new file mode 120000 index 0000000000000..6e93d9cc1c027 --- /dev/null +++ b/srcpkgs/bsdunzip @@ -0,0 +1 @@ +libarchive \ No newline at end of file diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index f4885ebc033c5..0379ab52b980b 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive -version=3.6.2 -revision=3 +version=3.7.2 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) @@ -16,18 +16,13 @@ short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " license="BSD-2-Clause" homepage="http://www.libarchive.org/" -changelog="https://raw.githubusercontent.com/wiki/libarchive/libarchive/ReleaseNotes.md" -distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz" -checksum=ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3 +changelog="https://github.com/libarchive/libarchive/releases" +distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz" +checksum=04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb build_options="acl expat lzo lz4 ssl zstd" build_options_default="acl ssl lz4 zstd" -post_extract() { - # remove iconv from libarchive.pc requirements. - vsed -e '/LIBSREQUIRED.*iconv/d' -i configure -} - pre_configure() { export LIBS=-pthread } @@ -35,11 +30,11 @@ pre_configure() { do_check() { case "$XBPS_TARGET_LIBC" in *musl) - make check || + make check ${makejobs} || msg_warn "Tests can fail due to encoding conversions\n" ;; *) - make check + make check ${makejobs} ;; esac } @@ -59,6 +54,14 @@ bsdtar_package() { mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5} } } + +bsdunzip_package() { + reverts="20160115_2" + build_style="meta" + short_desc="BSD utilities using libarchive" + depends="bsdtar-${version}_${revision}" +} + libarchive-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"