summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD45
2 files changed, 41 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 049de0a5da19..89ae2c51e461 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
pkgbase = zlib-asm
- pkgdesc = Compression library implementing the deflate compression method found in gzip and PKZIP
pkgver = 1.2.11
- pkgrel = 1
+ pkgrel = 2
url = https://www.zlib.net/
arch = i686
arch = x86_64
license = custom
depends = glibc
provides = zlib=1.2.11
+ provides = minizip=1.2.11
conflicts = zlib
+ conflicts = minizip
options = staticlibs
source = https://zlib.net/zlib-1.2.11.tar.gz
source = https://zlib.net/zlib-1.2.11.tar.gz.asc
@@ -17,4 +18,9 @@ pkgbase = zlib-asm
sha512sums = SKIP
pkgname = zlib-asm
+ pkgdesc = Compression library implementing the deflate compression method found in gzip and PKZIP
+
+pkgname = minizip-asm
+ pkgdesc = Mini zip and unzip based on zlib
+ depends = zlib-asm
diff --git a/PKGBUILD b/PKGBUILD
index f242ee6959cd..43de89f5c065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
-pkgname=zlib-asm
+pkgbase=zlib-asm
+pkgname=(zlib-asm minizip-asm)
pkgver=1.2.11
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom')
url="https://www.zlib.net/"
-provides=("zlib=$pkgver")
-conflicts=('zlib')
+provides=("zlib=$pkgver" "minizip=$pkgver")
+conflicts=('zlib' 'minizip')
depends=('glibc')
options=('staticlibs') # needed by binutils testsuite
-source=("https://zlib.net/zlib-$pkgver.tar.gz"{,.asc})
+source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
sha512sums=('73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae'
'SKIP')
validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
@@ -36,21 +37,41 @@ build() {
esac
CFLAGS+=' -O3 -DASMV'
-
./configure --prefix=/usr
make OBJA=match.o PIC_OBJA=match.lo
- sed '/\*\//q' zlib.h > LICENSE
+ cd contrib/minizip
+ cp Makefile Makefile.orig
+ cp ../README.contrib readme.txt
+ autoreconf --install
+ ./configure --prefix=/usr --enable-static=no
+ make
}
check() {
cd ${srcdir}/zlib-$pkgver
make test
+
+ cd contrib/minzip
+ make -f Makefile.orig test
}
-package() {
+package_zlib-asm() {
+ pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
+
cd ${srcdir}/zlib-$pkgver
+ make install DESTDIR=${pkgdir}
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE"
+}
+
+package_minizip-asm() {
+ pkgdesc='Mini zip and unzip based on zlib'
+ depends=('zlib-asm')
+
+ cd ${srcdir}/zlib-$pkgver/contrib/minizip
+ make install DESTDIR=${pkgdir}
+ install -D -m644 ${srcdir}/zlib-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/minizip/LICENSE
- make install DESTDIR=$pkgdir
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/zlib/LICENSE"
+ # https://github.com/madler/zlib/pull/229
+ rm ${pkgdir}/usr/include/minizip/crypt.h
}