Update lrzip to 0.621, provided by Thomas Merkel

Changes:
MARCH 2015, version 0.621 Con Kolivas, Peter Hyman

* Fix libzpaq.cpp warnings
* Fix warnings in LzmaLib.c
* Making the high buffer only one page size is faster for sliding mmap mode
* Fix incompatible log callback in liblrzip
* Use PRId64 instead of lld in fscanf
* Use int64_t for i64
* Fix ISO C warning in lrzip.c
* Fix ISO C warning in lrzip.c
* Fix ISO C warning in runzip.c
* Fix ISO C warnings in rzip.c
* Fix iso c warning in util.c
* Fix EOL to unix on libzpaq
* control->tmpdir fixes
* Null terminate long options to find unhandled options
* Trivial date
* Add long option support
* Brace failure lead to broken dump to stdout
* fflush messages on print_err
* Fix inverse logic
* Honour the proper unix environment variable for temporary directory and then
try variations
* Attempt to decompress file in ram only if we are unable to create temporary
files when decompressing to stdout
* Avoid checking return values repeatedly on compress that only lead to failures
anyway
* Microoptimisation
* Don't check for failure condition that can no longer occur
* Don't check twice for failure conditions that are fatal in hot paths
* Cache the chunk bytes value to avoid setting it on each read_header call
* fake_mremap is only used when defined to mremap
* Remove unused cksem functions
* Fix remaining use of mutexes lock/unlocking in different threads with cksems,
corecting cksem usage on osx
* Update copyright dates
* Make match_len a function completely removing all indirect calls to get_sb,
significantly speeding up the single_get_sb case
* Make full_tag a pointer allowing us to avoid a function call for get_sb
* Call sliding_get_sb directly in sliding_next_tag
* Make next_tag a pointer to allow ordinary mapping to avoid an extra function
call
* fix order of lrzip.conf search

MARCH 2015, version 0.620 Con Kolivas, Peter Hyman, Chris Spiegel, Elmir Jagudin

* Increase maxram when we abandon use of temporary input/output buffers
* Don't delete the tmpinfile when decompressing from stdin before allowing seek
to end to succeed in checking md5
* Use temporary file from read_seekto when STDIN will not fit in the ram input
buffer
* Remove unused read_i64 function
* Add message about issue tracker in BUGS
* Use a common exit path iin lrzip_compress/decompress and fix lr leak on
successful return
* Fix parenthesis placement inside of unlikely().
* Clear sa_mask and sa_handler before calling sigaction().
* Fix for lrzip -i. Decompressed size wrong
* added '-m' command line option
* Fix wrong README file being included in Makefile
* Pass strict sizes to decompress length, rounding up only the amount we're
allocating to not confuse decompression libraries
* Convert the thread locking to use cksems
* Add cksems to util.h
* Fix 'Failed to malloc ckbuf in hash_search2' with very large files.
* Round up compression and decompression buffers to page size since malloc will
allocate them that large anyway.
* Increase the compressed buffer size given to libzpaq in case of incompressible
data since it does not check if it's trying to write beyond the end of the
buffer.
* Provide a helper function to round a value up to the nearest page size for
malloc optimisations.

5 files changed, 29 insertions, 13 deletions

diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile
index ff75dfd61ba..13688a375f4 100644
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/01/09 15:34:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/08 14:58:09 wiedi Exp $
 
-DISTNAME=	lrzip-0.616
-PKGREVISION=	1
+DISTNAME=	lrzip-0.621
 CATEGORIES=	archivers
 MASTER_SITES=	http://ck.kolivas.org/apps/lrzip/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/archivers/lrzip/PLIST b/archivers/lrzip/PLIST
index 899b3aebf99..409112d249b 100644
--- a/archivers/lrzip/PLIST
+++ b/archivers/lrzip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/10/21 11:29:05 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/08 14:58:09 wiedi Exp $
 bin/lrunzip
 bin/lrzcat
 bin/lrzip
@@ -17,11 +17,11 @@ share/doc/lrzip/AUTHORS
 share/doc/lrzip/BUGS
 share/doc/lrzip/COPYING
 share/doc/lrzip/ChangeLog
