diff options
Diffstat (limited to 'net/freeradius2')
| -rw-r--r-- | net/freeradius2/Makefile | 128 | ||||
| -rw-r--r-- | net/freeradius2/PLIST | 85 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.dbm | 5 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.gdbm | 3 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.kerberos | 3 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.ldap | 3 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.mysql | 2 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.pam | 3 | ||||
| -rw-r--r-- | net/freeradius2/PLIST.pgsql | 2 | ||||
| -rw-r--r-- | net/freeradius2/distinfo | 12 | ||||
| -rw-r--r-- | net/freeradius2/options.mk | 69 | ||||
| -rw-r--r-- | net/freeradius2/patches/patch-ac | 21 | ||||
| -rw-r--r-- | net/freeradius2/patches/patch-ad | 13 | ||||
| -rw-r--r-- | net/freeradius2/patches/patch-ai | 6 |
14 files changed, 232 insertions, 123 deletions
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 69a66d0dddf..f91ab70ce11 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/12/19 22:49:18 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2009/04/23 18:26:05 adam Exp $ DISTNAME= freeradius-server-${RADVER} PKGNAME= ${DISTNAME:S/-server//} @@ -15,13 +15,11 @@ COMMENT= Free RADIUS server implementation CONFLICTS+= radiusd-cistron-[0-9]* CONFLICTS+= freeradius<2.0 USE_TOOLS+= gmake perl:run -GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_OLD_DES_API= YES MAKE_JOBS_SAFE= NO BUILD_DEFS= VARBASE -PLIST_SRC= ${WRKDIR}/.PLIST_SRC FILES_SUBST+= RADIUS_USER=${RADIUS_USER} FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP} PLIST_SUBST+= RADVER=${RADVER} @@ -45,27 +43,21 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \ OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd/radacct \ ${RADIUS_USER} ${RADIUS_GROUP} 0750 -RADVER= 2.1.3 +RADVER= 2.1.4 EGDIR= ${PREFIX}/share/examples/freeradius BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 -CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --quiet CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --disable-ltdl-install +CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd 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_sql_iodbc CONFIGURE_ARGS+= --without-rlm_sql_oracle CONFIGURE_ARGS+= --without-rlm_sql_unixodbc -CONFIGURE_ARGS+= --quiet -#CONFIGURE_ARGS+= --without-rlm_eap_peap -#CONFIGURE_ARGS+= --without-rlm_eap_sim -#CONFIGURE_ARGS+= --without-rlm_eap_tls -#CONFIGURE_ARGS+= --without-rlm_eap_ttls REPLACE_PERL= scripts/radsqlrelay @@ -73,7 +65,7 @@ SUBST_CLASSES= make SUBST_STAGE.make= post-patch SUBST_FILES.make= src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in SUBST_SED.make+= -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \ - -L${PREFIX}/lib|g" + -L${PREFIX}/lib|g" SUBST_MESSAGE.make= Fixing Makefiles. SUBST_CLASSES+= config @@ -85,42 +77,51 @@ SUBST_MESSAGE.config= Fixing configuration files. .include "options.mk" -EGFILES= certs/demoCA/cacert.pem certs/bootstrap certs/xpextensions \ - certs/client.cnf certs/server.cnf certs/README certs/ca.cnf \ - sql/mssql/dialup.conf sql/mssql/schema.sql \ - sql/mysql/dialup.conf sql/mysql/nas.sql sql/mysql/ippool.conf \ - sql/mysql/schema.sql sql/mysql/counter.conf \ - sql/mysql/ippool.sql sql/oracle/dialup.conf sql/oracle/nas.sql \ - sql/oracle/schema.sql sql/oracle/ippool.sql \ - sql/postgresql/dialup.conf sql/postgresql/nas.sql \ - sql/postgresql/voip-postpaid.conf sql/postgresql/ippool.conf \ - sql/postgresql/schema.sql sql/postgresql/ippool.sql \ - sql/postgresql/cisco_h323_db_schema.sql \ - sql/postgresql/counter.conf sql/postgresql/admin.sql \ - sql/postgresql/update_radacct_group_trigger.sql policy.txt \ - experimental.conf radiusd.conf otp.conf policy.conf \ - preproxy_users users vmpsd.conf.in acct_users \ - ldap.attrmap clients.conf huntgroups sql.conf sqlippool.conf \ - sites-available/inner-tunnel sites-available/example \ - sites-available/buffered-sql sites-available/default \ - sites-available/vmps sites-available/README \ - sites-available/proxy-inner-tunnel \ - sites-available/copy-acct-to-home-server attrs.pre-proxy \ - sites-available/dhcp sites-available/robust-proxy-accounting \ - sites-available/virtual.example.com sql/mysql/admin.sql \ - eap.conf attrs.accounting_response hints attrs.access_reject \ - templates.conf attrs proxy.conf dictionary - -EGDIRS= certs certs/demoCA sql sql/mssql sql/mysql sql/oracle \ - sql/postgresql sites-available +EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \ + attrs.pre-proxy certs/README certs/bootstrap certs/ca.cnf \ + certs/client.cnf certs/demoCA/cacert.pem certs/server.cnf \ + certs/xpextensions clients.conf dictionary eap.conf experimental.conf \ + hints huntgroups ldap.attrmap modules/acct_unique modules/always \ + modules/attr_filter modules/attr_rewrite modules/chap modules/checkval \ + modules/counter modules/detail modules/detail.example.com \ + modules/detail.log modules/digest modules/echo modules/etc_group \ + modules/exec modules/expiration modules/expr modules/files \ + modules/inner-eap modules/ippool modules/krb5 modules/ldap \ + modules/linelog modules/logintime modules/mac2ip modules/mac2vlan \ + modules/mschap modules/otp modules/pam modules/pap modules/passwd \ + modules/perl modules/policy modules/preprocess modules/radutmp \ + modules/realm modules/smbpasswd modules/smsotp modules/sql_log \ + modules/sqlcounter_expire_on_login modules/sradutmp modules/unix \ + modules/wimax policy.conf policy.txt preproxy_users proxy.conf \ + radiusd.conf sites-available/README sites-available/buffered-sql \ + sites-available/control-socket \ + sites-available/copy-acct-to-home-server \ + sites-available/decoupled-accounting sites-available/default \ + sites-available/dhcp sites-available/dynamic-clients \ + sites-available/example sites-available/inner-tunnel \ + sites-available/originate-coa sites-available/proxy-inner-tunnel \ + sites-available/robust-proxy-accounting sites-available/status \ + sites-available/virtual.example.com sites-available/vmps sql.conf \ + sql/mssql/dialup.conf sql/mssql/schema.sql sql/mysql/admin.sql \ + sql/mysql/counter.conf sql/mysql/dialup.conf sql/mysql/ippool.conf \ + sql/mysql/ippool.sql sql/mysql/nas.sql sql/mysql/schema.sql \ + sql/mysql/wimax.conf sql/mysql/wimax.sql sql/oracle/dialup.conf \ + sql/oracle/ippool.conf sql/oracle/ippool.sql sql/oracle/msqlippool.txt \ + sql/oracle/nas.sql sql/oracle/schema.sql sql/postgresql/admin.sql \ + sql/postgresql/cisco_h323_db_schema.sql sql/postgresql/counter.conf \ + sql/postgresql/dialup.conf sql/postgresql/ippool.conf \ + sql/postgresql/ippool.sql sql/postgresql/nas.sql \ + sql/postgresql/schema.sql \ + sql/postgresql/update_radacct_group_trigger.sql \ + sql/postgresql/voip-postpaid.conf sqlippool.conf templates.conf users +EGDIRS= certs certs/demoCA modules sql sql/mssql sql/mysql sql/oracle \ + sql/postgresql sites-available .for f in ${EGFILES} CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ ${RADIUS_USER} ${RADIUS_GROUP} 0640 .endfor -.include "../../security/openssl/buildlink3.mk" -.include "../../devel/libltdl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" @@ -138,38 +139,31 @@ SUBST_SED.make+= -e 's|@ldap_ldflags@|@ldap_ldflags@ \ ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g' .endif -.if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -fPIC -.endif +# fix for wrong version number in freeradius-2.1.4 +post-patch: + ${ECHO} ${RADVER} > ${WRKSRC}/VERSION post-build: - ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC - ${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC - -. if !empty(PKG_OPTIONS:Mpam) - ${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam -. endif + ${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC +.if !empty(PKG_OPTIONS:Mpam) + ${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam +.endif post-install: ${INSTALL_DATA_DIR} ${EGDIR} - -. for d in ${EGDIRS} - ${INSTALL_DATA_DIR} ${EGDIR}/${d} -. endfor - -. for f in ${EGFILES} - ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f} -. endfor - +.for d in ${EGDIRS} + ${INSTALL_DATA_DIR} ${EGDIR}/${d} + ${MKDIR} ${PKG_SYSCONFDIR}/${d} +.endfor +.for f in ${EGFILES} + ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f} +.endfor ${INSTALL_DATA} ${WRKSRC}/src/modules/rlm_perl/example.pl ${EGDIR} - -. for d in ${EGDIRS} - ${MKDIR} ${PKG_SYSCONFDIR}/${d} -. endfor - ${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs ${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs/demoCA ${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs ${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs/demoCA +.include "../../devel/libltdl/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST index 1346f6b8a49..b6488cdcabf 100644 --- a/net/freeradius2/PLIST +++ b/net/freeradius2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/12/19 22:49:18 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/04/23 18:26:05 adam Exp $ bin/radclient bin/radconf2xml bin/radeapclient @@ -8,6 +8,9 @@ bin/radsqlrelay bin/radtest bin/radwho bin/radzap +${PLIST.dbm}bin/rlm_dbm_cat +${PLIST.dbm}bin/rlm_dbm_parser +bin/rlm_ippool_tool bin/smbencrypt include/freeradius/hash.h include/freeradius/ident.h @@ -42,6 +45,10 @@ lib/rlm_checkval-${RADVER}.la lib/rlm_checkval.la lib/rlm_copy_packet-${RADVER}.la lib/rlm_copy_packet.la +${PLIST.gdbm}lib/rlm_counter-${RADVER}.la +${PLIST.gdbm}lib/rlm_counter.la +${PLIST.dbm}lib/rlm_dbm-${RADVER}.la +${PLIST.dbm}lib/rlm_dbm.la lib/rlm_detail-${RADVER}.la lib/rlm_detail.la lib/rlm_digest-${RADVER}.la @@ -76,18 +83,30 @@ lib/rlm_fastusers-${RADVER}.la lib/rlm_fastusers.la lib/rlm_files-${RADVER}.la lib/rlm_files.la +lib/rlm_ippool-${RADVER}.la +lib/rlm_ippool.la +${PLIST.kerberos}lib/rlm_krb5-${RADVER}.la +${PLIST.kerberos}lib/rlm_krb5.la +${PLIST.ldap}lib/rlm_ldap-${RADVER}.la +${PLIST.ldap}lib/rlm_ldap.la lib/rlm_linelog-${RADVER}.la lib/rlm_linelog.la lib/rlm_logintime-${RADVER}.la lib/rlm_logintime.la lib/rlm_mschap-${RADVER}.la lib/rlm_mschap.la +${PLIST.mysql}lib/rlm_sql_mysql-${RADVER}.la +${PLIST.mysql}lib/rlm_sql_mysql.la lib/rlm_otp-${RADVER}.la lib/rlm_otp.la +${PLIST.pam}lib/rlm_pam-${RADVER}.la +${PLIST.pam}lib/rlm_pam.la lib/rlm_pap-${RADVER}.la lib/rlm_pap.la lib/rlm_passwd-${RADVER}.la lib/rlm_passwd.la +${PLIST.pgsql}lib/rlm_sql_postgresql-${RADVER}.la +${PLIST.pgsql}lib/rlm_sql_postgresql.la lib/rlm_policy-${RADVER}.la lib/rlm_policy.la lib/rlm_preprocess-${RADVER}.la @@ -98,8 +117,12 @@ lib/rlm_realm-${RADVER}.la lib/rlm_realm.la lib/rlm_sql-${RADVER}.la lib/rlm_sql.la +${PLIST.iodbc}lib/rlm_sql_iodbc-${RADVER}.la +${PLIST.iodbc}lib/rlm_sql_iodbc.la lib/rlm_sql_log-${RADVER}.la lib/rlm_sql_log.la +${PLIST.unixodbc}lib/rlm_sql_unixodbc-${RADVER}.la +${PLIST.unixodbc}lib/rlm_sql_unixodbc.la lib/rlm_sqlcounter-${RADVER}.la lib/rlm_sqlcounter.la lib/rlm_sqlippool-${RADVER}.la @@ -137,12 +160,15 @@ man/man5/rlm_sql_log.5 man/man5/rlm_unix.5 man/man5/unlang.5 man/man5/users.5 +man/man8/raddebug.8 man/man8/radiusd.8 man/man8/radmin.8 man/man8/radrelay.8 man/man8/radsqlrelay.8 man/man8/radwatch.8 +man/man8/rlm_ippool_tool.8 sbin/checkrad +sbin/raddebug sbin/radiusd sbin/radmin sbin/radwatch @@ -185,7 +211,6 @@ share/doc/freeradius/rfc/draft-kamath-pppext-eap-mschapv2-00.txt share/doc/freeradius/rfc/draft-sterman-aaa-sip-00.txt share/doc/freeradius/rfc/leap.txt share/doc/freeradius/rfc/pppext-eap-sim-12.txt -share/doc/freeradius/rfc/rfc5281.txt share/doc/freeradius/rfc/rfc1157.txt share/doc/freeradius/rfc/rfc1227.txt share/doc/freeradius/rfc/rfc1448.txt @@ -233,6 +258,7 @@ share/doc/freeradius/rfc/rfc5080.txt share/doc/freeradius/rfc/rfc5090.txt share/doc/freeradius/rfc/rfc5176.txt share/doc/freeradius/rfc/rfc5247.txt +share/doc/freeradius/rfc/rfc5281.txt share/doc/freeradius/rlm_dbm share/doc/freeradius/rlm_eap share/doc/freeradius/rlm_expiration @@ -271,7 +297,48 @@ share/examples/freeradius/experimental.conf share/examples/freeradius/hints share/examples/freeradius/huntgroups share/examples/freeradius/ldap.attrmap -share/examples/freeradius/otp.conf +share/examples/freeradius/modules/acct_unique +share/examples/freeradius/modules/always +share/examples/freeradius/modules/attr_filter +share/examples/freeradius/modules/attr_rewrite +share/examples/freeradius/modules/chap +share/examples/freeradius/modules/checkval +share/examples/freeradius/modules/counter +share/examples/freeradius/modules/detail +share/examples/freeradius/modules/detail.example.com +share/examples/freeradius/modules/detail.log +share/examples/freeradius/modules/digest +share/examples/freeradius/modules/echo +share/examples/freeradius/modules/etc_group +share/examples/freeradius/modules/exec +share/examples/freeradius/modules/expiration +share/examples/freeradius/modules/expr +share/examples/freeradius/modules/files +share/examples/freeradius/modules/inner-eap +share/examples/freeradius/modules/ippool +share/examples/freeradius/modules/krb5 +share/examples/freeradius/modules/ldap +share/examples/freeradius/modules/linelog +share/examples/freeradius/modules/logintime +share/examples/freeradius/modules/mac2ip +share/examples/freeradius/modules/mac2vlan +share/examples/freeradius/modules/mschap +share/examples/freeradius/modules/otp +share/examples/freeradius/modules/pam +share/examples/freeradius/modules/pap +share/examples/freeradius/modules/passwd +share/examples/freeradius/modules/perl +share/examples/freeradius/modules/policy +share/examples/freeradius/modules/preprocess +share/examples/freeradius/modules/radutmp +share/examples/freeradius/modules/realm +share/examples/freeradius/modules/smbpasswd +share/examples/freeradius/modules/smsotp +share/examples/freeradius/modules/sql_log +share/examples/freeradius/modules/sqlcounter_expire_on_login +share/examples/freeradius/modules/sradutmp +share/examples/freeradius/modules/unix +share/examples/freeradius/modules/wimax share/examples/freeradius/policy.conf share/examples/freeradius/policy.txt share/examples/freeradius/preproxy_users @@ -279,13 +346,18 @@ share/examples/freeradius/proxy.conf share/examples/freeradius/radiusd.conf share/examples/freeradius/sites-available/README share/examples/freeradius/sites-available/buffered-sql +share/examples/freeradius/sites-available/control-socket share/examples/freeradius/sites-available/copy-acct-to-home-server +share/examples/freeradius/sites-available/decoupled-accounting share/examples/freeradius/sites-available/default share/examples/freeradius/sites-available/dhcp +share/examples/freeradius/sites-available/dynamic-clients share/examples/freeradius/sites-available/example share/examples/freeradius/sites-available/inner-tunnel +share/examples/freeradius/sites-available/originate-coa share/examples/freeradius/sites-available/proxy-inner-tunnel share/examples/freeradius/sites-available/robust-proxy-accounting +share/examples/freeradius/sites-available/status share/examples/freeradius/sites-available/virtual.example.com share/examples/freeradius/sites-available/vmps share/examples/freeradius/sql.conf @@ -298,8 +370,12 @@ share/examples/freeradius/sql/mysql/ippool.conf share/examples/freeradius/sql/mysql/ippool.sql share/examples/freeradius/sql/mysql/nas.sql share/examples/freeradius/sql/mysql/schema.sql +share/examples/freeradius/sql/mysql/wimax.conf +share/examples/freeradius/sql/mysql/wimax.sql share/examples/freeradius/sql/oracle/dialup.conf +share/examples/freeradius/sql/oracle/ippool.conf share/examples/freeradius/sql/oracle/ippool.sql +share/examples/freeradius/sql/oracle/msqlippool.txt share/examples/freeradius/sql/oracle/nas.sql share/examples/freeradius/sql/oracle/schema.sql share/examples/freeradius/sql/postgresql/admin.sql @@ -315,7 +391,6 @@ share/examples/freeradius/sql/postgresql/voip-postpaid.conf share/examples/freeradius/sqlippool.conf share/examples/freeradius/templates.conf share/examples/freeradius/users -share/examples/freeradius/vmpsd.conf.in share/examples/rc.d/radiusd share/freeradius/dictionary share/freeradius/dictionary.3com @@ -359,6 +434,7 @@ share/freeradius/dictionary.fortinet share/freeradius/dictionary.foundry share/freeradius/dictionary.freeradius share/freeradius/dictionary.freeradius.internal +share/freeradius/dictionary.freeswitch share/freeradius/dictionary.gandalf share/freeradius/dictionary.garderos share/freeradius/dictionary.gemtek @@ -457,6 +533,7 @@ share/freeradius/dictionary.zyxel @dirrm share/examples/freeradius/sql/mssql @dirrm share/examples/freeradius/sql @dirrm share/examples/freeradius/sites-available +@dirrm share/examples/freeradius/modules @dirrm share/examples/freeradius/certs/demoCA @dirrm share/examples/freeradius/certs @dirrm share/examples/freeradius diff --git a/net/freeradius2/PLIST.dbm b/net/freeradius2/PLIST.dbm deleted file mode 100644 index 83974ee8ba3..00000000000 --- a/net/freeradius2/PLIST.dbm +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.dbm,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -bin/rlm_dbm_cat -bin/rlm_dbm_parser -lib/rlm_dbm-${RADVER}.la -lib/rlm_dbm.la diff --git a/net/freeradius2/PLIST.gdbm b/net/freeradius2/PLIST.gdbm deleted file mode 100644 index 7bd7679f7ac..00000000000 --- a/net/freeradius2/PLIST.gdbm +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.gdbm,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_counter-${RADVER}.la -lib/rlm_counter.la diff --git a/net/freeradius2/PLIST.kerberos b/net/freeradius2/PLIST.kerberos deleted file mode 100644 index 3ec74f6d515..00000000000 --- a/net/freeradius2/PLIST.kerberos +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.kerberos,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_krb5-${RADVER}.la -lib/rlm_krb5.la diff --git a/net/freeradius2/PLIST.ldap b/net/freeradius2/PLIST.ldap deleted file mode 100644 index af4b0e2308e..00000000000 --- a/net/freeradius2/PLIST.ldap +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.ldap,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_ldap-${RADVER}.la -lib/rlm_ldap.la diff --git a/net/freeradius2/PLIST.mysql b/net/freeradius2/PLIST.mysql deleted file mode 100644 index 521b16c6abc..00000000000 --- a/net/freeradius2/PLIST.mysql +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.mysql,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_sql_mysql.la diff --git a/net/freeradius2/PLIST.pam b/net/freeradius2/PLIST.pam deleted file mode 100644 index c4b5c8ad589..00000000000 --- a/net/freeradius2/PLIST.pam +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.pam,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_pam-${RADVER}.la -lib/rlm_pam.la diff --git a/net/freeradius2/PLIST.pgsql b/net/freeradius2/PLIST.pgsql deleted file mode 100644 index 28a51c7898f..00000000000 --- a/net/freeradius2/PLIST.pgsql +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.pgsql,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ -lib/rlm_sql_postgresql.la diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo index 0148b986574..73fff3788d4 100644 --- a/net/freeradius2/distinfo +++ b/net/freeradius2/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.4 2008/12/19 22:49:18 adrianp Exp $ +$NetBSD: distinfo,v 1.5 2009/04/23 18:26:05 adam Exp $ -SHA1 (freeradius-server-2.1.3.tar.bz2) = 752bc9ad79dec97661ebf5459fd51b708d0f9ddd -RMD160 (freeradius-server-2.1.3.tar.bz2) = 9f697c1b0a834dc7f2b0f669df0d6b8c379ad346 -Size (freeradius-server-2.1.3.tar.bz2) = 2380451 bytes +SHA1 (freeradius-server-2.1.4.tar.bz2) = 2e0172d9e0c72cba5e61259aaf15da67230f1882 +RMD160 (freeradius-server-2.1.4.tar.bz2) = 83b41b421e61720e50bc3e6c390e4f489d26e646 +Size (freeradius-server-2.1.4.tar.bz2) = 2405962 bytes SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f +SHA1 (patch-ac) = 5be3ed42b1e627cd6b71bbeabcbaa34edadb025d +SHA1 (patch-ad) = 9ff2eac2ea117117a06d09ab1dfddd881351df81 SHA1 (patch-ae) = c4e77de8871ec0c4b5840f46f29286bae707dd3b -SHA1 (patch-ai) = 3f5fb64d718252cbbae6c808abd26bea9f0dcc9d +SHA1 (patch-ai) = 1a36e12cf70eec637341a15741f9a626ab4ae804 SHA1 (patch-aj) = ba4e08eb0f3fbe0cb18f41de9c80e14ebccc1188 SHA1 (patch-ak) = 751aba6a3f9716279f3a87871cf7008b7a921f9a SHA1 (patch-al) = 05cce8da469b6d14fcba1ef3cf378c3ba4bee3a0 diff --git a/net/freeradius2/options.mk b/net/freeradius2/options.mk index 3ddd9da34a7..356858d5136 100644 --- a/net/freeradius2/options.mk +++ b/net/freeradius2/options.mk @@ -1,66 +1,90 @@ -# $NetBSD: options.mk,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2009/04/23 18:26:05 adam 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 pam +PKG_SUPPORTED_OPTIONS= ldap mysql pgsql snmp kerberos pam freeradius-simul-use PKG_SUGGESTED_OPTIONS= gdbm freeradius-simul-use +PKG_OPTIONS_OPTIONAL_GROUPS= dbm odbc +PKG_OPTIONS_GROUP.dbm= bdb gdbm +PKG_OPTIONS_GROUP.odbc= iodbc unixodbc .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbm gdbm iodbc ldap kerberos mysql pam pgsql unixodbc + ### -### Use GDBM or Berkeley DB 1.x for storing user details +### GDBM or Berkeley DB 1.x support ### .if !empty(PKG_OPTIONS:Mgdbm) . include "../../databases/gdbm/buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_dbm -PLIST_SRC+= ${PKGDIR}/PLIST.dbm ${PKGDIR}/PLIST.gdbm +PLIST.dbm= yes +PLIST.gdbm= yes .elif !empty(PKG_OPTIONS:Mbdb) && exists(/usr/include/ndbm.h) BDB_ACCEPTED= db1 . include "../../mk/bdb.buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_dbm -PLIST_SRC+= ${PKGDIR}/PLIST.dbm +PLIST.dbm= yes .else CONFIGURE_ARGS+= --without-rlm_dbm .endif ### -### Use OpenLDAP for storing user details +### OpenLDAP support ### .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_ldap -PLIST_SRC+= ${PKGDIR}/PLIST.ldap +PLIST.ldap= yes .else CONFIGURE_ARGS+= --without-rlm_ldap .endif ### -### Use PostgreSQL for storing user details +### IODBC support +### +.if !empty(PKG_OPTIONS:Miodbc) +. include "../../databases/iodbc/buildlink3.mk" +CONFIGURE_ARGS+= --with-rlm_sql_iodbc +PLIST.iodbc= yes +.else +CONFIGURE_ARGS+= --without-rlm_sql_iodbc +.endif + +### +### UnixDBC support +### +.if !empty(PKG_OPTIONS:Munixodbc) +. include "../../databases/unixodbc/buildlink3.mk" +CONFIGURE_ARGS+= --with-rlm_sql_unixodbc +PLIST.unixodbc= yes +.else +CONFIGURE_ARGS+= --without-rlm_sql_unixodbc +.endif + +### +### PostgreSQL support ### .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_sql_postgresql -PLIST_SRC+= ${PKGDIR}/PLIST.pgsql +PLIST.pgsql= yes .else CONFIGURE_ARGS+= --without-rlm_sql_postgresql .endif ### -### Use MySQL for storing user details +### MySQL support ### .if !empty(PKG_OPTIONS:Mmysql) . include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_sql_mysql -PLIST_SRC+= ${PKGDIR}/PLIST.mysql +PLIST.mysql= yes .else CONFIGURE_ARGS+= --without-rlm_sql_mysql .endif ### -### Compile in SNMP support +### SNMP support ### ### Please note that snmp support is limited. Freeradius looks like it's ### after the old ucd-snmp (v4.x) headers and ucd-snmp isn't in pkgsrc any @@ -68,7 +92,6 @@ CONFIGURE_ARGS+= --without-rlm_sql_mysql ### to work either. So it will find a few snmp utilites but other than that ### it's limited, at best. ### -### .if !empty(PKG_OPTIONS:Msnmp) . include "../../net/net-snmp/buildlink3.mk" CONFIGURE_ARGS+= --with-snmp @@ -77,7 +100,7 @@ CONFIGURE_ARGS+= --without-snmp .endif ### -### Use kerberos 5 +### Kerberos 5 support ### .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" @@ -85,7 +108,7 @@ CONFIGURE_ARGS+= --with-rlm_krb5 . if defined(KRB5_TYPE) && ${KRB5_TYPE} == "heimdal" CONFIGURE_ARGS+= --enable-heimdal-krb5 . endif -PLIST_SRC+= ${PKGDIR}/PLIST.kerberos +PLIST.kerberos= yes .else CONFIGURE_ARGS+= --without-rlm_krb5 .endif @@ -96,17 +119,17 @@ CONFIGURE_ARGS+= --without-rlm_krb5 .if !empty(PKG_OPTIONS:Mfreeradius-simul-use) . include "../../net/net-snmp/buildlink3.mk" .else -CONFIGURE_ENV+= ac_cv_path_SNMPGET="" -CONFIGURE_ENV+= ac_cv_path_SNMPWALK="" +CONFIGURE_ENV+= ac_cv_path_SNMPGET="" +CONFIGURE_ENV+= ac_cv_path_SNMPWALK="" .endif ### -### Use PAM for storing user details +### PAM support ### .if !empty(PKG_OPTIONS:Mpam) CONFIGURE_ARGS+= --with-rlm_pam -PLIST_SRC+= ${PKGDIR}/PLIST.pam MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC.pam +PLIST.pam= yes .else CONFIGURE_ARGS+= --without-rlm_pam .endif diff --git a/net/freeradius2/patches/patch-ac b/net/freeradius2/patches/patch-ac new file mode 100644 index 00000000000..149c5b4d123 --- /dev/null +++ b/net/freeradius2/patches/patch-ac @@ -0,0 +1,21 @@ +$NetBSD: patch-ac,v 1.1 2009/04/23 18:27:28 adam Exp $ + +--- scripts/raddebug.orig 2009-04-04 08:51:30.000000000 +0200 ++++ scripts/raddebug +@@ -41,14 +41,14 @@ do + case $OPTION in + c) condition="$OPTARG" + ;; +- d) [ "$extra" == "" ] || usage ++ d) [ "$extra" = "" ] || usage + extra="-d $OPTARG" + ;; + i) condition="(Packet-Src-IP-Address == $OPTARG)" + ;; + I) condition="(Packet-Src-IPv6-Address == $OPTARG)" + ;; +- f) [ "$extra" == "" ] || usage ++ f) [ "$extra" = "" ] || usage + extra="-f $OPTARG" + ;; + t) timeout="$OPTARG" diff --git a/net/freeradius2/patches/patch-ad b/net/freeradius2/patches/patch-ad new file mode 100644 index 00000000000..117273d06b4 --- /dev/null +++ b/net/freeradius2/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2009/04/23 18:27:28 adam Exp $ + +--- raddb/certs/bootstrap.orig 2009-04-04 08:53:44.000000000 +0200 ++++ raddb/certs/bootstrap +@@ -17,7 +17,7 @@ make all + # + # If that worked, exit. Otherwise, run the commands manually. + # +-if [ "$?" == "0" ] ++if [ "$?" = "0" ] + then + exit 0 + fi diff --git a/net/freeradius2/patches/patch-ai b/net/freeradius2/patches/patch-ai index e3265fd88b6..41df3e9f008 100644 --- a/net/freeradius2/patches/patch-ai +++ b/net/freeradius2/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.2 2008/10/12 13:57:27 adrianp Exp $ +$NetBSD: patch-ai,v 1.3 2009/04/23 18:26:05 adam Exp $ ---- configure.orig 2008-09-25 10:41:26.000000000 +0200 +--- configure.orig 2009-03-11 03:26:50.000000000 +0100 +++ configure @@ -20336,13 +20336,13 @@ fi done @@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.2 2008/10/12 13:57:27 adrianp Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24678,7 +24678,7 @@ gethostbyaddrrstyle="" +@@ -24684,7 +24684,7 @@ gethostbyaddrrstyle="" { echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5 echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6; } case "$host" in |