sys-auth/pam_ssh_agent_auth: further Clang 16 fixes

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 65 insertions, 19 deletions

diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0001-Fix-function-prototypes-in-configure.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0001-Fix-function-prototypes-in-configure.patch
index 143f7b7672f4..32b7688fd7bd 100644
--- a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0001-Fix-function-prototypes-in-configure.patch
+++ b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0001-Fix-function-prototypes-in-configure.patch
@@ -1,6 +1,6 @@
 https://github.com/jbeverly/pam_ssh_agent_auth/pull/41
 
-From ad2cc74dce3a6eaff0df193a2ae3db177e0d594f Mon Sep 17 00:00:00 2001
+From 023579b11aa2eecfaa203dca40b2a38d69fea0f2 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Fri, 30 Sep 2022 20:51:17 +0100
 Subject: [PATCH 1/2] Fix function prototypes in configure
@@ -34,7 +34,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <string.h>
  #ifdef HAVE_SNPRINTF
 -main()
-+int main()
++int main(void)
  {
  	char buf[50];
  	char expected_out[50];
@@ -43,7 +43,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  }
  #else
 -main() { exit(0); }
-+int main() { exit(0); }
++int main(void) { exit(0); }
  #endif
  		]])], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ],
  		AC_MSG_WARN([cross compiling: Assuming working snprintf()])
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch
index dda8c88128f6..e5b255f5cb37 100644
--- a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch
+++ b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch
@@ -1,6 +1,6 @@
 https://github.com/jbeverly/pam_ssh_agent_auth/pull/41
 
-From a12729d18c7ddeae9781a20155d5db1396e9e954 Mon Sep 17 00:00:00 2001
+From 634711a191c1b8be6ea6eb9251ab60a8cb73c6ad Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Fri, 30 Sep 2022 20:54:45 +0100
 Subject: [PATCH 2/2] Add missing includes (implicit function declarations)
@@ -60,15 +60,28 @@ Signed-off-by: Sam James <sam@gentoo.org>
  int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
  		]])],
  		[AC_MSG_RESULT(yes)],
