diff options
Diffstat (limited to 'net/freeradius')
-rw-r--r-- | net/freeradius/Makefile | 26 | ||||
-rw-r--r-- | net/freeradius/PLIST | 186 | ||||
-rw-r--r-- | net/freeradius/distinfo | 13 | ||||
-rw-r--r-- | net/freeradius/patches/patch-aa | 13 | ||||
-rw-r--r-- | net/freeradius/patches/patch-ab | 8 | ||||
-rw-r--r-- | net/freeradius/patches/patch-ai | 8 |
6 files changed, 123 insertions, 131 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 0d229db3e9c..813e389685a 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:24 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/21 23:08:08 adrianp Exp $ -DISTNAME= freeradius-1.1.0 -PKGREVISION= 1 +DISTNAME= freeradius-1.1.1 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ ftp://ftp.Awfulhak.org/pub/radius/ @@ -23,11 +22,8 @@ USE_OLD_DES_API= YES BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7 -# 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 +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE+= libtool CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} @@ -42,14 +38,18 @@ CONFIGURE_ARGS+= --without-rlm_pam CONFIGURE_ARGS+= --without-rlm_sql_iodbc CONFIGURE_ARGS+= --without-rlm_sql_oracle CONFIGURE_ARGS+= --without-rlm_sql_unixodbc +#CONFIGURE_ARGS+= --without-rlm_eap_peap +#CONFIGURE_ARGS+= --without-rlm_eap_sim +#CONFIGURE_ARGS+= --without-rlm_eap_tls +#CONFIGURE_ARGS+= --without-rlm_eap_ttls SUBST_CLASSES+= make SUBST_STAGE.make= post-patch SUBST_FILES.make= src/modules/rlm_mschap/Makefile \ src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in SUBST_SED.make= -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \ - -L../../../src/lib/.libs/ -lradius|g" \ - -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \ + -L../../../src/lib/.libs/ -lradius|g" +SUBST_SED.make+= -e "s|RLM_SQL_LIBS =|RLM_SQL_LIBS = \ -L${PREFIX}/lib|g" SUBST_MESSAGE.make= Fixing Makefiles. @@ -104,9 +104,6 @@ SUBST_SED.make+= -e "s|@ldap_ldflags@|@ldap_ldflags@ \ CFLAGS+= -fPIC .endif -pre-build: - cd ${WRKSRC} && ${LN} -s src/lib lib - post-build: @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC @@ -119,7 +116,6 @@ post-install: .endfor ${INSTALL_SCRIPT} ${WRKSRC}/src/modules/rlm_perl/example.pl ${EGDIR} @${MKDIR} ${PKG_SYSCONFDIR}/certs - @${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA - cd ${WRKSRC} && ${FIND} . -name .libs | ${XARGS} ${RM} -rf + @${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCAA .include "../../mk/bsd.pkg.mk" diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST index e41639298f5..28a5140bc58 100644 --- a/net/freeradius/PLIST +++ b/net/freeradius/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/02/05 15:34:08 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.14 2006/03/21 23:08:08 adrianp Exp $ bin/radclient bin/radeapclient bin/radlast @@ -218,91 +218,98 @@ sbin/checkrad sbin/radiusd sbin/radwatch sbin/rc.radiusd -share/doc/${PKGNAME}/Acct-Type -share/doc/${PKGNAME}/CYGWIN -share/doc/${PKGNAME}/ChangeLog -share/doc/${PKGNAME}/Post-Auth-Type -share/doc/${PKGNAME}/Session-Type -share/doc/${PKGNAME}/ldap_howto.txt -share/doc/${PKGNAME}/misc-nas -share/doc/${PKGNAME}/release-method.txt -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}/load-balance.txt -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_otp -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}/supervise-radiusd.txt -share/doc/${PKGNAME}/tuning_guide -share/doc/${PKGNAME}/variables.txt +share/doc/freeradius/Acct-Type +share/doc/freeradius/CYGWIN +share/doc/freeradius/ChangeLog +share/doc/freeradius/Post-Auth-Type +share/doc/freeradius/Session-Type +share/doc/freeradius/ldap_howto.txt +share/doc/freeradius/misc-nas +share/doc/freeradius/release-method.txt +share/doc/freeradius/Autz-Type +share/doc/freeradius/DIFFS +share/doc/freeradius/MACOSX +share/doc/freeradius/OS2 +share/doc/freeradius/RADIUS-SQL.schema +share/doc/freeradius/RADIUS-LDAP-eDirectory +share/doc/freeradius/README +share/doc/freeradius/Simultaneous-Use +share/doc/freeradius/aaa.txt +share/doc/freeradius/ascend +share/doc/freeradius/bay +share/doc/freeradius/bugs +share/doc/freeradius/cisco +share/doc/freeradius/coding-methods.txt +share/doc/freeradius/configurable_failover +share/doc/freeradius/duplicate-users +share/doc/freeradius/examples/iplanet.ldif +share/doc/freeradius/examples/iplanet.schema +share/doc/freeradius/examples/mssql.sql +share/doc/freeradius/examples/mysql.sql +share/doc/freeradius/examples/openldap.schema +share/doc/freeradius/examples/oracle.sql +share/doc/freeradius/examples/postgresql.sql +share/doc/freeradius/load-balance.txt +share/doc/freeradius/module_interface +share/doc/freeradius/mssql +share/doc/freeradius/performance-testing +share/doc/freeradius/processing_users_file +share/doc/freeradius/proxy +share/doc/freeradius/radrelay +share/doc/freeradius/rfc/attributes.html +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/rfc1157.txt +share/doc/freeradius/rfc/rfc1227.txt +share/doc/freeradius/rfc/rfc1448.txt +share/doc/freeradius/rfc/rfc1901.txt +share/doc/freeradius/rfc/rfc1905.txt +share/doc/freeradius/rfc/rfc2058.txt +share/doc/freeradius/rfc/rfc2059.txt +share/doc/freeradius/rfc/rfc2138.txt +share/doc/freeradius/rfc/rfc2139.txt +share/doc/freeradius/rfc/rfc2243.txt +share/doc/freeradius/rfc/rfc2289.txt +share/doc/freeradius/rfc/rfc2433.txt +share/doc/freeradius/rfc/rfc2548.txt +share/doc/freeradius/rfc/rfc2618.txt +share/doc/freeradius/rfc/rfc2619.txt +share/doc/freeradius/rfc/rfc2620.txt +share/doc/freeradius/rfc/rfc2621.txt +share/doc/freeradius/rfc/rfc2716.txt +share/doc/freeradius/rfc/rfc2759.txt +share/doc/freeradius/rfc/rfc2809.txt +share/doc/freeradius/rfc/rfc2865.txt +share/doc/freeradius/rfc/rfc2866.txt +share/doc/freeradius/rfc/rfc2867.txt +share/doc/freeradius/rfc/rfc2868.txt +share/doc/freeradius/rfc/rfc2869.txt +share/doc/freeradius/rfc/rfc2882.txt +share/doc/freeradius/rfc/rfc2924.txt +share/doc/freeradius/rfc/rfc3162.txt +share/doc/freeradius/rfc/rfc3575.txt +share/doc/freeradius/rfc/rfc3576.txt +share/doc/freeradius/rfc/rfc3579.txt +share/doc/freeradius/rfc/rfc3580.txt +share/doc/freeradius/rlm_attr_filter +share/doc/freeradius/rlm_dbm +share/doc/freeradius/rlm_digest +share/doc/freeradius/rlm_eap +share/doc/freeradius/rlm_fastusers +share/doc/freeradius/rlm_krb5 +share/doc/freeradius/rlm_ldap +share/doc/freeradius/rlm_otp +share/doc/freeradius/rlm_pam +share/doc/freeradius/rlm_passwd +share/doc/freeradius/rlm_python +share/doc/freeradius/rlm_sim_triplets +share/doc/freeradius/rlm_sql +share/doc/freeradius/rlm_sqlcounter +share/doc/freeradius/supervise-radiusd.txt +share/doc/freeradius/tuning_guide +share/doc/freeradius/variables.txt share/examples/freeradius/acct_users share/examples/freeradius/attrs share/examples/freeradius/certs/README @@ -388,6 +395,7 @@ share/freeradius/dictionary.freeradius.internal share/freeradius/dictionary.gandalf share/freeradius/dictionary.garderos share/freeradius/dictionary.gemtek +share/freeradius/dictionary.hp share/freeradius/dictionary.ipunplugged share/freeradius/dictionary.issanni share/freeradius/dictionary.itk @@ -404,6 +412,7 @@ share/freeradius/dictionary.navini share/freeradius/dictionary.netscreen share/freeradius/dictionary.nokia share/freeradius/dictionary.nomadix +share/freeradius/dictionary.nortel share/freeradius/dictionary.ntua share/freeradius/dictionary.packeteer share/freeradius/dictionary.propel @@ -440,7 +449,8 @@ share/freeradius/dictionary.zyxel @dirrm share/examples/freeradius/certs/demoCA @dirrm share/examples/freeradius/certs @dirrm share/examples/freeradius -@dirrm share/doc/${PKGNAME}/rfc -@dirrm share/doc/${PKGNAME} +@dirrm share/doc/freeradius/examples +@dirrm share/doc/freeradius/rfc +@dirrm share/doc/freeradius @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 af3c85c1eb0..ab4b826ca33 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.18 2006/02/05 15:34:08 adrianp Exp $ +$NetBSD: distinfo,v 1.19 2006/03/21 23:08:08 adrianp Exp $ -SHA1 (freeradius-1.1.0.tar.gz) = 060454b4350f08145dfe987483c571fe7aad0dd6 -RMD160 (freeradius-1.1.0.tar.gz) = 7b8972640fa71291a949e3abee07d10d8c4608d8 -Size (freeradius-1.1.0.tar.gz) = 2351660 bytes -SHA1 (patch-aa) = 5a5f791cb5d501a43948ddd94f8589f7cf000cb0 -SHA1 (patch-ab) = bf14479ad89bfa1e967aea923529da0a8a97f3cd +SHA1 (freeradius-1.1.1.tar.gz) = efc52b20fa88148b8ebf58fa0ae5c36df204b703 +RMD160 (freeradius-1.1.1.tar.gz) = f9947c299ec2a7d0189d0718edf10c8dc5783119 +Size (freeradius-1.1.1.tar.gz) = 2358196 bytes +SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773 -SHA1 (patch-ai) = bb4dafd3f6b961403caa955c9a09c271468ada36 +SHA1 (patch-ai) = 849010c6a1516d4073ab6c620df308b14a5e5140 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e diff --git a/net/freeradius/patches/patch-aa b/net/freeradius/patches/patch-aa deleted file mode 100644 index 691a9eae2bc..00000000000 --- a/net/freeradius/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2006/02/05 15:34:09 adrianp Exp $ - ---- src/modules/rlm_otp/otp_state.c.orig 2006-01-10 14:33:16.000000000 +0000 -+++ src/modules/rlm_otp/otp_state.c -@@ -35,7 +35,7 @@ - #include <fcntl.h> - #include <unistd.h> - #include <sys/socket.h> --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__NetBSD__) - #include <sys/un.h> - #endif - diff --git a/net/freeradius/patches/patch-ab b/net/freeradius/patches/patch-ab index 5bc9d5b6e1e..5fa98bc4b7a 100644 --- a/net/freeradius/patches/patch-ab +++ b/net/freeradius/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.4 2006/02/05 15:34:09 adrianp Exp $ +$NetBSD: patch-ab,v 1.5 2006/03/21 23:08:08 adrianp Exp $ ---- src/modules/rlm_perl/Makefile.in.orig 2003-03-18 19:08:40.000000000 +0000 +--- src/modules/rlm_perl/Makefile.in.orig 2006-02-10 19:47:17.000000000 +0000 +++ src/modules/rlm_perl/Makefile.in -@@ -13,4 +13,3 @@ $(STATIC_OBJS): $(HEADERS) - $(DYNAMIC_OBJS): $(HEADERS) +@@ -15,4 +15,3 @@ include ../rules.mak + $(LT_OBJS): $(HEADERS) install-scripts: - $(INSTALL) -m 755 example.pl $(R)$(raddbdir) diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai index e16b8712f5f..476fbda19ef 100644 --- a/net/freeradius/patches/patch-ai +++ b/net/freeradius/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2005/02/18 16:59:57 adrianp Exp $ +$NetBSD: patch-ai,v 1.5 2006/03/21 23:08:08 adrianp Exp $ ---- configure.orig 2005-02-18 15:41:34.000000000 +0000 +--- configure.orig 2006-02-06 12:55:53.000000000 +0000 +++ configure -@@ -6373,7 +6373,7 @@ else +@@ -6372,7 +6372,7 @@ else cat conftest.$ac_ext >&5 fi rm -f conftest* @@ -10,4 +10,4 @@ $NetBSD: patch-ai,v 1.4 2005/02/18 16:59:57 adrianp Exp $ +test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt semaphore; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF - #line 6380 "configure" + #line 6379 "configure" |