unifyfs: new v2.0 release (#41851)

Add v2.0 release
Remove deprecated versions
Clean up dependencies for removed deprecated versions
Remove patches for removed deprecated versions

3 files changed, 6 insertions, 75 deletions

diff --git a/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch b/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch
deleted file mode 100644
index f3076cfd54..0000000000
--- a/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Commit: ef1b4caa70beb0a7ae03fc0ef1250b80efe33afc
-Date: Fri, 14 May 2021 15:30:09 -0400
-Subject: [PATCH] Include sys/sysmacros.h in testlib.h
-
-In recent Linux systems, major() and minor() are defined in
-sys/sysmacros.h and sys/types.h no longer includes sys/sysmacros.h.  So,
-we need to include sys/sysmacros.h in testlib.h.
-
-Also adds a check for the existence of sys/sysmacros.h in configure.ac.
-
-Include sys/sysmacros.h in testlib.h
----
- configure.ac           | 1 +
- examples/src/testlib.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 681cdb7..77719eb 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,7 @@ AC_CHECK_HEADERS([fcntl.h inttypes.h libgen.h limits.h mntent.h strings.h syslog
- AC_CHECK_HEADERS([wchar.h wctype.h])
- AC_CHECK_HEADERS([sys/mount.h sys/socket.h sys/statfs.h sys/time.h])
- AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h])
-+AC_CHECK_HEADER([sys/sysmacros.h], [], AC_MSG_ERROR([cannot find required header sys/sysmacros.h]))
- 
- # Checks for library functions.
- AC_FUNC_MALLOC
-diff --git a/examples/src/testlib.h b/examples/src/testlib.h
-index 2b0a698..41c9900 100644
---- a/examples/src/testlib.h
-+++ b/examples/src/testlib.h
-@@ -24,6 +24,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <time.h>
- #include <mpi.h>
--- 
-2.25.1
-
diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py
index 9cc1b3db64..ee0786c861 100644
--- a/var/spack/repos/builtin/packages/unifyfs/package.py
+++ b/var/spack/repos/builtin/packages/unifyfs/package.py
@@ -16,25 +16,16 @@ class Unifyfs(AutotoolsPackage):
 
     homepage = "https://github.com/LLNL/UnifyFS"
     git = "https://github.com/LLNL/UnifyFS.git"
-    url = "https://github.com/LLNL/UnifyFS/releases/download/v0.9.2/unifyfs-0.9.2.tar.gz"
+    url = "https://github.com/LLNL/UnifyFS/releases/download/v1.1/unifyfs-1.1.tar.gz"
     maintainers("CamStan")
 
     tags = ["e4s"]
 
     version("develop", branch="dev")
+    version("2.0", sha256="a07dfda022bc3094d578dcc5c9b2c4bbe7de479f598e4e358cd01690cd82355b")
     version("1.1", sha256="1bf5593099d272c9a12c46090d217c61dfeea1504dd4f7184972da3db5afc5f3")
     version("1.0.1", sha256="d92800778661b15ab50275c4efe345a6c60d8f1802a0d5909fda38db91b12116")
     version("1.0", sha256="c9ad0d15d382773841a3dab89c661fbdcfd686ec37fa263eb22713f6404258f5")
-    version(
-        "0.9.2",
-        sha256="7046625dc0677535f5d960187cb2e2d58a6f8cfb4dc6a3604f825257eb0891aa",
-        deprecated=True,
-    )
-    version(
-        "0.9.1",
-        sha256="2498a859cfa4961356fdf5c4c17e3afc3de7e034ad013b8c7145a622ef6199a0",
-        deprecated=True,
-    )
 
     variant(
         "auto-mount",
@@ -58,28 +49,25 @@ class Unifyfs(AutotoolsPackage):
     variant("spath", default=True, description="Use spath library to normalize relative paths")
 
     depends_on("autoconf", type="build")
-    depends_on("automake", type="build")
-    depends_on("automake@1.15:", type="build", when="@0.9.2:")
+    depends_on("automake@1.15:", type="build")
     depends_on("libtool", type="build")
     depends_on("m4", type="build")
     depends_on("pkgconfig", type="build")
 
     # Required dependencies
     depends_on("gotcha@1.0.4:")
-    depends_on("mochi-margo@0.4.3", when="@:0.9.1")
-    depends_on("mochi-margo@0.9.6:0.9.9", when="@0.9.2:1.0.1")
+    depends_on("mochi-margo@0.9.6:0.9.9", when="@1.0:1.0.1")
     # Version 1.1 mostly tested on mochi-margo@0.13.1. Leaving this all
     # inclusive from v0.10 on until any bugs are reported on versions before or
     # after v0.13.1.
     depends_on("mochi-margo@0.10:", when="@1.1:")
     depends_on("mpi")
 
-    # unifyfs@:1.1 uses MD5 functions that are deprecated in OpenSSL 3, and
-    # likely to be removed in the next major release.
+    # unifyfs@:1.1 uses MD5 functions that are deprecated in OpenSSL 3,these
+    # were removed in release 2.0.
     depends_on("openssl@:3")
 
     # Mochi-Margo dependencies
-    depends_on("mercury@1.0.1+bmi", when="@:0.9.1")
     depends_on("mercury@2.1", when="^mochi-margo@0.9.6:0.9.9")
     depends_on("mercury~boostsys", when="~boostsys")
     depends_on("libfabric fabrics=rxm,sockets,tcp", when="^mercury@2:+ofi")
@@ -94,9 +82,6 @@ class Unifyfs(AutotoolsPackage):
     conflicts("%intel", when="+fortran")
     conflicts("%xl", when="+fortran")
 
-    patch("unifyfs-sysio.c.patch", when="@0.9.1")
-    patch("include-sys-sysmacros.h.patch", when="@0.9.1:0.9.2")
-
     debug_build = False
     build_directory = "spack-build"
 
diff --git a/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch b/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch
deleted file mode 100644
index 99e2086b51..0000000000
--- a/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spack-src/client/src/unifyfs-sysio.c.bak	2020-12-03 09:04:41.197202000 +0900
-+++ spack-src/client/src/unifyfs-sysio.c	2021-03-04 10:06:32.626989637 +0900
-@@ -245,7 +245,7 @@
-          * that is big enough */
-         buf = (char*) malloc(len);
-         if (buf != NULL) {
--            strncpy(buf, unifyfs_cwd, len);
-+            memcpy(buf, unifyfs_cwd, strlen(unifyfs_cwd));
-         } else {
-             errno = ENOMEM;
-         }