-share/doc/lrzip/README
 share/doc/lrzip/README-NOT-BACKWARD-COMPATIBLE
 share/doc/lrzip/README.Assembler
 share/doc/lrzip/README.benchmarks
 share/doc/lrzip/README.lzo_compresses.test.txt
+share/doc/lrzip/README.md
 share/doc/lrzip/TODO
 share/doc/lrzip/WHATS-NEW
 share/doc/lrzip/lrzip.conf.example
diff --git a/archivers/lrzip/distinfo b/archivers/lrzip/distinfo
index 27733099b73..cf641c3bea8 100644
--- a/archivers/lrzip/distinfo
+++ b/archivers/lrzip/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2013/11/08 21:14:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/06/08 14:58:09 wiedi Exp $
 
-SHA1 (lrzip-0.616.tar.bz2) = 374a021ff087ee93b2d5894fd16aa3aef26dfa8f
-RMD160 (lrzip-0.616.tar.bz2) = 6cc2a3f6fd13bfbaba93ae61bf0597383e0d98cd
-Size (lrzip-0.616.tar.bz2) = 493886 bytes
+SHA1 (lrzip-0.621.tar.bz2) = 9c33f6458d39443dbf71b5c66820d4d653daf3c0
+RMD160 (lrzip-0.621.tar.bz2) = 91e04e6969e661ceb5b1259e125722b0cc7fc913
+Size (lrzip-0.621.tar.bz2) = 503286 bytes
 SHA1 (patch-liblrzip.c) = 64092c1b186ced54ba57aba21eb4c9180c82e3ed
 SHA1 (patch-lrzip.h) = 42c3f7eccbd93e1bad5bb91941c1e69a2ff261cd
-SHA1 (patch-lrzip__private.h) = b56cc367a9c2038ccc3448ec2d8c7e07c7e3b44c
+SHA1 (patch-lrzip__private.h) = 17eb75f2a497a47d575cfbe075953311097024cc
+SHA1 (patch-rzip.c) = 787e891b25db11bd7f7a6ee52869224f646ecec8
diff --git a/archivers/lrzip/patches/patch-lrzip__private.h b/archivers/lrzip/patches/patch-lrzip__private.h
index d6741569c16..847ce457430 100644
--- a/archivers/lrzip/patches/patch-lrzip__private.h
+++ b/archivers/lrzip/patches/patch-lrzip__private.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-lrzip__private.h,v 1.1 2013/11/08 21:14:02 joerg Exp $
+$NetBSD: patch-lrzip__private.h,v 1.2 2015/06/08 14:58:09 wiedi Exp $
 
---- lrzip_private.h.orig	2013-11-08 20:52:44.000000000 +0000
+--- lrzip_private.h.orig	2015-03-10 09:25:42.000000000 +0000
 +++ lrzip_private.h
-@@ -139,7 +139,7 @@ extern int errno;
+@@ -140,7 +140,7 @@ extern int errno;
  #define unlikely(x)	__builtin_expect(!!(x), 0)
  #define __maybe_unused	__attribute__((unused))
  
diff --git a/archivers/lrzip/patches/patch-rzip.c b/archivers/lrzip/patches/patch-rzip.c
new file mode 100644
index 00000000000..1b57f6b0a09
--- /dev/null
+++ b/archivers/lrzip/patches/patch-rzip.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-rzip.c,v 1.1 2015/06/08 14:58:09 wiedi Exp $
+
+Use same platform check as in lrzip_private.h file. The fake_mremap is required
+on all platforms that are not linux.
+
+--- rzip.c.orig	2015-03-10 10:13:22.000000000 +0000
++++ rzip.c
+@@ -772,7 +772,7 @@ static inline void init_hash_indexes(str
+ 		st->hash_index[i] = ((random() << 16) ^ random());
+ }
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if !defined(__linux)
+ # define mremap fake_mremap
+ 
+ static inline void *fake_mremap(void *old_address, size_t old_size, size_t new_size, int flags __UNUSED__)