pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/freeradius Add in PAM support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a3fe592e256
branches:  trunk
changeset: 517355:5a3fe592e256
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Wed Aug 09 16:42:09 2006 +0000

description:
Add in PAM support
Fix mySQL PLIST
Fix all PLISTs to avoid a nightmare when the nb number is changed
Bump to nb1

diffstat:

 net/freeradius/Makefile       |   9 +++-
 net/freeradius/PLIST          |  72 +++++++++++++++++++++---------------------
 net/freeradius/PLIST.dbm      |   4 +-
 net/freeradius/PLIST.gdbm     |   4 +-
 net/freeradius/PLIST.kerberos |   4 +-
 net/freeradius/PLIST.ldap     |   4 +-
 net/freeradius/PLIST.mysql    |   3 +-
 net/freeradius/PLIST.pam      |   3 +
 net/freeradius/PLIST.pgsql    |   4 +-
 net/freeradius/options.mk     |  14 +++++++-
 10 files changed, 68 insertions(+), 53 deletions(-)

diffs (252 lines):

diff -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/Makefile   Wed Aug 09 16:42:09 2006 +0000
@@ -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 @@
 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-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 @@
 
 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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST
--- a/net/freeradius/PLIST      Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST      Wed Aug 09 16:42:09 2006 +0000
@@ -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/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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.dbm
--- a/net/freeradius/PLIST.dbm  Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.dbm  Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.gdbm
--- a/net/freeradius/PLIST.gdbm Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.gdbm Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.kerberos
--- a/net/freeradius/PLIST.kerberos     Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.kerberos     Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.ldap
--- a/net/freeradius/PLIST.ldap Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.ldap Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.mysql
--- a/net/freeradius/PLIST.mysql        Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.mysql        Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.pam
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.pam  Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/PLIST.pgsql
--- a/net/freeradius/PLIST.pgsql        Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/PLIST.pgsql        Wed Aug 09 16:42:09 2006 +0000
@@ -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 -r 96bbf32af8f3 -r 5a3fe592e256 net/freeradius/options.mk
--- a/net/freeradius/options.mk Wed Aug 09 15:31:01 2006 +0000
+++ b/net/freeradius/options.mk Wed Aug 09 16:42:09 2006 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index