-@@ -1408,6 +1414,7 @@ if test "x$ac_cv_func_asprintf" != "xyes" && \
+@@ -1406,8 +1412,10 @@ if test "x$ac_cv_func_asprintf" != "xyes" && \
+ 	AC_RUN_IFELSE(
+ 		[AC_LANG_SOURCE([[
  #include <sys/types.h>
++#include <stddef.h>
  #include <stdio.h>
  #include <stdarg.h>
 +#include <stdlib.h>
  
  int x_snprintf(char *str,size_t count,const char *fmt,...)
  {
-@@ -1496,6 +1503,7 @@ if test ! -z "$check_for_openpty_ctty_bug"; then
+@@ -1435,7 +1443,8 @@ fi
+ # check that the fmt argument is const char * or just char *.
+ # This is only useful for when BROKEN_SNPRINTF
+ AC_MSG_CHECKING([whether snprintf can declare const char *fmt])
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stddef.h>
++	   #include <stdio.h>
+ 	   int snprintf(char *a, size_t b, const char *c, ...) { return 0; }
+ 	   int main(void) { snprintf(0, 0, 0); } 
+     ]])],
+@@ -1496,6 +1505,7 @@ if test ! -z "$check_for_openpty_ctty_bug"; then
  #include <sys/fcntl.h>
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -76,7 +89,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  
  int
  main()
-@@ -1543,6 +1551,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
+@@ -1543,6 +1553,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
  	AC_RUN_IFELSE(
  		[AC_LANG_SOURCE([[
  #include <stdio.h>
@@ -84,7 +97,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <sys/socket.h>
  #include <netdb.h>
  #include <errno.h>
-@@ -1615,6 +1624,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
+@@ -1615,6 +1626,7 @@ if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
  	AC_RUN_IFELSE(
  		[AC_LANG_SOURCE([[
  #include <stdio.h>
@@ -92,7 +105,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <sys/socket.h>
  #include <netdb.h>
  #include <errno.h>
-@@ -1677,6 +1687,7 @@ if test "x$check_for_conflicting_getspnam" = "x1"; then
+@@ -1677,6 +1689,7 @@ if test "x$check_for_conflicting_getspnam" = "x1"; then
  	AC_COMPILE_IFELSE([AC_LANG_SOURCE(
  		[
  #include <shadow.h>
@@ -100,7 +113,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  int main(void) {exit(0);}
  		])],
  		[
-@@ -1750,6 +1761,7 @@ AC_RUN_IFELSE(
+@@ -1750,6 +1763,7 @@ AC_RUN_IFELSE(
  	[AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <string.h>
@@ -108,7 +121,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <openssl/opensslv.h>
  #define DATA "conftest.sslincver"
  int main(void) {
-@@ -1785,6 +1797,7 @@ AC_RUN_IFELSE(
+@@ -1785,6 +1799,7 @@ AC_RUN_IFELSE(
  	[AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <string.h>
@@ -116,7 +129,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <openssl/opensslv.h>
  #include <openssl/crypto.h>
  #define DATA "conftest.ssllibver"
-@@ -1828,7 +1841,9 @@ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+@@ -1828,7 +1843,9 @@ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
  AC_RUN_IFELSE(
  	[AC_LANG_SOURCE([[
  #include <string.h>
@@ -126,7 +139,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
  	]])],
  	[
-@@ -1907,6 +1922,7 @@ AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
+@@ -1907,6 +1924,7 @@ AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
  AC_LINK_IFELSE(
  	[AC_LANG_SOURCE([[
  #include <string.h>
@@ -134,7 +147,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <openssl/evp.h>
  int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
  	]])],
-@@ -1952,6 +1968,7 @@ AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
+@@ -1952,6 +1970,7 @@ AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
  AC_RUN_IFELSE(
  	[AC_LANG_SOURCE([[
  #include <string.h>
@@ -142,7 +155,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <openssl/rand.h>
  int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
  	]])],
-@@ -2123,6 +2140,7 @@ if test -z "$have_llong_max"; then
+@@ -2123,6 +2142,7 @@ if test -z "$have_llong_max"; then
  	AC_RUN_IFELSE(
  		[AC_LANG_SOURCE([[
  #include <stdio.h>
@@ -150,15 +163,15 @@ Signed-off-by: Sam James <sam@gentoo.org>
  /* Why is this so damn hard? */
  #ifdef __GNUC__
  # undef __GNUC__
-@@ -2597,6 +2615,7 @@ dnl test snprintf (broken on SCO w/gcc)
+@@ -2597,6 +2617,7 @@ dnl test snprintf (broken on SCO w/gcc)
  		[AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <string.h>
 +#include <stdlib.h>
  #ifdef HAVE_SNPRINTF
- int main()
+ int main(void)
  {
-@@ -2740,6 +2759,7 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
+@@ -2740,6 +2761,7 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
  		ac_cv_have_accrights_in_msghdr, [
  	AC_COMPILE_IFELSE([AC_LANG_SOURCE(
  		[
@@ -166,7 +179,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/uio.h>
-@@ -2767,6 +2787,7 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
+@@ -2767,6 +2789,7 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
  		ac_cv_have_control_in_msghdr, [
  	AC_COMPILE_IFELSE([AC_LANG_SOURCE(
  		[
@@ -174,3 +187,36 @@ Signed-off-by: Sam James <sam@gentoo.org>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/uio.h>
+@@ -2791,7 +2814,9 @@ if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
+ fi
+ 
+ AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
+-	AC_TRY_LINK([],
++	AC_TRY_LINK([
++#include <stdio.h>
++],
+ 		[ extern char *__progname; printf("%s", __progname); ],
+ 		[ ac_cv_libc_defines___progname="yes" ],
+ 		[ ac_cv_libc_defines___progname="no" ]
+@@ -2871,7 +2896,9 @@ if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
+ fi
+ 
+ AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
+-	AC_TRY_LINK([],
++	AC_TRY_LINK([
++#include <stdio.h>
++],
+ 		[ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);],
+ 		[ ac_cv_libc_defines_sys_errlist="yes" ],
+ 		[ ac_cv_libc_defines_sys_errlist="no" ]
+@@ -2884,7 +2911,9 @@ fi
+ 
+ 
+ AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
+-	AC_TRY_LINK([],
++	AC_TRY_LINK([
++#include <stdio.h>
++],
+ 		[ extern int sys_nerr; printf("%i", sys_nerr);],
+ 		[ ac_cv_libc_defines_sys_nerr="yes" ],
+ 		[ ac_cv_libc_defines_sys_nerr="no" ]
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild
index d09b0fea56c1..d09b0fea56c1 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild