Add in PAM support

Fix mySQL PLIST
Fix all PLISTs to avoid a nightmare when the nb number is changed
Bump to nb1

10 files changed, 68 insertions, 53 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index ab641d0d1b9..b0f88e92d82 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/07/14 22:10:01 adrianp Exp $
+# $NetBSD: Makefile,v 1.52 2006/08/09 16:42:09 adrianp Exp $
 
-DISTNAME=	freeradius-1.1.2
+DISTNAME=	freeradius-${RADVER}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -17,7 +18,9 @@ GNU_CONFIGURE=		YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP:Q}
+PLIST_SUBST+=		RADVER=${RADVER}
 USE_OLD_DES_API=	YES
+RADVER=			1.1.2
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
@@ -31,7 +34,6 @@ CONFIGURE_ARGS+=	--with-ltdl-lib=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-ltdl-include=${PREFIX}/include
 CONFIGURE_ARGS+=        --without-rlm_ippool
 CONFIGURE_ARGS+=        --without-rlm_smb
-CONFIGURE_ARGS+=	--without-rlm_pam
 CONFIGURE_ARGS+=	--without-rlm_sql_iodbc
 CONFIGURE_ARGS+=	--without-rlm_sql_oracle
 CONFIGURE_ARGS+=	--without-rlm_sql_unixodbc
@@ -60,6 +62,7 @@ OWN_DIRS=		${VARBASE}/run/radiusd
 
 PKG_SYSCONFSUBDIR=	raddb
 EGDIR=			${PREFIX}/share/examples/freeradius
+CONF_FILES_MODE=	0640
 
 EGFILES=	acct_users attrs certs/demoCA/index.txt.old \
 		certs/demoCA/cacert.pem certs/demoCA/index.txt \
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 01cc85f5970..abd3fc6fc4e 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/07/14 22:10:01 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/08/09 16:42:09 adrianp Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -8,75 +8,75 @@ bin/radtest
 bin/radwho
 bin/radzap
 bin/smbencrypt
-lib/libeap-${PKGVERSION}.la
+lib/libeap-${RADVER}.la
 lib/libeap.la
-lib/libradius-${PKGVERSION}.la
+lib/libradius-${RADVER}.la
 lib/libradius.la
-lib/rlm_acct_unique-${PKGVERSION}.la
+lib/rlm_acct_unique-${RADVER}.la
 lib/rlm_acct_unique.la
-lib/rlm_always-${PKGVERSION}.la
+lib/rlm_always-${RADVER}.la
 lib/rlm_always.la
-lib/rlm_attr_filter-${PKGVERSION}.la
+lib/rlm_attr_filter-${RADVER}.la
 lib/rlm_attr_filter.la
-lib/rlm_attr_rewrite-${PKGVERSION}.la
+lib/rlm_attr_rewrite-${RADVER}.la
 lib/rlm_attr_rewrite.la
-lib/rlm_chap-${PKGVERSION}.la
+lib/rlm_chap-${RADVER}.la
 lib/rlm_chap.la
-lib/rlm_checkval-${PKGVERSION}.la
+lib/rlm_checkval-${RADVER}.la
 lib/rlm_checkval.la
-lib/rlm_detail-${PKGVERSION}.la
+lib/rlm_detail-${RADVER}.la
 lib/rlm_detail.la
-lib/rlm_digest-${PKGVERSION}.la
+lib/rlm_digest-${RADVER}.la
 lib/rlm_digest.la
-lib/rlm_eap-${PKGVERSION}.la
+lib/rlm_eap-${RADVER}.la
 lib/rlm_eap.la
-lib/rlm_eap_gtc-${PKGVERSION}.la
+lib/rlm_eap_gtc-${RADVER}.la
 lib/rlm_eap_gtc.la
-lib/rlm_eap_leap-${PKGVERSION}.la
+lib/rlm_eap_leap-${RADVER}.la
 lib/rlm_eap_leap.la
-lib/rlm_eap_md5-${PKGVERSION}.la
+lib/rlm_eap_md5-${RADVER}.la
 lib/rlm_eap_md5.la
-lib/rlm_eap_mschapv2-${PKGVERSION}.la
+lib/rlm_eap_mschapv2-${RADVER}.la
 lib/rlm_eap_mschapv2.la
