From 89d0215d5b480e455ce9892b39046e69be957c1d Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 31 Oct 2024 08:22:01 -0500
Subject: optipng: add v0.7.8 (#47311)

* optipng: add v0.7.8

* optipng: mv for_aarch64.patch for_aarch64_0.7.7.patch

* optipng: add for_aarch64_0.7.8.patch

* optipng: deprecate v0.7.7

* optipng: fix style
---
 var/spack/repos/builtin/packages/optipng/for_aarch64.patch    | 11 -----------
 .../repos/builtin/packages/optipng/for_aarch64_0.7.7.patch    | 11 +++++++++++
 .../repos/builtin/packages/optipng/for_aarch64_0.7.8.patch    | 11 +++++++++++
 var/spack/repos/builtin/packages/optipng/package.py           |  9 +++++++--
 4 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100644 var/spack/repos/builtin/packages/optipng/for_aarch64.patch
 create mode 100644 var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch
 create mode 100644 var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.8.patch

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/optipng/for_aarch64.patch b/var/spack/repos/builtin/packages/optipng/for_aarch64.patch
deleted file mode 100644
index b58cd4f185..0000000000
--- a/var/spack/repos/builtin/packages/optipng/for_aarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spack-src/configure.bak	2017-12-27 20:57:00.000000000 +0900
-+++ spack-src/configure	2020-09-28 17:04:51.030223443 +0900
-@@ -193,7 +193,7 @@
- if test "$gccish" -ne 0
- then
-     CC="${CC-$cc}"
--    CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
-+    CFLAGS="${CFLAGS--O2 -Wall -Wextra -DPNG_ARM_NEON_OPT=0}"
- else
-     CC="${CC-cc}"
-     CFLAGS="${CFLAGS--O}"
diff --git a/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch b/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch
new file mode 100644
index 0000000000..b58cd4f185
--- /dev/null
+++ b/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch
@@ -0,0 +1,11 @@
+--- spack-src/configure.bak	2017-12-27 20:57:00.000000000 +0900
++++ spack-src/configure	2020-09-28 17:04:51.030223443 +0900
+@@ -193,7 +193,7 @@
+ if test "$gccish" -ne 0
+ then
+     CC="${CC-$cc}"
+-    CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
++    CFLAGS="${CFLAGS--O2 -Wall -Wextra -DPNG_ARM_NEON_OPT=0}"
+ else
+     CC="${CC-cc}"
+     CFLAGS="${CFLAGS--O}"
diff --git a/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.8.patch b/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.8.patch
new file mode 100644
index 0000000000..9fa2386b3c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.8.patch
@@ -0,0 +1,11 @@
+--- spack-src/configure.bak     2017-12-27 20:57:00.000000000 +0900
++++ spack-src/configure 2020-09-28 17:04:51.030223443 +0900
+@@ -193,7 +193,7 @@
+ if test "$gccish" -ne 0
+ then
+     CC="${CC-$cc}"
+-    CFLAGS="${CFLAGS--O2 -Wall -Wextra -Wundef}"
++    CFLAGS="${CFLAGS--O2 -Wall -Wextra -Wundef -DPNG_ARM_NEON_OPT=0}"
+ else
+     CC="${CC-cc}"
+     CFLAGS="${CFLAGS--O}"
diff --git a/var/spack/repos/builtin/packages/optipng/package.py b/var/spack/repos/builtin/packages/optipng/package.py
index ddbfb626ba..9223cce45c 100644
--- a/var/spack/repos/builtin/packages/optipng/package.py
+++ b/var/spack/repos/builtin/packages/optipng/package.py
@@ -19,9 +19,14 @@ class Optipng(AutotoolsPackage, SourceforgePackage):
 
     license("Zlib")
 
-    version("0.7.7", sha256="4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452")
+    version("0.7.8", sha256="25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c")
+    with default_args(deprecated=True):
+        # https://nvd.nist.gov/vuln/detail/CVE-2023-43907
+        version("0.7.7", sha256="4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
+
     # See https://github.com/imagemin/optipng-bin/issues/97
-    patch("for_aarch64.patch", when="target=aarch64:")
+    patch("for_aarch64_0.7.7.patch", when="@0.7.7")
+    patch("for_aarch64_0.7.8.patch", when="@0.7.8:")
-- 
cgit v1.2.3-70-g09d2