main/linux-pam: fix uint patch

* Outdated patch version got committed.
* Added patch note.

2 files changed, 52 insertions, 14 deletions

diff --git a/main/linux-pam/APKBUILD b/main/linux-pam/APKBUILD
index 70a5413e54..1127799afd 100644
--- a/main/linux-pam/APKBUILD
+++ b/main/linux-pam/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=linux-pam
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
 url="https://www.kernel.org/pub/linux/libs/pam"
 arch="all"
@@ -77,7 +77,7 @@ package() {
 sha512sums="6bc8e2a5b64686f0a23846221c5228c88418ba485b17c53b3a12f91262b5bb73566d6b6a5daa1f63bbae54310aee918b987e44a72ce809b4e7c668f0fadfe08e  Linux-PAM-1.3.1.tar.xz
 52b97e23084f7b835ce1fa441663f91a50ea797cb38ba2c6662bcdaf0d25ba487118442674ac347fb17353af126dd6b3b696612faa56cac428dd842d14e1c90d  fix-compat.patch
 24ec4c755b4034189ea05b1af69269e094964efd745b470a6ccb268e80550b56c96027214e918168aa942aa426bfe0b1487801e95ef2bf0c488f47eb49f1d9e1  libpam-fix-build-with-eglibc-2.16.patch
-2bc12415bacdb766c1a8d8aa43c84c17bb2ddc9a9b910d52830259ad18e54465cc077d7b2974a71c40867c90910751339f283731c7298b983acd4ae83d7c98a1  musl-fix_uint.patch
+e5be6afc369f5d3816919537f89cd0ec005573dca9441937cbc3362fd58f74c993c47b80792203dc18eba34fd8bd1deafadb6543e0df4d93f92b0fb9eed01313  musl-fix_uint.patch
 08323428e13f65300d7638233fd8ab25c582a08ffe0a282ed43f69ccb428dea9eb185da3ae9dd2634f021c16592f194f99348758bd9e761c29435652b544f543  musl-fix-pam_exec.patch
 ea6a10957ba9ec50d982bfabafb35060426ac797936f874097b4fa7620b89fd2ba3be9757401f9b787956fb23879d8ef73676f7703e75fcef3dca0b9559c4167  base-auth.pamd
 85462201a4044c7e170e617d39b0eceb4790abc6c0504999117548030a16d80a9d2078d1ad97690d7d346e6374201f0c52e792ccb08ce2b1c4bbf0cc2be96f5b  base-account.pamd
diff --git a/main/linux-pam/musl-fix_uint.patch b/main/linux-pam/musl-fix_uint.patch
index cb40807729..c4a0fdfa8b 100644
--- a/main/linux-pam/musl-fix_uint.patch
+++ b/main/linux-pam/musl-fix_uint.patch
@@ -1,6 +1,18 @@
+u_intX_t is a glibcism this fixes the issue of compiling against musl libc by using ISO C99 uintX_t types instead.
+
+Can be deleted at next release 1.3.1+ since it has been merged upstream - https://github.com/linux-pam/linux-pam/pull/175
+
 --- a/libpamc/include/security/pam_client.h
 +++ b/libpamc/include/security/pam_client.h
-@@ -23,7 +23,7 @@
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ 
+ /* opaque agent handling structure */
+@@ -23,7 +24,7 @@
  typedef struct pamc_handle_s *pamc_handle_t;
  
  /* binary prompt structure pointer */
@@ -9,7 +21,7 @@
  
  /*
   * functions provided by libpamc
-@@ -90,10 +90,10 @@
+@@ -90,10 +91,10 @@
  # define PAM_BP_FREE        free
  #endif /* PAM_BP_FREE */
  
@@ -23,7 +35,7 @@
  #define PAM_BP_MAX_LENGTH     0x20000                   /* an advisory limit */
  #define PAM_BP_WCONTROL(x)    (__PAM_BP_WOCTET(x,4))
  #define PAM_BP_RCONTROL(x)    (__PAM_BP_ROCTET(x,4))
-@@ -102,8 +102,8 @@
+@@ -102,8 +103,8 @@
  			       (__PAM_BP_ROCTET(x,2)<< 8)+      \
  			       (__PAM_BP_ROCTET(x,3)    ))
  #define PAM_BP_LENGTH(x)      (PAM_BP_SIZE(x) - PAM_BP_MIN_SIZE)
