From 3c42552004351a89e237564e2b5c7d6cb98df462 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 25 Jan 2021 14:04:00 -0800
Subject: pigz: Update to 2.5

---
 .../patch/0002-Only-use-gcc-pragmas-with-gcc.patch | 37 ++++++++++++++++++++++
 .../patch/0003-Only-use-gcc-pragmas-with-gcc.patch | 37 ----------------------
 pkg/pigz/src                                       |  2 +-
 pkg/pigz/ver                                       |  2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch
 delete mode 100644 pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch

(limited to 'pkg')

diff --git a/pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch b/pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch
new file mode 100644
index 00000000..cd2c7148
--- /dev/null
+++ b/pkg/pigz/patch/0002-Only-use-gcc-pragmas-with-gcc.patch
@@ -0,0 +1,37 @@
+From e8c1ae5d700e447d21db95d0be0f64fd634fa9a6 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 19 Jun 2019 20:10:09 -0700
+Subject: [PATCH] Only use gcc pragmas with gcc
+
+---
+ pigz.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/pigz.c b/pigz.c
+index e5a094a..a65e243 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -3800,8 +3800,10 @@ local char *justname(char *path) {
+     return p == NULL ? path : p + 1;
+ }
+ 
++#ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-result"
++#endif
+ 
+ // Copy file attributes, from -> to, as best we can. This is best effort, so no
+ // errors are reported. The mode bits, including suid, sgid, and the sticky bit
+@@ -3829,7 +3831,9 @@ local void copymeta(char *from, char *to) {
+     (void)utimes(to, times);
+ }
+ 
++#ifdef __GNUC__
+ #pragma GCC diagnostic pop
++#endif
+ 
+ // Set the access and modify times of fd to t.
+ local void touch(char *path, time_t t) {
+-- 
+2.30.0
+
diff --git a/pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch b/pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch
deleted file mode 100644
index af17ef8c..00000000
--- a/pkg/pigz/patch/0003-Only-use-gcc-pragmas-with-gcc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0e2380ea9d9c84900e317b9962c3940ae0cc1015 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 19 Jun 2019 20:10:09 -0700
-Subject: [PATCH] Only use gcc pragmas with gcc
-
----
- pigz.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pigz.c b/pigz.c
-index bbbfd2c..f1042a9 100644
---- a/pigz.c
-+++ b/pigz.c
-@@ -3584,8 +3584,10 @@ local char *justname(char *path) {
-     return p == NULL ? path : p + 1;
- }
- 
-+#ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-result"
-+#endif
- 
- // Copy file attributes, from -> to, as best we can. This is best effort, so no
- // errors are reported. The mode bits, including suid, sgid, and the sticky bit
-@@ -3613,7 +3615,9 @@ local void copymeta(char *from, char *to) {
-     (void)utimes(to, times);
- }
- 
-+#ifdef __GNUC__
- #pragma GCC diagnostic pop
-+#endif
- 
- // Set the access and modify times of fd to t.
- local void touch(char *path, time_t t) {
--- 
-2.20.1
-
diff --git a/pkg/pigz/src b/pkg/pigz/src
index fe822cb4..583d3be7 160000
--- a/pkg/pigz/src
+++ b/pkg/pigz/src
@@ -1 +1 @@
-Subproject commit fe822cb435622c43f491013da77b127e9fe851a9
+Subproject commit 583d3be74d3b7ad309d3aca646ae29907a2521dd
diff --git a/pkg/pigz/ver b/pkg/pigz/ver
index 0711ef53..5420ac15 100644
--- a/pkg/pigz/ver
+++ b/pkg/pigz/ver
@@ -1 +1 @@
-2.4 r1
+2.5 r0
-- 
cgit v1.2.3