-lib/rlm_eap_peap-${PKGVERSION}.la
+lib/rlm_eap_peap-${RADVER}.la
 lib/rlm_eap_peap.la
-lib/rlm_eap_sim-${PKGVERSION}.la
+lib/rlm_eap_sim-${RADVER}.la
 lib/rlm_eap_sim.la
-lib/rlm_eap_tls-${PKGVERSION}.la
+lib/rlm_eap_tls-${RADVER}.la
 lib/rlm_eap_tls.la
-lib/rlm_eap_ttls-${PKGVERSION}.la
+lib/rlm_eap_ttls-${RADVER}.la
 lib/rlm_eap_ttls.la
-lib/rlm_exec-${PKGVERSION}.la
+lib/rlm_exec-${RADVER}.la
 lib/rlm_exec.la
-lib/rlm_expr-${PKGVERSION}.la
+lib/rlm_expr-${RADVER}.la
 lib/rlm_expr.la
-lib/rlm_fastusers-${PKGVERSION}.la
+lib/rlm_fastusers-${RADVER}.la
 lib/rlm_fastusers.la
-lib/rlm_files-${PKGVERSION}.la
+lib/rlm_files-${RADVER}.la
 lib/rlm_files.la
-lib/rlm_mschap-${PKGVERSION}.la
+lib/rlm_mschap-${RADVER}.la
 lib/rlm_mschap.la
-lib/rlm_ns_mta_md5-${PKGVERSION}.la
+lib/rlm_ns_mta_md5-${RADVER}.la
 lib/rlm_ns_mta_md5.la
-lib/rlm_otp-${PKGVERSION}.la
+lib/rlm_otp-${RADVER}.la
 lib/rlm_otp.la
-lib/rlm_pap-${PKGVERSION}.la
+lib/rlm_pap-${RADVER}.la
 lib/rlm_pap.la
-lib/rlm_passwd-${PKGVERSION}.la
+lib/rlm_passwd-${RADVER}.la
 lib/rlm_passwd.la
-lib/rlm_preprocess-${PKGVERSION}.la
+lib/rlm_preprocess-${RADVER}.la
 lib/rlm_preprocess.la
-lib/rlm_radutmp-${PKGVERSION}.la
+lib/rlm_radutmp-${RADVER}.la
 lib/rlm_radutmp.la
-lib/rlm_realm-${PKGVERSION}.la
+lib/rlm_realm-${RADVER}.la
 lib/rlm_realm.la
-lib/rlm_sql-${PKGVERSION}.la
+lib/rlm_sql-${RADVER}.la
 lib/rlm_sql.la
-lib/rlm_sql_log-${PKGVERSION}.la
+lib/rlm_sql_log-${RADVER}.la
 lib/rlm_sql_log.la
-lib/rlm_sqlcounter-${PKGVERSION}.la
+lib/rlm_sqlcounter-${RADVER}.la
 lib/rlm_sqlcounter.la
-lib/rlm_unix-${PKGVERSION}.la
+lib/rlm_unix-${RADVER}.la
 lib/rlm_unix.la
 man/man1/radclient.1
 man/man1/radeapclient.1
diff --git a/net/freeradius/PLIST.dbm b/net/freeradius/PLIST.dbm
index 4ce83b9a330..f14651e9833 100644
--- a/net/freeradius/PLIST.dbm
+++ b/net/freeradius/PLIST.dbm
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.dbm,v 1.3 2006/03/22 20:53:41 joerg Exp $
+@comment $NetBSD: PLIST.dbm,v 1.4 2006/08/09 16:42:09 adrianp Exp $
 bin/rlm_dbm_cat
 bin/rlm_dbm_parser
-lib/rlm_dbm-${PKGVERSION}.la
+lib/rlm_dbm-${RADVER}.la
 lib/rlm_dbm.la
diff --git a/net/freeradius/PLIST.gdbm b/net/freeradius/PLIST.gdbm
index 1e799e087c0..81934400ad7 100644
--- a/net/freeradius/PLIST.gdbm
+++ b/net/freeradius/PLIST.gdbm
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.gdbm,v 1.3 2006/03/22 20:53:41 joerg Exp $
-lib/rlm_counter-${PKGVERSION}.la
+@comment $NetBSD: PLIST.gdbm,v 1.4 2006/08/09 16:42:09 adrianp Exp $
+lib/rlm_counter-${RADVER}.la
 lib/rlm_counter.la
