From 20bb028632b7a4f76200d60f90eacc821e59d84b Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 20 Mar 2020 16:43:28 -0700
Subject: xz: Update to 5.2.5

---
 pkg/xz/config.h | 12 ++++++++----
 pkg/xz/gen.lua  |  1 +
 pkg/xz/src      |  2 +-
 pkg/xz/ver      |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'pkg')

diff --git a/pkg/xz/config.h b/pkg/xz/config.h
index b3593299..acc2641a 100644
--- a/pkg/xz/config.h
+++ b/pkg/xz/config.h
@@ -9,6 +9,7 @@
 /* #undef HAVE_CC_SHA256_CTX */
 /* #undef HAVE_CC_SHA256_INIT */
 /* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 #define HAVE_CHECK_CRC32 1
 #define HAVE_CHECK_CRC64 1
@@ -46,7 +47,7 @@
 #define HAVE_GETOPT_H 1
 #define HAVE_GETOPT_LONG 1
 /* #undef HAVE_GETTEXT */
-#define HAVE_ICONV 1
+/* #undef HAVE_ICONV */
 /* probe HAVE_IMMINTRIN_H */
 #define HAVE_INTTYPES_H 1
 #define HAVE_LIMITS_H 1
@@ -94,6 +95,8 @@
 #define HAVE__BOOL 1
 /* #undef HAVE__FUTIME */
 /* probe HAVE__MM_MOVEMASK_EPI8 */
+/* probe HAVE___BUILTIN_ASSUME_ALIGNED */
+/* #undef HAVE___BUILTIN_BSWAPXX */
 #define LT_OBJDIR ".libs/"
 #define MYTHREAD_POSIX 1
 /* #undef MYTHREAD_VISTA */
@@ -102,10 +105,10 @@
 #define PACKAGE "xz"
 #define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
 #define PACKAGE_NAME "XZ Utils"
-#define PACKAGE_STRING "XZ Utils 5.2.4"
+#define PACKAGE_STRING "XZ Utils 5.2.5"
 #define PACKAGE_TARNAME "xz"
 #define PACKAGE_URL "https://tukaani.org/xz/"
-#define PACKAGE_VERSION "5.2.4"
+#define PACKAGE_VERSION "5.2.5"
 /* #undef PTHREAD_CREATE_JOINABLE */
 /* probe SIZEOF_SIZE_T */
 #define STDC_HEADERS 1
@@ -122,6 +125,7 @@
 #define TUKLIB_PHYSMEM_SYSCONF 1
 /* #undef TUKLIB_PHYSMEM_SYSCTL */
 /* #undef TUKLIB_PHYSMEM_SYSINFO */
+/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
 #endif
@@ -137,7 +141,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "5.2.4"
+#define VERSION "5.2.5"
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
diff --git a/pkg/xz/gen.lua b/pkg/xz/gen.lua
index 06739cc5..51388d62 100644
--- a/pkg/xz/gen.lua
+++ b/pkg/xz/gen.lua
@@ -16,6 +16,7 @@ build('cat', '$outdir/config.h', {
 	'$dir/config.h',
 	'$builddir/probe/HAVE_IMMINTRIN_H',
 	'$builddir/probe/HAVE__MM_MOVEMASK_EPI8',
+	'$builddir/probe/HAVE___BUILTIN_ASSUME_ALIGNED',
 	'$builddir/probe/SIZEOF_SIZE_T',
 })
 pkg.deps = {'$outdir/config.h'}
diff --git a/pkg/xz/src b/pkg/xz/src
index b5be61cc..2327a461 160000
--- a/pkg/xz/src
+++ b/pkg/xz/src
@@ -1 +1 @@
-Subproject commit b5be61cc06088bb07f488f9baf7d447ff47b37c1
+Subproject commit 2327a461e1afce862c22269b80d3517801103c1b
diff --git a/pkg/xz/ver b/pkg/xz/ver
index 4f9a08b6..1aac1fd3 100644
--- a/pkg/xz/ver
+++ b/pkg/xz/ver
@@ -1 +1 @@
-5.2.4 r2
+5.2.5 r0
-- 
cgit v1.2.3