Import of pkgsrc-2016Q3

security/pam-radius/Makefile

@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:48 asau Exp $
+# $NetBSD: Makefile,v 1.7 2016/04/12 13:15:14 fhajny Exp $
 
+DISTNAME=	pam_radius-1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
-DISTNAME=	pam_radius-1.3.16
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
+MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/pam_radius_auth/
 COMMENT=	PAM module for authentication against a RADIUS server
+LICENSE=	gnu-gpl-v2
 
-NO_CONFIGURE=	YES
-EXTRACT_SUFX=	.tar
+USE_TOOLS+=	gmake
+GNU_CONFIGURE=	yes
+EXTRACT_USING=	bsdtar
 
 INSTALLATION_DIRS=	lib/security share/doc/pam-radius share/examples/pam-radius
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/pam-radius
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pam-radius
+	${INSTALL_DATA} ${WRKSRC}/README.rst ${DESTDIR}${PREFIX}/share/doc/pam-radius
 	${INSTALL_DATA} ${WRKSRC}/USAGE ${DESTDIR}${PREFIX}/share/doc/pam-radius
 	${INSTALL_DATA} ${WRKSRC}/pam_radius_auth.conf \
 		${DESTDIR}${PREFIX}/share/examples/pam-radius

security/pam-radius/PLIST

@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/09/26 20:58:06 bsiegert Exp $
 lib/security/pam_radius_auth.so
 share/doc/pam-radius/INSTALL
-share/doc/pam-radius/README
+share/doc/pam-radius/README.rst
 share/doc/pam-radius/USAGE
 share/examples/pam-radius/pam_radius_auth.conf

security/pam-radius/distinfo

@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/02/21 00:06:52 adrianp Exp $
+$NetBSD: distinfo,v 1.7 2016/04/12 13:15:14 fhajny 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.4.0.tar.gz) = 161af24355b79736bb63ba1cf9e627f9ca6e1671
+RMD160 (pam_radius-1.4.0.tar.gz) = 765bf1d81243504b6fccbab4032baba424dd8d33
+SHA512 (pam_radius-1.4.0.tar.gz) = 3505e3de6777c4129a36d2dbd1ae1dbdc5fe46d752c58a6f2a325f77d6f41f7bd999b886f830c0631e51112f756a16e699f29daa428c2befc79cfab5e5b58624
+Size (pam_radius-1.4.0.tar.gz) = 179458 bytes
+SHA1 (patch-configure) = 88f71bec092c9f9df95fe9de665ba4b37a440af0
+SHA1 (patch-src_pam__radius__auth.h) = e17931e1789636f6bccf80e51d2f875d36ed7681

security/pam-radius/patches/patch-aa

@@ -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 {

security/pam-radius/patches/patch-configure

@@ -0,0 +1,32 @@
+$NetBSD: patch-configure,v 1.2 2016/04/12 13:15:15 fhajny Exp $
+
+Fix shell conditional.
+Backport SunOS fix from upstream:
+  https://github.com/FreeRADIUS/pam_radius/commit/f6e2fb9a2dd04e23e7ca16350e6c3a8ccbd52d33
+
+--- configure.orig	2014-12-17 22:00:59.000000000 +0000
++++ configure
+@@ -4540,7 +4540,13 @@ done
+ for ac_header in security/pam_modules.h pam/pam_modules.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
++    #ifdef HAVE_SECURITY_PAM_APPL_H
++    #  include <security/pam_appl.h>
++    #endif
++
++
++"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -5261,7 +5267,7 @@ fi
+ HOSTINFO=$host
+ 
+ 
+-if test "x$werror" == "xyes"; then
++if test "x$werror" = "xyes"; then
+   CFLAGS="-Werror $CFLAGS"
+ fi
+ 

security/pam-radius/patches/patch-src_pam__radius__auth.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-src_pam__radius__auth.h,v 1.1 2015/09/26 20:58:06 bsiegert Exp $
+
+--- src/pam_radius_auth.h.orig	2014-12-17 22:00:59.000000000 +0000
++++ src/pam_radius_auth.h
+@@ -83,7 +83,7 @@ typedef struct radius_conf_t {
+  *************************************************************************/
+ 
+ #ifndef CONST
+-#  if defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
++#  if defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+ /*
+  *  On older versions of Solaris, you may have to change this to:
+  *  #define CONST