From c224bf5e8b8faae6b0cad990d12687302989224b Mon Sep 17 00:00:00 2001 From: adrianp Date: Thu, 23 Sep 2004 19:51:21 +0000 Subject: - Update freeradius to 1.0.1 - Fix builds on 1.6 and 2.0_BETA - ok'ed wiz@ - Addresses PR 26987 opened by Rui Paulo, thanks. - Fix startup script using the wrong options - Lots of changes including - Denial-of-Service Security Fix. - Make IPv6 support work better. - Many, many minor bug fixes and feature enhancements. - EAP-module feature improvements. --- net/freeradius/HEADER | 12 -- net/freeradius/Makefile | 84 +++++++--- net/freeradius/PLIST | 332 +++++++++++++++++++++++++++++++++++++--- net/freeradius/distinfo | 12 +- net/freeradius/files/radiusd.sh | 6 +- net/freeradius/patches/patch-ab | 13 -- net/freeradius/patches/patch-ae | 27 ++-- net/freeradius/patches/patch-af | 13 -- net/freeradius/patches/patch-ah | 18 +++ net/freeradius/patches/patch-ai | 13 ++ 10 files changed, 427 insertions(+), 103 deletions(-) delete mode 100644 net/freeradius/HEADER delete mode 100644 net/freeradius/patches/patch-ab delete mode 100644 net/freeradius/patches/patch-af create mode 100644 net/freeradius/patches/patch-ah create mode 100644 net/freeradius/patches/patch-ai (limited to 'net/freeradius') diff --git a/net/freeradius/HEADER b/net/freeradius/HEADER deleted file mode 100644 index 1385a103769..00000000000 --- a/net/freeradius/HEADER +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: HEADER,v 1.1 2003/07/30 14:50:07 jmmv Exp $ - -EGDIR="${PKG_PREFIX}/share/examples/freeradius" - -case ${STAGE} in -POST-INSTALL|DEINSTALL) - for fp in ${EGDIR}/*; do - f="`${BASENAME} $fp`" - CONF_FILES="${CONF_FILES} ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f" - done - ;; -esac diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index f5a4b339ef7..eb21a1b9c45 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2004/09/17 16:08:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/09/23 19:51:21 adrianp Exp $ -DISTNAME= freeradius-0.9.3 +DISTNAME= freeradius-1.0.1 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ ftp://ftp.Awfulhak.org/pub/radius/ @@ -9,39 +9,83 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.freeradius.org/ COMMENT= Free RADIUS server implementation -CONFLICTS+= radiusd-cistron* -USE_GNU_TOOLS+= make -GNU_CONFIGURE= yes -USE_BUILDLINK3= YES -USE_LIBTOOL= YES -USE_PKGINSTALL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -PTHREAD_OPTS+= native - -CONFIGURE_ARGS= --quiet -CONFIGURE_ARGS+= --with-logdir=/var/log +CONFLICTS+= radiusd-cistron* +USE_GNU_TOOLS+= make +GNU_CONFIGURE= YES +USE_BUILDLINK3= YES +USE_PKGINSTALL= YES +USE_PERL5= YES +PTHREAD_OPTS+= native +LIBTOOLIZE_PLIST= NO + +# This package currently breaks using our libtool. It does not appear to use +# libtool properly/fully and as a result the daemon does not compile correctly. +# +#USE_LIBTOOL= YES +#LIBTOOL_OVERRIDE= libtool + +CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc CONFIGURE_ARGS+= --disable-ltdl-install CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include -CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --without-rlm_ippool CONFIGURE_ARGS+= --without-rlm_smb +CONFIGURE_ARGS+= --without-rlm_krb5 +CONFIGURE_ARGS+= --without-rlm_ldap +CONFIGURE_ARGS+= --without-rlm_pam +CONFIGURE_ARGS+= --without-rlm_sql_iodbc +CONFIGURE_ARGS+= --without-rlm_sql_mysql +CONFIGURE_ARGS+= --without-rlm_sql_postgresql +CONFIGURE_ARGS+= --without-rlm_sql_oracle +CONFIGURE_ARGS+= --without-rlm_sql_unixodbc +CONFIGURE_ARGS+= --without-snmp RCD_SCRIPTS= radiusd -OWN_DIRS= /var/run/radiusd +OWN_DIRS= ${VARBASE}/run/radiusd PKG_SYSCONFSUBDIR= raddb EGDIR= ${PREFIX}/share/examples/freeradius -CONF_FILES= # Contents set in HEADER file + +EGFILES= acct_users attrs certs/demoCA/index.txt.old \ + certs/demoCA/cacert.pem certs/demoCA/index.txt \ + certs/demoCA/serial.old certs/demoCA/serial \ + certs/newcert.pem certs/README certs/dh \ + certs/cert-clt.der certs/cert-clt.p12 certs/cert-clt.pem \ + certs/cert-srv.der certs/cert-srv.p12 certs/cert-srv.pem \ + certs/newreq.pem certs/random certs/root.der certs/root.p12 \ + certs/root.pem clients clients.conf dictionary.in eap.conf \ + experimental.conf hints huntgroups ldap.attrmap mssql.conf \ + naslist naspasswd oraclesql.conf pgsql-voip.conf \ + postgresql.conf preproxy_users proxy.conf radiusd.conf.in \ + realms snmp.conf sql.conf users x99.conf x99passwd.sample \ + radiusd.conf dictionary + +.for f in ${EGFILES} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +.endfor +.undef f + +pre-build: + cd ${WRKSRC} && ${LN} -s src/lib lib post-install: ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC}/raddb && for f in [a-z]*; do \ - ${INSTALL_DATA} $$f ${EGDIR}/$$f; \ - done + ${INSTALL_DATA_DIR} ${EGDIR}/certs + ${INSTALL_DATA_DIR} ${EGDIR}/certs/demoCA + +. for f in ${EGFILES} + ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f} +. endfor +. undef f + + @${MKDIR} ${PKG_SYSCONFDIR}/certs + @${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA + cd ${WRKSRC} && ${FIND} . -name .libs | ${XARGS} ${RM} -rf +.include "../../security/openssl/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/libtool/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST index 059a8a51103..0d0d96fda9d 100644 --- a/net/freeradius/PLIST +++ b/net/freeradius/PLIST @@ -1,65 +1,193 @@ -@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:47 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/09/23 19:51:21 adrianp Exp $ bin/radclient +bin/radeapclient bin/radlast bin/radrelay bin/radtest -bin/raduse bin/radwho bin/radzap bin/rlm_dbm_cat bin/rlm_dbm_parser bin/smbencrypt +lib/libeap-${PKGVERSION}.la +lib/libeap-${PKGVERSION}.so +lib/libeap.a +lib/libeap.la +lib/libeap.so lib/libradius-${PKGVERSION}.la +lib/libradius-${PKGVERSION}.so +lib/libradius.a lib/libradius.la +lib/libradius.so lib/rlm_acct_unique-${PKGVERSION}.la +lib/rlm_acct_unique-${PKGVERSION}.so +lib/rlm_acct_unique.a lib/rlm_acct_unique.la +lib/rlm_acct_unique.so lib/rlm_always-${PKGVERSION}.la +lib/rlm_always-${PKGVERSION}.so +lib/rlm_always.a lib/rlm_always.la +lib/rlm_always.so lib/rlm_attr_filter-${PKGVERSION}.la +lib/rlm_attr_filter-${PKGVERSION}.so +lib/rlm_attr_filter.a lib/rlm_attr_filter.la +lib/rlm_attr_filter.so lib/rlm_attr_rewrite-${PKGVERSION}.la +lib/rlm_attr_rewrite-${PKGVERSION}.so +lib/rlm_attr_rewrite.a lib/rlm_attr_rewrite.la +lib/rlm_attr_rewrite.so lib/rlm_chap-${PKGVERSION}.la +lib/rlm_chap-${PKGVERSION}.so +lib/rlm_chap.a lib/rlm_chap.la +lib/rlm_chap.so +lib/rlm_checkval-${PKGVERSION}.la +lib/rlm_checkval-${PKGVERSION}.so +lib/rlm_checkval.a +lib/rlm_checkval.la +lib/rlm_checkval.so lib/rlm_counter-${PKGVERSION}.la +lib/rlm_counter-${PKGVERSION}.so +lib/rlm_counter.a lib/rlm_counter.la +lib/rlm_counter.so lib/rlm_dbm-${PKGVERSION}.la +lib/rlm_dbm-${PKGVERSION}.so +lib/rlm_dbm.a lib/rlm_dbm.la +lib/rlm_dbm.so lib/rlm_detail-${PKGVERSION}.la +lib/rlm_detail-${PKGVERSION}.so +lib/rlm_detail.a lib/rlm_detail.la +lib/rlm_detail.so +lib/rlm_digest-${PKGVERSION}.la +lib/rlm_digest-${PKGVERSION}.so +lib/rlm_digest.a +lib/rlm_digest.la +lib/rlm_digest.so lib/rlm_eap-${PKGVERSION}.la +lib/rlm_eap-${PKGVERSION}.so +lib/rlm_eap.a lib/rlm_eap.la lib/rlm_eap.so +lib/rlm_eap_gtc-${PKGVERSION}.la +lib/rlm_eap_gtc-${PKGVERSION}.so +lib/rlm_eap_gtc.a +lib/rlm_eap_gtc.la +lib/rlm_eap_gtc.so +lib/rlm_eap_leap-${PKGVERSION}.la +lib/rlm_eap_leap-${PKGVERSION}.so +lib/rlm_eap_leap.a +lib/rlm_eap_leap.la +lib/rlm_eap_leap.so lib/rlm_eap_md5-${PKGVERSION}.la +lib/rlm_eap_md5-${PKGVERSION}.so +lib/rlm_eap_md5.a lib/rlm_eap_md5.la +lib/rlm_eap_md5.so +lib/rlm_eap_mschapv2-${PKGVERSION}.la +lib/rlm_eap_mschapv2-${PKGVERSION}.so +lib/rlm_eap_mschapv2.a +lib/rlm_eap_mschapv2.la +lib/rlm_eap_mschapv2.so +lib/rlm_eap_peap-${PKGVERSION}.la +lib/rlm_eap_peap-${PKGVERSION}.so +lib/rlm_eap_peap.a +lib/rlm_eap_peap.la +lib/rlm_eap_peap.so +lib/rlm_eap_sim-${PKGVERSION}.la +lib/rlm_eap_sim-${PKGVERSION}.so +lib/rlm_eap_sim.a +lib/rlm_eap_sim.la +lib/rlm_eap_sim.so lib/rlm_eap_tls-${PKGVERSION}.la +lib/rlm_eap_tls-${PKGVERSION}.so +lib/rlm_eap_tls.a lib/rlm_eap_tls.la +lib/rlm_eap_tls.so +lib/rlm_eap_ttls-${PKGVERSION}.la +lib/rlm_eap_ttls-${PKGVERSION}.so +lib/rlm_eap_ttls.a +lib/rlm_eap_ttls.la +lib/rlm_eap_ttls.so +lib/rlm_exec-${PKGVERSION}.la +lib/rlm_exec-${PKGVERSION}.so +lib/rlm_exec.a +lib/rlm_exec.la +lib/rlm_exec.so +lib/rlm_expr-${PKGVERSION}.la +lib/rlm_expr-${PKGVERSION}.so +lib/rlm_expr.a +lib/rlm_expr.la +lib/rlm_expr.so lib/rlm_fastusers-${PKGVERSION}.la +lib/rlm_fastusers-${PKGVERSION}.so +lib/rlm_fastusers.a lib/rlm_fastusers.la +lib/rlm_fastusers.so lib/rlm_files-${PKGVERSION}.la +lib/rlm_files-${PKGVERSION}.so +lib/rlm_files.a lib/rlm_files.la +lib/rlm_files.so lib/rlm_mschap-${PKGVERSION}.la +lib/rlm_mschap-${PKGVERSION}.so +lib/rlm_mschap.a lib/rlm_mschap.la +lib/rlm_mschap.so lib/rlm_ns_mta_md5-${PKGVERSION}.la +lib/rlm_ns_mta_md5-${PKGVERSION}.so +lib/rlm_ns_mta_md5.a lib/rlm_ns_mta_md5.la +lib/rlm_ns_mta_md5.so lib/rlm_pap-${PKGVERSION}.la +lib/rlm_pap-${PKGVERSION}.so +lib/rlm_pap.a lib/rlm_pap.la +lib/rlm_pap.so +lib/rlm_passwd-${PKGVERSION}.la +lib/rlm_passwd-${PKGVERSION}.so +lib/rlm_passwd.a +lib/rlm_passwd.la +lib/rlm_passwd.so lib/rlm_preprocess-${PKGVERSION}.la +lib/rlm_preprocess-${PKGVERSION}.so +lib/rlm_preprocess.a lib/rlm_preprocess.la +lib/rlm_preprocess.so lib/rlm_radutmp-${PKGVERSION}.la +lib/rlm_radutmp-${PKGVERSION}.so +lib/rlm_radutmp.a lib/rlm_radutmp.la +lib/rlm_radutmp.so lib/rlm_realm-${PKGVERSION}.la +lib/rlm_realm-${PKGVERSION}.so +lib/rlm_realm.a lib/rlm_realm.la +lib/rlm_realm.so lib/rlm_sql-${PKGVERSION}.la +lib/rlm_sql-${PKGVERSION}.so +lib/rlm_sql.a lib/rlm_sql.la +lib/rlm_sql.so lib/rlm_unix-${PKGVERSION}.la +lib/rlm_unix-${PKGVERSION}.so +lib/rlm_unix.a lib/rlm_unix.la +lib/rlm_unix.so lib/rlm_x99_token-${PKGVERSION}.la +lib/rlm_x99_token-${PKGVERSION}.so +lib/rlm_x99_token.a lib/rlm_x99_token.la +lib/rlm_x99_token.so man/man1/radclient.1 +man/man1/radeapclient.1 man/man1/radlast.1 man/man1/radtest.1 -man/man1/raduse.1 man/man1/radwho.1 man/man1/radzap.1 man/man5/acct_users.5 @@ -67,8 +195,22 @@ man/man5/clients.5 man/man5/dictionary.5 man/man5/naslist.5 man/man5/radiusd.conf.5 +man/man5/rlm_acct_unique.5 +man/man5/rlm_always.5 +man/man5/rlm_attr_filter.5 +man/man5/rlm_attr_rewrite.5 +man/man5/rlm_chap.5 +man/man5/rlm_counter.5 +man/man5/rlm_detail.5 +man/man5/rlm_expr.5 +man/man5/rlm_files.5 +man/man5/rlm_mschap.5 +man/man5/rlm_pap.5 +man/man5/rlm_passwd.5 +man/man5/rlm_realm.5 +man/man5/rlm_sql.5 +man/man5/rlm_unix.5 man/man5/users.5 -man/man8/builddbm.8 man/man8/radiusd.8 man/man8/radrelay.8 man/man8/radwatch.8 @@ -77,32 +219,108 @@ sbin/checkrad sbin/radiusd sbin/radwatch sbin/rc.radiusd +share/doc/${PKGNAME}/Autz-Type +share/doc/${PKGNAME}/DIFFS +share/doc/${PKGNAME}/MACOSX +share/doc/${PKGNAME}/OS2 +share/doc/${PKGNAME}/RADIUS-LDAP.schema +share/doc/${PKGNAME}/RADIUS-LDAPv3.schema +share/doc/${PKGNAME}/RADIUS-SQL.schema +share/doc/${PKGNAME}/README +share/doc/${PKGNAME}/Simultaneous-Use +share/doc/${PKGNAME}/aaa.txt +share/doc/${PKGNAME}/ascend +share/doc/${PKGNAME}/bay +share/doc/${PKGNAME}/bugs +share/doc/${PKGNAME}/cisco +share/doc/${PKGNAME}/coding-methods.txt +share/doc/${PKGNAME}/configurable_failover +share/doc/${PKGNAME}/duplicate-users +share/doc/${PKGNAME}/module_interface +share/doc/${PKGNAME}/performance-testing +share/doc/${PKGNAME}/processing_users_file +share/doc/${PKGNAME}/proxy +share/doc/${PKGNAME}/radrelay +share/doc/${PKGNAME}/rfc/attributes.html +share/doc/${PKGNAME}/rfc/draft-kamath-pppext-eap-mschapv2-00.txt +share/doc/${PKGNAME}/rfc/draft-sterman-aaa-sip-00.txt +share/doc/${PKGNAME}/rfc/leap.txt +share/doc/${PKGNAME}/rfc/pppext-eap-sim-12.txt +share/doc/${PKGNAME}/rfc/rfc1157.txt +share/doc/${PKGNAME}/rfc/rfc1227.txt +share/doc/${PKGNAME}/rfc/rfc1448.txt +share/doc/${PKGNAME}/rfc/rfc1901.txt +share/doc/${PKGNAME}/rfc/rfc1905.txt +share/doc/${PKGNAME}/rfc/rfc2058.txt +share/doc/${PKGNAME}/rfc/rfc2059.txt +share/doc/${PKGNAME}/rfc/rfc2138.txt +share/doc/${PKGNAME}/rfc/rfc2139.txt +share/doc/${PKGNAME}/rfc/rfc2243.txt +share/doc/${PKGNAME}/rfc/rfc2289.txt +share/doc/${PKGNAME}/rfc/rfc2433.txt +share/doc/${PKGNAME}/rfc/rfc2548.txt +share/doc/${PKGNAME}/rfc/rfc2618.txt +share/doc/${PKGNAME}/rfc/rfc2619.txt +share/doc/${PKGNAME}/rfc/rfc2620.txt +share/doc/${PKGNAME}/rfc/rfc2621.txt +share/doc/${PKGNAME}/rfc/rfc2716.txt +share/doc/${PKGNAME}/rfc/rfc2759.txt +share/doc/${PKGNAME}/rfc/rfc2809.txt +share/doc/${PKGNAME}/rfc/rfc2865.txt +share/doc/${PKGNAME}/rfc/rfc2866.txt +share/doc/${PKGNAME}/rfc/rfc2867.txt +share/doc/${PKGNAME}/rfc/rfc2868.txt +share/doc/${PKGNAME}/rfc/rfc2869.txt +share/doc/${PKGNAME}/rfc/rfc2882.txt +share/doc/${PKGNAME}/rfc/rfc2924.txt +share/doc/${PKGNAME}/rfc/rfc3162.txt +share/doc/${PKGNAME}/rfc/rfc3575.txt +share/doc/${PKGNAME}/rfc/rfc3576.txt +share/doc/${PKGNAME}/rfc/rfc3579.txt +share/doc/${PKGNAME}/rfc/rfc3580.txt +share/doc/${PKGNAME}/rlm_attr_filter +share/doc/${PKGNAME}/rlm_dbm +share/doc/${PKGNAME}/rlm_digest +share/doc/${PKGNAME}/rlm_eap +share/doc/${PKGNAME}/rlm_fastusers +share/doc/${PKGNAME}/rlm_krb5 +share/doc/${PKGNAME}/rlm_ldap +share/doc/${PKGNAME}/rlm_pam +share/doc/${PKGNAME}/rlm_passwd +share/doc/${PKGNAME}/rlm_python +share/doc/${PKGNAME}/rlm_sim_triplets +share/doc/${PKGNAME}/rlm_sql +share/doc/${PKGNAME}/rlm_sqlcounter +share/doc/${PKGNAME}/rlm_x99_token +share/doc/${PKGNAME}/supervise-radiusd.txt +share/doc/${PKGNAME}/tuning_guide +share/doc/${PKGNAME}/variables.txt share/examples/freeradius/acct_users share/examples/freeradius/attrs +share/examples/freeradius/certs/README +share/examples/freeradius/certs/cert-clt.der +share/examples/freeradius/certs/cert-clt.p12 +share/examples/freeradius/certs/cert-clt.pem +share/examples/freeradius/certs/cert-srv.der +share/examples/freeradius/certs/cert-srv.p12 +share/examples/freeradius/certs/cert-srv.pem +share/examples/freeradius/certs/demoCA/cacert.pem +share/examples/freeradius/certs/demoCA/index.txt +share/examples/freeradius/certs/demoCA/index.txt.old +share/examples/freeradius/certs/demoCA/serial +share/examples/freeradius/certs/demoCA/serial.old +share/examples/freeradius/certs/dh +share/examples/freeradius/certs/newcert.pem +share/examples/freeradius/certs/newreq.pem +share/examples/freeradius/certs/random +share/examples/freeradius/certs/root.der +share/examples/freeradius/certs/root.p12 +share/examples/freeradius/certs/root.pem share/examples/freeradius/clients share/examples/freeradius/clients.conf share/examples/freeradius/dictionary -share/examples/freeradius/dictionary.acc -share/examples/freeradius/dictionary.alcatel -share/examples/freeradius/dictionary.aptis -share/examples/freeradius/dictionary.ascend -share/examples/freeradius/dictionary.bay -share/examples/freeradius/dictionary.cisco -share/examples/freeradius/dictionary.columbia_university -share/examples/freeradius/dictionary.compat -share/examples/freeradius/dictionary.erx -share/examples/freeradius/dictionary.foundry -share/examples/freeradius/dictionary.freeradius -share/examples/freeradius/dictionary.livingston -share/examples/freeradius/dictionary.microsoft -share/examples/freeradius/dictionary.nomadix -share/examples/freeradius/dictionary.quintum -share/examples/freeradius/dictionary.redback -share/examples/freeradius/dictionary.shasta -share/examples/freeradius/dictionary.shiva -share/examples/freeradius/dictionary.tunnel -share/examples/freeradius/dictionary.usr -share/examples/freeradius/dictionary.versanet +share/examples/freeradius/dictionary.in +share/examples/freeradius/eap.conf share/examples/freeradius/experimental.conf share/examples/freeradius/hints share/examples/freeradius/huntgroups @@ -110,7 +328,10 @@ share/examples/freeradius/ldap.attrmap share/examples/freeradius/mssql.conf share/examples/freeradius/naslist share/examples/freeradius/naspasswd +share/examples/freeradius/oraclesql.conf +share/examples/freeradius/pgsql-voip.conf share/examples/freeradius/postgresql.conf +share/examples/freeradius/preproxy_users share/examples/freeradius/proxy.conf share/examples/freeradius/radiusd.conf share/examples/freeradius/radiusd.conf.in @@ -120,4 +341,65 @@ share/examples/freeradius/sql.conf share/examples/freeradius/users share/examples/freeradius/x99.conf share/examples/freeradius/x99passwd.sample +share/freeradius/dictionary +share/freeradius/dictionary.3com +share/freeradius/dictionary.3gpp +share/freeradius/dictionary.3gpp2 +share/freeradius/dictionary.acc +share/freeradius/dictionary.alcatel +share/freeradius/dictionary.alteon +share/freeradius/dictionary.altiga +share/freeradius/dictionary.aptis +share/freeradius/dictionary.ascend +share/freeradius/dictionary.bay +share/freeradius/dictionary.bintec +share/freeradius/dictionary.bristol +share/freeradius/dictionary.cabletron +share/freeradius/dictionary.cisco +share/freeradius/dictionary.cisco.bbsm +share/freeradius/dictionary.cisco.vpn3000 +share/freeradius/dictionary.cisco.vpn5000 +share/freeradius/dictionary.colubris +share/freeradius/dictionary.columbia_university +share/freeradius/dictionary.compat +share/freeradius/dictionary.erx +share/freeradius/dictionary.extreme +share/freeradius/dictionary.foundry +share/freeradius/dictionary.freeradius +share/freeradius/dictionary.gandalf +share/freeradius/dictionary.itk +share/freeradius/dictionary.juniper +share/freeradius/dictionary.karlnet +share/freeradius/dictionary.livingston +share/freeradius/dictionary.merit +share/freeradius/dictionary.microsoft +share/freeradius/dictionary.mikrotik +share/freeradius/dictionary.navini +share/freeradius/dictionary.netscreen +share/freeradius/dictionary.nokia +share/freeradius/dictionary.nomadix +share/freeradius/dictionary.propel +share/freeradius/dictionary.quintum +share/freeradius/dictionary.redback +share/freeradius/dictionary.redcreek +share/freeradius/dictionary.shasta +share/freeradius/dictionary.shiva +share/freeradius/dictionary.sonicwall +share/freeradius/dictionary.springtide +share/freeradius/dictionary.telebit +share/freeradius/dictionary.trapeze +share/freeradius/dictionary.tunnel +share/freeradius/dictionary.unix +share/freeradius/dictionary.usr +share/freeradius/dictionary.valemount +share/freeradius/dictionary.versanet +share/freeradius/dictionary.wispr +share/freeradius/dictionary.xedia +@dirrm share/freeradius +@dirrm share/examples/freeradius/certs/demoCA +@dirrm share/examples/freeradius/certs @dirrm share/examples/freeradius +@dirrm share/doc/${PKGNAME}/rfc +@dirrm share/doc/${PKGNAME} +@unexec ${RMDIR} %D/etc/raddb/certs/demoCA 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/etc/raddb/certs 2>/dev/null || ${TRUE} diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo index 58bd04ca457..a5aef54d26a 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2004/08/27 07:29:24 jlam Exp $ +$NetBSD: distinfo,v 1.7 2004/09/23 19:51:22 adrianp Exp $ -SHA1 (freeradius-0.9.3.tar.gz) = 794a332a9abe1ec6e1d3d6ccdcc35f926680b33d -Size (freeradius-0.9.3.tar.gz) = 1819922 bytes -SHA1 (patch-ab) = 26092b974a27151d69ab87ae7ba42e67aeef448b -SHA1 (patch-ae) = e01ea7624ba9b789f88cb08dc0055ef0809f6acc -SHA1 (patch-af) = 3ef13ce1159e33bcb886dcac732807107eb45ed1 +SHA1 (freeradius-1.0.1.tar.gz) = 54de3bf96a2eb7992408573002d458edba1b47b5 +Size (freeradius-1.0.1.tar.gz) = 2237745 bytes +SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773 +SHA1 (patch-ah) = 49a5afd67ffea3bf871f57a3d8c2888baf765558 +SHA1 (patch-ai) = 4671a9cca166436f1563f322fc3d232780cfa0e3 diff --git a/net/freeradius/files/radiusd.sh b/net/freeradius/files/radiusd.sh index 1ea5fc7649d..c434a21396d 100644 --- a/net/freeradius/files/radiusd.sh +++ b/net/freeradius/files/radiusd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: radiusd.sh,v 1.1 2003/07/30 14:50:10 jmmv Exp $ +# $NetBSD: radiusd.sh,v 1.2 2004/09/23 19:51:22 adrianp Exp $ # # PROVIDE: radiusd # REQUIRE: network @@ -13,7 +13,7 @@ fi name="radiusd" command="@PREFIX@/sbin/radiusd" -pidfile="/var/run/radiusd/radiusd.pid" +pidfile="@VARBASE@/run/radiusd/radiusd.pid" if [ -f /etc/rc.subr ] then @@ -23,5 +23,5 @@ then run_rc_command "$1" else echo -n ' ${name}' - exec ${command} ${smbd_flags} ${command_args} + exec ${command} ${radiusd_flags} ${command_args} fi diff --git a/net/freeradius/patches/patch-ab b/net/freeradius/patches/patch-ab deleted file mode 100644 index 1b7ca3a2a91..00000000000 --- a/net/freeradius/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2003/02/27 11:30:00 darcy Exp $ - ---- src/modules/rlm_dbm/Makefile.in.orig 2003-02-26 03:34:42.000000000 +0100 -+++ src/modules/rlm_dbm/Makefile.in 2003-02-26 03:34:49.000000000 +0100 -@@ -3,7 +3,7 @@ - HEADERS = - RLM_UTILS = @dbm_utils@ - RLM_CFLAGS = @dbm_cflags@ --RLM_LIBS = @dbm_ldflags@ -+RLM_LIBS = @dbm_ldflags@ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib - RLM_INSTALL = @dbm_install@ - - include ../rules.mak diff --git a/net/freeradius/patches/patch-ae b/net/freeradius/patches/patch-ae index 5f4844f5819..3cb277c9c99 100644 --- a/net/freeradius/patches/patch-ae +++ b/net/freeradius/patches/patch-ae @@ -1,18 +1,23 @@ -$NetBSD: patch-ae,v 1.2 2004/01/30 21:44:39 david Exp $ +$NetBSD: patch-ae,v 1.3 2004/09/23 19:51:22 adrianp Exp $ ---- Makefile.orig Fri Jun 27 11:04:15 2003 -+++ Makefile Fri Jan 30 16:10:14 2004 -@@ -26,11 +26,12 @@ +--- Makefile.orig 2004-06-09 18:31:11.000000000 +0100 ++++ Makefile 2004-09-14 20:50:36.000000000 +0100 +@@ -11,7 +11,7 @@ + + .PHONY: all clean install + +-SUBDIRS = ${LIBLTDLPATH} src raddb scripts doc ++SUBDIRS = ${LIBLTDLPATH} src scripts doc + WHAT_TO_MAKE = all + + all: +@@ -38,9 +38,7 @@ + install: + $(INSTALL) -d -m 755 $(R)$(sbindir) $(INSTALL) -d -m 755 $(R)$(bindir) - $(INSTALL) -d -m 755 $(R)$(raddbdir) +- $(INSTALL) -d -m 755 $(R)$(raddbdir) $(INSTALL) -d -m 755 $(R)$(mandir) - $(INSTALL) -d -m 755 $(R)$(RUNDIR) $(INSTALL) -d -m 700 $(R)$(logdir) $(INSTALL) -d -m 700 $(R)$(radacctdir) $(INSTALL) -d -m 700 $(R)$(datadir) - $(INSTALL) -d -m 755 $(R)$(dictdir) -+ -+install-etc: - @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common - for i in 1 5 8; do \ - $(INSTALL) -d -m 755 $(R)$(mandir)/man$$i; \ diff --git a/net/freeradius/patches/patch-af b/net/freeradius/patches/patch-af deleted file mode 100644 index bae2b17188f..00000000000 --- a/net/freeradius/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/08/27 07:29:24 jlam Exp $ - ---- src/lib/Makefile.orig Tue Jun 24 10:22:19 2003 -+++ src/lib/Makefile Fri Aug 27 03:27:01 2004 -@@ -33,7 +33,7 @@ - - - $(TARGET).a: $(STATIC_OBJS) -- $(LIBTOOL) --mode=link $(LD) \ -+ $(LIBTOOL) --mode=link $(CC) \ - -module -static $(CFLAGS) $^ -o $@ - - diff --git a/net/freeradius/patches/patch-ah b/net/freeradius/patches/patch-ah new file mode 100644 index 00000000000..4d4cf1dcdee --- /dev/null +++ b/net/freeradius/patches/patch-ah @@ -0,0 +1,18 @@ +$NetBSD: patch-ah,v 1.1 2004/09/23 19:51:22 adrianp Exp $ + +--- src/modules/rlm_x99_token/x99.h.orig 2004-09-23 10:44:09.000000000 +0100 ++++ src/modules/rlm_x99_token/x99.h 2004-09-23 10:44:30.000000000 +0100 +@@ -23,7 +23,12 @@ + #define X99_H + + #include +-#include /* des_cblock */ ++#include ++#if OPENSSL_VERSION_NUMBER < 0x0090700fL ++#include /* des_cblock */ ++#else ++#include /* des_cblock */ ++#endif + #include /* time_t */ + + /* diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai new file mode 100644 index 00000000000..6c78c9f7e9c --- /dev/null +++ b/net/freeradius/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2004/09/23 19:51:22 adrianp Exp $ + +--- src/modules/rlm_counter/Makefile.in.orig 2004-09-23 19:27:35.000000000 +0100 ++++ src/modules/rlm_counter/Makefile.in 2004-09-23 19:29:22.000000000 +0100 +@@ -2,7 +2,7 @@ + SRCS = rlm_counter.c + HEADERS = + RLM_CFLAGS = @counter_cflags@ +-RLM_LIBS = @counter_ldflags@ ++RLM_LIBS = @counter_ldflags@ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib + RLM_INSTALL = + + include ../rules.mak -- cgit v1.2.3