@@ -34,7 +46,7 @@
  
  /* Note, this macro always '\0' terminates renewed packets */
  
-@@ -111,13 +111,13 @@
+@@ -111,13 +112,13 @@
  do {                                                                       \
      if (old_p) {                                                           \
  	if (*(old_p)) {                                                    \
@@ -50,7 +62,7 @@
                                                                             \
  	    __size = PAM_BP_MIN_SIZE + data_length;                        \
  	    if ((*(old_p) = PAM_BP_CALLOC(1, 1+__size))) {                 \
-@@ -140,7 +140,7 @@
+@@ -140,7 +141,7 @@
  #define PAM_BP_FILL(prmpt, offset, length, data)                           \
  do {                                                                       \
      size_t bp_length;                                                      \
@@ -59,7 +71,7 @@
      bp_length = PAM_BP_LENGTH(prompt);                                     \
      if (bp_length < ((length)+(offset))) {                                 \
  	PAM_BP_ASSERT("attempt to write over end of prompt");              \
-@@ -151,7 +151,7 @@
+@@ -151,7 +152,7 @@
  #define PAM_BP_EXTRACT(prmpt, offset, length, data)                        \
  do {                                                                       \
      size_t __bp_length;                                                    \
@@ -68,11 +80,21 @@
      __bp_length = PAM_BP_LENGTH(__prompt);                                 \
      if (((offset) < 0) || (__bp_length < ((length)+(offset)))              \
  	|| ((length) < 0)) {                                               \
-                                            \
+
+--- a/libpamc/libpamc.h
++++ b/libpamc/libpamc.h
+@@ -16,6 +16,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <sys/wait.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <ctype.h>
 
 --- a/libpamc/pamc_converse.c
 +++ b/libpamc/pamc_converse.c
-@@ -34,8 +34,8 @@ static int __pamc_select_agent(pamc_handle_t pch, char *agent_id)
+@@ -34,8 +34,8 @@
  
  int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p)
  {
@@ -83,7 +105,7 @@
  
      D(("called"));
  
-@@ -110,7 +110,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p)
+@@ -110,7 +110,7 @@
      /* pump all of the prompt into the agent */
      do {
  	int rval = write(pch->current->writer,
@@ -92,7 +114,7 @@
  			 size - offset);
  	if (rval == -1) {
  	    switch (errno) {
-@@ -172,7 +172,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p)
+@@ -172,7 +172,7 @@
         value from the previous loop */
  
      while (offset < size) {
@@ -104,7 +126,15 @@
 
 --- a/libpamc/test/regress/test.libpamc.c
 +++ b/libpamc/test/regress/test.libpamc.c
-@@ -157,7 +157,7 @@ char *create_digest(int length, const char *raw)
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <security/pam_client.h>
+ #include <ctype.h>
+@@ -157,7 +158,7 @@
      return temp_packet.buffer;
  }
  
@@ -233,7 +263,15 @@
 
 --- a/modules/pam_timestamp/sha1.h
 +++ b/modules/pam_timestamp/sha1.h
-@@ -45,9 +45,9 @@
+@@ -38,6 +38,7 @@
+ #ifndef pam_timestamp_sha1_h
+ #define pam_timestamp_sha1_h
+ 
++#include <stdint.h>
+ #include <sys/types.h>
+ 
+ #define SHA1_BLOCK_SIZE 64
+@@ -45,9 +46,9 @@
  struct sha1_context {
  	size_t count;
  	unsigned char pending[SHA1_BLOCK_SIZE];