Update pam_radius to 1.3.17, patch from PR pkg/47269.

Allow any number of retries, instead of only up to 3.

Add ruser option, to authenticate as PAM_RUSER instead of PAM_USER,
to allow applications such as 'su' to authenticate as the real user.
Patch from David Mitchell.

Add 'localifdown' option.

5 files changed, 53 insertions, 23 deletions

diff --git a/security/pam-radius/Makefile b/security/pam-radius/Makefile
index fb9266ccd97..1309fc9eb70 100644
--- a/security/pam-radius/Makefile
+++ b/security/pam-radius/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:48 asau Exp $
+# $NetBSD: Makefile,v 1.5 2015/09/26 20:01:27 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/_/-/}
-DISTNAME=	pam_radius-1.3.16
+DISTNAME=	pam_radius-1.3.17
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
+MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/old/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/pam_radius_auth/
 COMMENT=	PAM module for authentication against a RADIUS server
 
 NO_CONFIGURE=	YES
-EXTRACT_SUFX=	.tar
+EXTRACT_SUFX=	.tar.gz
 
 INSTALLATION_DIRS=	lib/security share/doc/pam-radius share/examples/pam-radius
 
diff --git a/security/pam-radius/distinfo b/security/pam-radius/distinfo
index 820ecab2e20..9ef7a702c4b 100644
--- a/security/pam-radius/distinfo
+++ b/security/pam-radius/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/02/21 00:06:52 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2015/09/26 20:01:27 bsiegert Exp $
 
-SHA1 (pam_radius-1.3.16.tar) = 127352a693bafd9f32dd80ecece57de2bc1c19b8
-RMD160 (pam_radius-1.3.16.tar) = 6fb69c357b01ba5ac026b186de9be0e3f92c3fcd
-Size (pam_radius-1.3.16.tar) = 112640 bytes
-SHA1 (patch-aa) = a52b9561ca552a7b35b65b3f3361f5ab1bdf872e
+SHA1 (pam_radius-1.3.17.tar.gz) = 7623ca1b636bba729c69c3f50254b856bb4519a7
+RMD160 (pam_radius-1.3.17.tar.gz) = c3873d5a4275170420f98c2f37def0593293f463
+Size (pam_radius-1.3.17.tar.gz) = 31341 bytes
+SHA1 (patch-Makefile) = 192a300d690aa096fd31b3ffdb2394761ded23cc
+SHA1 (patch-pam_radius_auth.c) = ac1886fc20757a3787f57071c514e4518b4c25bd
diff --git a/security/pam-radius/patches/patch-Makefile b/security/pam-radius/patches/patch-Makefile
new file mode 100644
index 00000000000..4ee8c258316
--- /dev/null
+++ b/security/pam-radius/patches/patch-Makefile
@@ -0,0 +1,7 @@
+--- Makefile	2007-03-25 23:22:11.000000000 -0500
++++ Makefile	2012-11-30 15:29:34.000000000 -0600
+@@ -17,3 +17,3 @@
+ #
+-CFLAGS = -Wall -fPIC
++CFLAGS = -Wall -fPIC -DNO_STATIC_MODULES
+ #
diff --git a/security/pam-radius/patches/patch-aa b/security/pam-radius/patches/patch-aa
deleted file mode 100644
index 13b9f1a5ded..00000000000
--- a/security/pam-radius/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/02/21 00:06:52 adrianp Exp $
-
---- md5.h.orig	2003-04-29 13:19:16.000000000 -0700
-+++ md5.h
-@@ -15,6 +15,9 @@
- #define MD5Transform  pra_MD5Transform
- 
- #include <sys/types.h>
-+#ifndef u_int32_t
-+#define u_int32_t uint32_t
-+#endif
- #define uint32 u_int32_t
- 
- struct MD5Context {
diff --git a/security/pam-radius/patches/patch-pam_radius_auth.c b/security/pam-radius/patches/patch-pam_radius_auth.c
new file mode 100644
index 00000000000..309cf6a9c8e
--- /dev/null
+++ b/security/pam-radius/patches/patch-pam_radius_auth.c
@@ -0,0 +1,36 @@
+--- pam_radius_auth.c	2007-03-26 04:36:13.000000000 -0500
++++ pam_radius_auth.c	2012-11-30 15:53:29.000000000 -0600
+@@ -58,6 +58,5 @@
+ #include <errno.h>
++#include <sys/types.h>
+ 
+-#ifdef sun
+ #include <security/pam_appl.h>
+-#endif
+ #include <security/pam_modules.h>
+@@ -184,3 +183,3 @@
+     while(*ip_str != '.' && *ip_str != '\0' && count < 4) {
+-      if(!isdigit(*ip_str)) {
++      if(!isdigit((unsigned char)*ip_str)) {
+ 	return((UINT4)0);
+@@ -220,3 +219,3 @@
+       digit_count = 0;
+-    } else if(!isdigit(*addr)) {
++    } else if(!isdigit((unsigned char)*addr)) {
+       dot_count = 5;
+@@ -276,3 +275,3 @@
+   if (!server->port) {
+-    if (p && isdigit(*p)) {	/* the port looks like it's a number */
++    if (p && isdigit((unsigned char)*p)) {	/* the port looks like it's a number */
+       unsigned int i = atoi(p) & 0xffff;
+@@ -768,3 +767,4 @@
+ {
+-  int salen, total_length;
++  socklen_t salen;
++  int total_length;
+   fd_set set;
+@@ -1101,3 +1101,3 @@
+     if (!strcmp("root", user)) {
+-      user = userinfo;
++      user = (char *)userinfo;
+       DPRINT(LOG_DEBUG, "Username now %s from ruser", user);