From d92c2d2a76b04a69c68e0515adadf8d9fb4107df Mon Sep 17 00:00:00 2001
From: hanez <you@hanez.org>
Date: Fri, 27 Jun 2025 02:56:55 +0200
Subject: [PATCH] Merge nearly ready for 1.4.0.

---
 README.md                    |  2 +-
 chkgrp-min.c                 |  4 +++-
 chkgrp-native-min-extended.c |  4 +++-
 chkgrp-native-min.c          |  4 +++-
 chkgrp-native.c              |  4 +++-
 chkgrp-ng.c                  |  4 +++-
 chkgrp.c                     |  4 +++-
 chkpwd.1                     |  6 +++---
 chkpwd.c                     |  1 +
 chkpwd.h                     | 10 ++++------
 version.h                    |  1 +
 11 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 version.h

diff --git a/README.md b/README.md
index 4e5ebde..b70fa48 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ gcc -Wall -DMAX_UID=1000 -DMIN_UID=1000 -o chkpwd chkpwd.c -lpam -lpam_misc
 
 ## License
 
-chkpwd is licensed under the Apache License, Version 2.0.
+chkusr is licensed under the Apache License, Version 2.0.
 
 See LICENSE for details.
 
diff --git a/chkgrp-min.c b/chkgrp-min.c
index 2fe002a..728d0d6 100644
--- a/chkgrp-min.c
+++ b/chkgrp-min.c
@@ -2,10 +2,12 @@
  * chkgrp-min is a program that checks if a user is a member of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+ #include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkgrp-native-min-extended.c b/chkgrp-native-min-extended.c
index c46d184..a1c3a38 100644
--- a/chkgrp-native-min-extended.c
+++ b/chkgrp-native-min-extended.c
@@ -3,10 +3,12 @@
  * of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+#include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkgrp-native-min.c b/chkgrp-native-min.c
index c067695..1e810ed 100644
--- a/chkgrp-native-min.c
+++ b/chkgrp-native-min.c
@@ -2,10 +2,12 @@
  * chkgrp-min-native is a program that checks if a user is a member of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+#include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkgrp-native.c b/chkgrp-native.c
index bec5808..695fd6d 100644
--- a/chkgrp-native.c
+++ b/chkgrp-native.c
@@ -2,10 +2,12 @@
  * chkgrp-native is a program that checks if a user is a member of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+#include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkgrp-ng.c b/chkgrp-ng.c
index 8faa900..3387a70 100644
--- a/chkgrp-ng.c
+++ b/chkgrp-ng.c
@@ -2,10 +2,12 @@
  * chkgrp-ng is a program that checks if a user is a member of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+#include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkgrp.c b/chkgrp.c
index 0c668c1..b1bca2c 100644
--- a/chkgrp.c
+++ b/chkgrp.c
@@ -2,10 +2,12 @@
  * chkgrp is a program that checks if a user is a member of a group.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkgrp
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
+#include "version.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/chkpwd.1 b/chkpwd.1
index 89c70bd..da6b5cb 100644
--- a/chkpwd.1
+++ b/chkpwd.1
@@ -1,10 +1,10 @@
-.TH checkpw 1 "June 2025" "chkpwd 1.3.1" "chkpwd man page"
+.TH checkpw 1 "June 2025" "chkpwd 1.4.0" "chkpwd man page"
 .SH NAME
 chkpwd \- checks the validity of a users password on a UNIX/PAM-based system.
 .SH SYNOPSIS
 chkpwd [OPTION]...
 .SH DESCRIPTION
-chkpwd is a program that checks the validity of a users password on a 
+chkpwd is a program that checks the validity of a users password on a
 UNIX/PAM-based system.
 .SH OPTIONS
 The options which apply to the chkpwd command are:
@@ -16,7 +16,7 @@ The options which apply to the chkpwd command are:
   -h             Show this help.
 
 chkpwd runs in an interactive mode when no username and/or password are set.
-A missing username and/or password will then be asked for while program 
+A missing username and/or password will then be asked for while program
 execution.
 
 .SH SEE ALSO
diff --git a/chkpwd.c b/chkpwd.c
index 69fbc46..036368d 100644
--- a/chkpwd.c
+++ b/chkpwd.c
@@ -8,6 +8,7 @@
  */
 
 #include "chkpwd.h"
+#include "version.h"
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/chkpwd.h b/chkpwd.h
index d2ff23f..d97c229 100644
--- a/chkpwd.h
+++ b/chkpwd.h
@@ -1,18 +1,16 @@
 /**
- * chkpwd.h is part of chkpwd, a program that checks the validity of a users
- * password on a UNIX/PAM-based system.
+ * chkpwd.h is part of chkusr, a set of programs to verify information about
+ * a user on UNIX based systems.
  *
  * Author: Johannes Findeisen <you@hanez.org> - 2025
- * Homepage: https://git.xw3.org/hanez/chkpwd
+ * Homepage: https://git.xw3.org/hanez/chkusr
  * License: Apache-2.0 (see LICENSE)
  */
 
 #include <pwd.h>
+#include <stdbool.h>
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
-#include <stdbool.h>
-
-#define VERSION "1.3.1"
 
 bool checkpw_authenticate(const char *username, const char *password,
                           bool verbose);
diff --git a/version.h b/version.h
new file mode 100644
index 0000000..7851500
--- /dev/null
+++ b/version.h
@@ -0,0 +1 @@
+#define VERSION "1.4.0"