summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorst G. Burkhardt <horst@adelielinux.org>2018-03-29 08:53:57 +0000
committerHorst G. Burkhardt <horst@adelielinux.org>2018-03-29 08:53:57 +0000
commitaccd4bdd6eb610f180db812281b807a42bdd68aa (patch)
tree82a93828730f07150309c2a983b98cda4c806bee
parent61ce37455ec2f99ef314b876859ce24c9166ca1e (diff)
downloadpackages-accd4bdd6eb610f180db812281b807a42bdd68aa.tar.gz
packages-accd4bdd6eb610f180db812281b807a42bdd68aa.tar.bz2
packages-accd4bdd6eb610f180db812281b807a42bdd68aa.tar.xz
packages-accd4bdd6eb610f180db812281b807a42bdd68aa.zip
user/ncompress: ncompress no longer conflicts with gzip; bugfix debian #220820
-rw-r--r--user/ncompress/APKBUILD13
-rw-r--r--user/ncompress/fix-9bit-compress.patch20
2 files changed, 28 insertions, 5 deletions
diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD
index 527f0d610..175293962 100644
--- a/user/ncompress/APKBUILD
+++ b/user/ncompress/APKBUILD
@@ -2,23 +2,26 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ncompress
pkgver=4.2.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="A fast, simple LZW compressor"
url="https://github.com/vapier/ncompress"
arch="all"
license="PD"
options="!check" # No test suite.
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz
+ fix-9bit-compress.patch"
build() {
cd "$builddir"
- make BINDIR=/usr/bin MANDIR=/usr/share/man/man1
+ make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 install
+ install -D -m755 "$builddir"/compress /usr/bin/compress
+ install -D -m644 "$builddir"/compress.1 /usr/share/man/man1/compress.1
}
-sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz"
+sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz
+b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch"
diff --git a/user/ncompress/fix-9bit-compress.patch b/user/ncompress/fix-9bit-compress.patch
new file mode 100644
index 000000000..3fcd13d2f
--- /dev/null
+++ b/user/ncompress/fix-9bit-compress.patch
@@ -0,0 +1,20 @@
+--- old/compress42.c 1992-10-28 06:10:53.000000000 -0500
++++ fixed/compress42.c 2003-11-12 19:42:49.000000000 -0500
+@@ -228,7 +228,7 @@
+ #define FIRST 257 /* first free entry */
+ #define CLEAR 256 /* table clear output code */
+
+-#define INIT_BITS 9 /* initial number of bits/code */
++#define INIT_BITS 8 /* initial number of bits/code */
+
+ #ifndef SACREDMEM
+ /*
+@@ -819,7 +819,7 @@
+ nextarg: continue;
+ }
+
+- if (maxbits < INIT_BITS) maxbits = INIT_BITS;
++ if (maxbits <= INIT_BITS) maxbits = INIT_BITS + 1;
+ if (maxbits > BITS) maxbits = BITS;
+
+ if (*filelist != NULL) \ No newline at end of file