From ae5511afd6f3af533122e6e7c7a0923f0837fb8f Mon Sep 17 00:00:00 2001
From: Chris Green <greenc@fnal.gov>
Date: Wed, 30 Aug 2023 13:09:06 -0500
Subject: [procps] New versions (#38650)

* [procps] New versions 3.3.14, 3.3.3.15..3.3.17, 4.0.0..4.0.3

* Put upper bound on patch application

* [Patch was
  merged](https://gitlab.com/procps-ng/procps/-/merge_requests/189) for
  upcoming 4.0.4.
---
 .../builtin/packages/procps/libintl-3.3.14.patch   | 10 ++++++++
 .../builtin/packages/procps/libintl-4.0.0.patch    | 29 ++++++++++++++++++++++
 .../builtin/packages/procps/libintl-4.0.1.patch    | 29 ++++++++++++++++++++++
 .../repos/builtin/packages/procps/libintl.patch    | 10 --------
 var/spack/repos/builtin/packages/procps/package.py | 14 +++++++++--
 5 files changed, 80 insertions(+), 12 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/procps/libintl-3.3.14.patch
 create mode 100644 var/spack/repos/builtin/packages/procps/libintl-4.0.0.patch
 create mode 100644 var/spack/repos/builtin/packages/procps/libintl-4.0.1.patch
 delete mode 100644 var/spack/repos/builtin/packages/procps/libintl.patch

diff --git a/var/spack/repos/builtin/packages/procps/libintl-3.3.14.patch b/var/spack/repos/builtin/packages/procps/libintl-3.3.14.patch
new file mode 100644
index 0000000000..923679e6c0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/procps/libintl-3.3.14.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am	2023-06-29 14:12:25.671539354 -0500
++++ b/Makefile.am	2023-06-29 14:26:58.852425405 -0500
+@@ -1,6 +1,5 @@
+-CYGWINFLAGS =
++CYGWINFLAGS = $(LTLIBINTL)
+ if CYGWIN
+-CYGWINFLAGS += -lintl
+ usrbin_exec_PROGRAMS =
+ endif
+ 
diff --git a/var/spack/repos/builtin/packages/procps/libintl-4.0.0.patch b/var/spack/repos/builtin/packages/procps/libintl-4.0.0.patch
new file mode 100644
index 0000000000..4fed0e0a44
--- /dev/null
+++ b/var/spack/repos/builtin/packages/procps/libintl-4.0.0.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.am	2022-03-22 05:40:10.000000000 -0500
++++ b/Makefile.am	2023-06-29 16:26:37.759057671 -0500
+@@ -1,7 +1,6 @@
+ 
+-CYGWINFLAGS =
++CYGWINFLAGS = $(LTLIBINTL)
+ if CYGWIN
+-CYGWINFLAGS += -lintl
+ usrbin_exec_PROGRAMS =
+ endif
+ 
+@@ -137,7 +136,7 @@
+ endif
+ dist_man_MANS += kill.1
+ kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c
+-kill_LDADD =
++kill_LDADD = $(LTLIBINTL)
+ else
+   EXTRA_DIST += kill.1
+ endif
+@@ -228,7 +227,7 @@
+ 	sysctl.c \
+ 	lib/fileutils.c \
+ 	lib/procio.c
+-sysctl_LDADD=
++sysctl_LDADD= $(LTLIBINTL)
+ endif
+ tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
+ uptime_SOURCES = uptime.c lib/fileutils.c
diff --git a/var/spack/repos/builtin/packages/procps/libintl-4.0.1.patch b/var/spack/repos/builtin/packages/procps/libintl-4.0.1.patch
new file mode 100644
index 0000000000..a2c6f3ebcb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/procps/libintl-4.0.1.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.am	2022-10-20 04:58:25.000000000 -0500
++++ b/Makefile.am	2023-06-29 16:38:47.941981053 -0500
+@@ -1,7 +1,6 @@
+ 
+-CYGWINFLAGS =
++CYGWINFLAGS = $(LTLIBINTL)
+ if CYGWIN
+-CYGWINFLAGS += -lintl
+ usrbin_exec_PROGRAMS =
+ endif
+ 
+@@ -136,7 +135,7 @@
+ endif
+ dist_man_MANS += man/kill.1
+ src_kill_SOURCES = src/kill.c local/strutils.c local/fileutils.c local/signals.c
+-src_kill_LDADD =
++src_kill_LDADD = $(LTLIBINTL)
+ else
+   EXTRA_DIST += man/kill.1
+ endif
+@@ -227,7 +226,7 @@
+ 	src/sysctl.c \
+ 	local/fileutils.c \
+ 	local/procio.c
+-src_sysctl_LDADD=
++src_sysctl_LDADD= $(LTLIBINTL)
+ endif
+ src_tload_SOURCES = src/tload.c local/strutils.c local/fileutils.c
+ src_uptime_SOURCES = src/uptime.c local/fileutils.c
diff --git a/var/spack/repos/builtin/packages/procps/libintl.patch b/var/spack/repos/builtin/packages/procps/libintl.patch
deleted file mode 100644
index 923679e6c0..0000000000
--- a/var/spack/repos/builtin/packages/procps/libintl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am	2023-06-29 14:12:25.671539354 -0500
-+++ b/Makefile.am	2023-06-29 14:26:58.852425405 -0500
-@@ -1,6 +1,5 @@
--CYGWINFLAGS =
-+CYGWINFLAGS = $(LTLIBINTL)
- if CYGWIN
--CYGWINFLAGS += -lintl
- usrbin_exec_PROGRAMS =
- endif
- 
diff --git a/var/spack/repos/builtin/packages/procps/package.py b/var/spack/repos/builtin/packages/procps/package.py
index 8c86368751..238116aead 100644
--- a/var/spack/repos/builtin/packages/procps/package.py
+++ b/var/spack/repos/builtin/packages/procps/package.py
@@ -14,9 +14,17 @@ class Procps(AutotoolsPackage):
 
     homepage = "https://gitlab.com/procps-ng/procps"
     git = "https://gitlab.com/procps-ng/procps.git"
+    url = "https://gitlab.com/procps-ng/procps/-/archive/v4.0.3/procps-v4.0.3.tar.gz"
 
     version("master", branch="master")
-    version("3.3.15", tag="v3.3.15", commit="7bb949bcba13c107fa0f45d2d0298b1ad6b6d6cc")
+    version("4.0.3", sha256="14cc21219c45d196772274ea3f194f6d668b6cc667fbde9ee6d8039121b73fa6")
+    version("4.0.2", sha256="b03e4b55eaa5661e726acb714e689356d80bc056b09965c2284d039ba8dc21e8")
+    version("4.0.1", sha256="1eaff353306aba12816d14881f2b88c7c9d06023825f7224700f0c01f66c65cd")
+    version("4.0.0", sha256="dea39e0e7b1367e28c887d736d1a9783df617497538603cdff432811a1016945")
+    version("3.3.17", sha256="efa6f6b4625a795f5c8a3d5bd630a121d270bc8573c5a0b6a6068e73611d6cd5")
+    version("3.3.16", sha256="7f09945e73beac5b12e163a7ee4cae98bcdd9a505163b6a060756f462907ebbc")
+    version("3.3.15", sha256="14dfa751517dd844efa9f492e3ad8071f908a269c6aea643b9a1759235fa2053")
+    version("3.3.14", sha256="1ff716e7bde6b3841b8519831690b10b644ed344490369c55e410edc8db2fe18")
 
     variant("nls", default=True, description="Enable Native Language Support.")
 
@@ -35,7 +43,9 @@ class Procps(AutotoolsPackage):
 
     # Need to tell the build to use the tools it already has to find
     # libintl (if appropriate).
-    patch("libintl.patch")
+    patch("libintl-3.3.14.patch", when="@3.3.14:3.3")
+    patch("libintl-4.0.0.patch", when="@=4.0.0")
+    patch("libintl-4.0.1.patch", when="@4.0.1:4.0.3")
 
     def autoreconf(self, spec, prefix):
         sh = which("sh")
-- 
cgit v1.2.3-60-g2f50