summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-18 05:48:12 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-18 05:48:12 -0500
commitb3d9e5f7b7dbcd259a8f16f38a0e58d4babb2975 (patch)
tree42851374d185273cdde8f32fdfa5bb149439fd8c
parentc497071652657198af26b74cf80e24329c02b9fb (diff)
downloadpackages-b3d9e5f7b7dbcd259a8f16f38a0e58d4babb2975.tar.gz
packages-b3d9e5f7b7dbcd259a8f16f38a0e58d4babb2975.tar.bz2
packages-b3d9e5f7b7dbcd259a8f16f38a0e58d4babb2975.tar.xz
packages-b3d9e5f7b7dbcd259a8f16f38a0e58d4babb2975.zip
system/libarchive: [PD] fix maintainer, de-penis, etc
-rw-r--r--system/libarchive/APKBUILD18
-rw-r--r--system/libarchive/seek-error.patch (renamed from system/libarchive/penis.patch)2
2 files changed, 13 insertions, 7 deletions
diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD
index a8310cbd4..07b5f9a43 100644
--- a/system/libarchive/APKBUILD
+++ b/system/libarchive/APKBUILD
@@ -1,16 +1,17 @@
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libarchive
pkgver=3.3.2
-pkgrel=3
-pkgdesc="library that can create and read several streaming archive formats"
+pkgrel=4
+pkgdesc="Library for creating and reading streaming archives"
url="http://libarchive.org/"
arch="all"
license="BSD"
-makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev attr-dev"
+makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev
+ attr-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://www.libarchive.org/downloads/$pkgname-$pkgver.tar.gz
- penis.patch
+ seek-error.patch
CVE-2017-14166.patch"
options="!check" # needs EUC-JP and KOI8R support in iconv
builddir="$srcdir/$pkgname-$pkgver"
@@ -37,6 +38,11 @@ build () {
make
}
+check() {
+ cd "$builddir"
+ make check
+}
+
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
@@ -51,5 +57,5 @@ tools() {
}
sha512sums="1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 libarchive-3.3.2.tar.gz
-3de98af0f97063999a6a06bb7a3d8cfa10b350237497eaf25a990178fe7ff74355445deb21ec9e883faad8ffc7f4e008cd9ac916be63c79b3f4ed2d5741e4336 penis.patch
+ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch
7cc9dbafd970c07fb4421b7a72a075cc0a000db77df4432222539c58625c93c45f01a144838b551980bc0c6dc5b4c3ab852eb1433006c3174581ba0897010dbe CVE-2017-14166.patch"
diff --git a/system/libarchive/penis.patch b/system/libarchive/seek-error.patch
index c3745979e..e14b281b1 100644
--- a/system/libarchive/penis.patch
+++ b/system/libarchive/seek-error.patch
@@ -5,7 +5,7 @@
#endif /* defined(HAVE_LINUX_FIEMAP_H) */
-#if defined(SEEK_HOLE) && defined(SEEK_DATA)
-+#if defined(SEEK_HOLE) && defined(SEEK_DATA) && defined(__PENIS__)
++#if defined(SEEK_HOLE) && defined(SEEK_DATA) && defined(__MAKE_ADELIE_WORK_AGAIN__)
/*
* SEEK_HOLE sparse interface (FreeBSD, Linux, Solaris)