diff --git a/net/freeradius/PLIST.kerberos b/net/freeradius/PLIST.kerberos
index ef120dc0895..4cfb4b04f5a 100644
--- a/net/freeradius/PLIST.kerberos
+++ b/net/freeradius/PLIST.kerberos
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.kerberos,v 1.1 2006/07/13 22:20:35 adrianp Exp $
-lib/rlm_krb5-${PKGVERSION}.la
+@comment $NetBSD: PLIST.kerberos,v 1.2 2006/08/09 16:42:09 adrianp Exp $
+lib/rlm_krb5-${RADVER}.la
 lib/rlm_krb5.la
diff --git a/net/freeradius/PLIST.ldap b/net/freeradius/PLIST.ldap
index 62902759ea4..a258a86d6e3 100644
--- a/net/freeradius/PLIST.ldap
+++ b/net/freeradius/PLIST.ldap
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.ldap,v 1.2 2006/03/22 20:53:41 joerg Exp $
-lib/rlm_ldap-${PKGVERSION}.la
+@comment $NetBSD: PLIST.ldap,v 1.3 2006/08/09 16:42:09 adrianp Exp $
+lib/rlm_ldap-${RADVER}.la
 lib/rlm_ldap.la
diff --git a/net/freeradius/PLIST.mysql b/net/freeradius/PLIST.mysql
index eaac7c79f23..3b8303fef80 100644
--- a/net/freeradius/PLIST.mysql
+++ b/net/freeradius/PLIST.mysql
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.mysql,v 1.2 2006/03/22 20:53:41 joerg Exp $
-lib/rlm_sql_mysql-${PKGVERSION}.la
+@comment $NetBSD: PLIST.mysql,v 1.3 2006/08/09 16:42:09 adrianp Exp $
 lib/rlm_sql_mysql.la
diff --git a/net/freeradius/PLIST.pam b/net/freeradius/PLIST.pam
new file mode 100644
index 00000000000..18ab64569d1
--- /dev/null
+++ b/net/freeradius/PLIST.pam
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.pam,v 1.1 2006/08/09 16:42:09 adrianp Exp $
+lib/rlm_pam-${RADVER}.la
+lib/rlm_pam.la
diff --git a/net/freeradius/PLIST.pgsql b/net/freeradius/PLIST.pgsql
index 22faf8703a6..fcb5f8f07d3 100644
--- a/net/freeradius/PLIST.pgsql
+++ b/net/freeradius/PLIST.pgsql
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.pgsql,v 1.2 2006/03/22 20:53:41 joerg Exp $
-lib/rlm_sql_postgresql-${PKGVERSION}.la
+@comment $NetBSD: PLIST.pgsql,v 1.3 2006/08/09 16:42:09 adrianp Exp $
+lib/rlm_sql_postgresql-${RADVER}.la
 lib/rlm_sql_postgresql.la
diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index 6833122fe15..3d054f50d50 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.10 2006/07/14 22:10:01 adrianp Exp $
+# $NetBSD: options.mk,v 1.11 2006/08/09 16:42:09 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freeradius
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	dbm
 PKG_OPTIONS_GROUP.dbm=	bdb gdbm
 
-PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql snmp kerberos freeradius-simul-use
+PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql snmp kerberos freeradius-simul-use pam
 PKG_SUGGESTED_OPTIONS=	gdbm freeradius-simul-use
 
 .include "../../mk/bsd.options.mk"
@@ -99,3 +99,13 @@ CONFIGURE_ARGS+=	--without-rlm_krb5
 CONFIGURE_ENV+=	ac_cv_path_SNMPGET=""
 CONFIGURE_ENV+=	ac_cv_path_SNMPWALK=""
 .endif
+
+###
+### Use PAM for storing user details
+###
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=	--with-rlm_pam
+PLIST_SRC+=		${PKGDIR}/PLIST.pam
+.else
+CONFIGURE_ARGS+=	--without-rlm_pam
+.endif