A new version of xxhash has been released, which is a maintenance
update. Overview on changes can be found at
https://github.com/Cyan4973/xxHash/releases/tag/v0.8.3. Upstream merged
kn@'s pledge(2) PR for xxhsum(1). As such, local patch has been removed.
According to check_sym there are no changes in the lib.
Passes all tests and lightly run tested the tools. Build-tested
several customers without any hassle.
Comments/OK?
diff --git Makefile Makefile
index 84b163e36dd..90cbadc6045 100644
--- Makefile
+++ Makefile
@@ -3,8 +3,7 @@ COMMENT = extremely fast non-cryptographic hash algorithm
# bump rsync on updates; used as a header-only library there
GH_ACCOUNT = Cyan4973
GH_PROJECT = xxHash
-GH_TAGNAME = v0.8.2
-REVISION = 1
+GH_TAGNAME = v0.8.3
PKGNAME = ${DISTNAME:L}
SHARED_LIBS = xxhash 0.3 # 0.8.1
diff --git distinfo distinfo
index 1eef0531afa..fac9cbe402f 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xxHash-0.8.2.tar.gz) = uu4Mav1PAxZd56TmeYjRbw8rJXtR0OPLkZCTAqJqecQ=
-SIZE (xxHash-0.8.2.tar.gz) = 1141188
+SHA256 (xxHash-0.8.3.tar.gz) = quYI3+ghPf0F2QmldxjvgvMHIsOSNEWD0/OQUMfymoA=
+SIZE (xxHash-0.8.3.tar.gz) = 1147630
diff --git patches/patch-Makefile patches/patch-Makefile
index 4672c88aba0..607ac9be20c 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,9 +3,9 @@ Don't create symbolic links pointing to the shared lib.
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -581,8 +581,6 @@ install_libxxhash: libxxhash
+@@ -625,8 +625,6 @@ install_libxxhash: libxxhash
@echo Installing libxxhash
- $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(Q)$(MAKE_DIR) $(DESTDIR)$(LIBDIR)
$(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR)
- $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR)
- $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT)
diff --git patches/patch-cli_xsum_os_specific_c
patches/patch-cli_xsum_os_specific_c
deleted file mode 100644
index 5bd09d9f5e6..00000000000
--- patches/patch-cli_xsum_os_specific_c
+++ /dev/null
@@ -1,32 +0,0 @@
-Use pledge(2), xxhsum(1) only ever reads files or stdin.
-merged https://github.com/Cyan4973/xxHash/pull/880
-
-Index: cli/xsum_os_specific.c
---- cli/xsum_os_specific.c.orig
-+++ cli/xsum_os_specific.c
-@@ -69,6 +69,11 @@ static int XSUM_IS_CONSOLE(FILE* stdStream)
- || defined(__DJGPP__) \
- || defined(__MSYS__) \
- || defined(__HAIKU__)
-+# ifdef __OpenBSD__
-+# include <errno.h> /* errno */
-+# include <string.h> /* strerror */
-+# include "xsum_output.h" /* XSUM_log */
-+# endif
- # include <unistd.h> /* isatty */
- # define XSUM_IS_CONSOLE(stdStream) isatty(fileno(stdStream))
- #elif defined(MSDOS) || defined(OS2)
-@@ -135,6 +140,13 @@ static int XSUM_stat(const char* infilename, XSUM_stat
- #ifndef XSUM_NO_MAIN
- int main(int argc, const char* argv[])
- {
-+#ifdef __OpenBSD__
-+ if (pledge("stdio rpath", NULL) == -1) {
-+ XSUM_log("pledge: %s\n", strerror(errno));
-+ return 1;
-+ }
-+#endif
-+
- return XSUM_main(argc, argv);
- }
- #endif
diff --git patches/patch-xxhash_h patches/patch-xxhash_h
index d24eb059a32..0c5e0d1410c 100644
--- patches/patch-xxhash_h
+++ patches/patch-xxhash_h
@@ -1,7 +1,7 @@
Index: xxhash.h
--- xxhash.h.orig
+++ xxhash.h
-@@ -1983,8 +1983,11 @@ XXH3_128bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3
+@@ -2297,8 +2297,11 @@ XXH3_128bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3
/* prefer __packed__ structures (method 1) for GCC
* < ARMv7 with unaligned access (e.g. Raspbian armhf) still uses byte
shifting, so we use memcpy
* which for some reason does unaligned loads. */
diff --git pkg/PLIST pkg/PLIST
index 7b095c82a1e..2b8bd724043 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,5 +1,6 @@
bin/xxh128sum
bin/xxh32sum
+bin/xxh3sum
bin/xxh64sum
@bin bin/xxhsum
include/xxh3.h
@@ -9,5 +10,6 @@ include/xxhash.h
lib/pkgconfig/libxxhash.pc
@man man/man1/xxh128sum.1
@man man/man1/xxh32sum.1
+@man man/man1/xxh3sum.1
@man man/man1/xxh64sum.1
@man man/man1/xxhsum.1
