CVS commit: pkgsrc/security/pam-af

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Tue Jul  6 20:01:17 UTC 2021

Modified Files:
        pkgsrc/security/pam-af: Makefile distinfo
        pkgsrc/security/pam-af/patches: patch-ab

Log Message:
security/pam-af: "Fix" missing pam_sm_authenticate().

Hacky workaround for

Jul  5 16:38:36 murthe sshd: in openpam_dispatch(): /usr/pkg/lib/security/pam_af.so: no pam_sm_authenticate()
Jul  5 16:38:36 murthe sshd: in openpam_check_error_code(): pam_sm_authenticate(): unexpected return value 2

See http://mail-index.netbsd.org/tech-pkg/2021/07/05/msg025227.html and
http://gnats.netbsd.org/39313.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/pam-af/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/pam-af/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pam-af/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pam-af/Makefile
diff -u pkgsrc/security/pam-af/Makefile:1.17 pkgsrc/security/pam-af/Makefile:1.18
--- pkgsrc/security/pam-af/Makefile:1.17        Sun Jan 28 20:11:03 2018
+++ pkgsrc/security/pam-af/Makefile     Tue Jul  6 20:01:17 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/01/28 20:11:03 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/07/06 20:01:17 rhialto Exp $
 
 DISTNAME=      pam_af-1.0.2
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    security
 MASTER_SITES=  http://mbsd.msk.ru/dist/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/pam-af/distinfo
diff -u pkgsrc/security/pam-af/distinfo:1.12 pkgsrc/security/pam-af/distinfo:1.13
--- pkgsrc/security/pam-af/distinfo:1.12        Wed Feb  8 00:07:38 2017
+++ pkgsrc/security/pam-af/distinfo     Tue Jul  6 20:01:17 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2017/02/08 00:07:38 joerg Exp $
+$NetBSD: distinfo,v 1.13 2021/07/06 20:01:17 rhialto Exp $
 
 SHA1 (pam_af-1.0.2.tar.bz2) = e3856a33d79beafa8d4e8cb44b19cbf79a3ed422
 RMD160 (pam_af-1.0.2.tar.bz2) = 0c4163d811ba83de32e9b4633780ac76c8d10d8f
 SHA512 (pam_af-1.0.2.tar.bz2) = 89dc8a78e5d888e6cbf84820420201ef19d012d7fbc39f40ede7e7b4cef12a5896bec7a2a6bfc17cf8d111800e54eb2559e55cd3218b04e84cd0a2a24d7dcc01
 Size (pam_af-1.0.2.tar.bz2) = 17991 bytes
 SHA1 (patch-aa) = 9c8e44c7b25e268777967c742a6946abe0c80316
-SHA1 (patch-ab) = 2d42056f2972a34d2ec681f3c408cfdfc7c26d67
+SHA1 (patch-ab) = aec6c301a5e699cd0e39c552748c48bbf77af52d
 SHA1 (patch-ad) = 0f46fecfec3b920a08e2c22c14ada368214d6a69
 SHA1 (patch-common_pam__af.h) = 026b303116b80cb48987c24b5f48677e7581a346
 SHA1 (patch-pam__af__tool_pam__af__tool.c) = af061bc8766cbf8406dd7a8ce95240e708085bba

Index: pkgsrc/security/pam-af/patches/patch-ab
diff -u pkgsrc/security/pam-af/patches/patch-ab:1.4 pkgsrc/security/pam-af/patches/patch-ab:1.5
--- pkgsrc/security/pam-af/patches/patch-ab:1.4 Sat Apr  7 01:53:18 2012
+++ pkgsrc/security/pam-af/patches/patch-ab     Tue Jul  6 20:01:17 2021
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2012/04/07 01:53:18 obache Exp $
+$NetBSD: patch-ab,v 1.5 2021/07/06 20:01:17 rhialto Exp $
 
 * LOG_AUTHPRIV is not in Solaris, use LOG_AUTH instead.
 * Allow to build with non-native PAM on *BSD.
+* Hacky workaround for http://gnats.netbsd.org/39313
 
 --- pam_af.c.orig      2011-08-24 07:53:32.000000000 +0000
 +++ pam_af.c
@@ -15,11 +16,12 @@ $NetBSD: patch-ab,v 1.4 2012/04/07 01:53
  #include <assert.h>
  #include <ndbm.h>
  
-@@ -444,6 +447,6 @@ pam_sm_setcred(pamh, flags, argc, argv)
+@@ -444,6 +447,7 @@ pam_sm_setcred(pamh, flags, argc, argv)
        PAM_RETURN(PAM_SUCCESS);
  }
  
 -#ifdef _USE_MODULE_ENTRY_
 +#ifdef PAM_MODULE_ENTRY
++#define static
  PAM_MODULE_ENTRY("pam_af");
  #endif