diff --git a/var/spack/repos/builtin/packages/optipng/for_aarch64.patch b/var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch similarity index 100% rename from var/spack/repos/builtin/packages/optipng/for_aarch64.patch rename to var/spack/repos/builtin/packages/optipng/for_aarch64_0.7.7.patch 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 00000000000..9fa2386b3c1 --- /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 ddbfb626bac..9223cce45c1 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:")