Up to 5.6.0 (patches dropped as new defaults make sense)

diff --git a/xz-memlimit.patch b/xz-memlimit.patch
deleted file mode 100644 (file)
index 2509c49..0000000
--- a/xz-memlimit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp -x '*.orig' xz-5.2.5.org/src/xz/hardware.c xz-5.2.5/src/xz/hardware.c
---- xz-5.2.5.org/src/xz/hardware.c     2021-03-21 00:19:11.655899186 +0100
-+++ xz-5.2.5/src/xz/hardware.c 2021-03-21 00:19:11.892899186 +0100
-@@ -67,6 +67,10 @@ hardware_memlimit_set(uint64_t new_memli
-               assert(new_memlimit <= 100);
-               new_memlimit = (uint32_t)new_memlimit * total_ram / 100;
-       }
-+ 
-+      // limit to some sane value (in case of 64bit host and 32bit processes)
-+      if (new_memlimit >= SIZE_MAX/100 * 95)
-+              new_memlimit = SIZE_MAX/100 * 95;
- 
-       if (set_compress) {
-               memlimit_compress = new_memlimit;

diff --git a/xz-parallel.patch b/xz-parallel.patch
deleted file mode 100644 (file)
index a9e4acb..0000000
--- a/xz-parallel.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xz-5.1.1alpha/src/xz/xz.1~ 2011-04-12 12:42:58.000000000 +0200
-+++ xz-5.1.1alpha/src/xz/xz.1  2011-10-22 23:07:14.357449738 +0200
-@@ -913,7 +913,7 @@
- .B 0
- makes
- .B xz
--use up to as many threads as the processor(s) on the system support.
-+use up to as many threads as the processor(s) on the system support (default in PLD).
- The actual number of threads can be fewer than
- .I threads
- if the input file is not big enough
---- xz-5.4.0/src/xz/hardware.c.orig    2022-12-14 21:03:50.227052828 +0100
-+++ xz-5.4.0/src/xz/hardware.c 2022-12-14 23:25:02.994248765 +0100
-@@ -334,5 +334,7 @@
-               memlimit_mt_default = mem_ceiling;
- #endif
- 
-+      hardware_threads_set(0);
-+      hardware_memlimit_set(80, true, false, false, true);
-       return;
- }

diff --git a/xz.spec b/xz.spec
index a36b5df73366bacebdda92f5aeaedfc7d380f641..58259ecced347d8d2b683c0571149827bc448148 100644 (file)
--- a/xz.spec
+++ b/xz.spec
@@ -18,15 +18,13 @@
 Summary:       LZMA Encoder/Decoder
 Summary(pl.UTF-8):     Koder/Dekoder LZMA
 Name:          xz
-Version:       5.4.6
+Version:       5.6.0
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+, helper scripts on GPL v2+
 Group:         Applications/Archiving
 Source0:       https://github.com/tukaani-project/xz/releases/download/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 098549e685e27620f2fe2883b02c35f2
-Patch0:                %{name}-parallel.patch
-Patch1:                %{name}-memlimit.patch
+# Source0-md5: 6efd76c69f61a87e175c198f30b9dab8
 URL:           https://tukaani.org/xz/
 %{?with_asm:BuildRequires:     gcc >= 5:3.4}
 BuildRequires: rpm >= 4.4.9-56
@@ -117,8 +115,6 @@ Biblioteka statyczna LZMA.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure \