Index: head/net/gnu-radius/Makefile =================================================================== --- head/net/gnu-radius/Makefile (revision 411355) +++ head/net/gnu-radius/Makefile (revision 411356) @@ -1,122 +1,73 @@ # Created by: lance@evitel.net # $FreeBSD$ PORTNAME= gnu-radius PORTVERSION= 1.6.1 PORTREVISION= 6 CATEGORIES= net MASTER_SITES= GNU/radius DISTNAME= radius-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GNU RADIUS server +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl CONFLICTS= freeradius-0.* openradius-0.* radiusd-cistron-1.* GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= cpe gmake libtool USE_RC_SUBR= radiusd USE_SUBMAKE= yes USE_LDCONFIG= yes CPE_PRODUCT= radius CPE_VENDOR= gnu PLIST_SUB= PORTVERSION=${PORTVERSION} DATADIR= ${PREFIX}/share/radius INFO= radius SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR="${.CURDIR}" \ MKDIR="${MKDIR}" CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \ --with-lib-path="${LOCALBASE}/lib/" -OPTIONS_DEFINE= CLIENT EXAMPLES DBM MYSQL PGSQL SNMP EMACS PAM +OPTIONS_DEFINE= CLIENT MYSQL PGSQL EXAMPLES DBM SNMP EMACS PAM NLS OPTIONS_DEFAULT=MYSQL +OPTIONS_SUB= yes CLIENT_DESC= Build client EMACS_DESC= Install Emacs dotfiles -EXAMPLE_FILES= README ascend.rw c3620.rw cisco.rw comos.rw config.syntax \ - filter.rw hints-0.96 jetstream.rw nt.rw pam.conf radius.php +SNMP_CONFIGURE_ENABLE= snmp +CLIENT_CONFIGURE_ENABLE= client +CLIENT_LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile +CLIENT_CONFIGURE_OFF= --without-guile +MYSQL_USE= mysql=yes +MYSQL_CONFIGURE_WITH= mysql +PGSQL_USES= pgsql +PGSQL_CONFIGURE_WITH= postgres +DBM_CONFIGURE_ENABLE= dbm=ndbm +EMACS_USE= emacs=yes +EMACS_CONFIGURE_WITH= lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls +PAM_CONFIGURE_ENABLE= pam -.include - -.if ${PORT_OPTIONS:MSNMP} -CONFIGURE_ARGS+=--enable-snmp -.endif - -.if ${PORT_OPTIONS:MCLIENT} -LIB_DEPENDS+= libguile.so:${PORTSDIR}/lang/guile -CONFIGURE_ARGS+=--enable-client -PLIST_SUB+= CLIENT="" -.else -CONFIGURE_ARGS+=--without-guile -PLIST_SUB+= CLIENT="@comment " -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+=--with-mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+=--with-postgres -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} -PLIST_SUB+= MODULES="" -.else -PLIST_SUB+= MODULES="@comment " -.endif - -.if ${PORT_OPTIONS:MDBM} -CONFIGURE_ARGS+=--enable-dbm=ndbm -.endif - -.if ${PORT_OPTIONS:MEMACS} -.include "${PORTSDIR}/Mk/bsd.emacs.mk" -USE_EMACS= yes -CONFIGURE_ARGS+=--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} -PLIST_SUB+= EMACS="" -.else -CONFIGURE_ARGS+=--without-lispdir -PLIST_SUB+= EMACS="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+=--enable-pam -.endif - post-patch: ${REINPLACE_CMD} -e 's|extern unsigned scheme_gc_interval;||g' \ ${WRKSRC}/include/radiusd.h ${REINPLACE_CMD} -e 's|int getline|ssize_t getline|' \ - ${WRKSRC}/radtest/input.l ${WRKSRC}/radtest/input.c + ${WRKSRC}/radtest/input.l ${WRKSRC}/radtest/input.c post-install: -.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -. for ex_file in ${EXAMPLE_FILES} - ${INSTALL_DATA} ${WRKSRC}/examples/${ex_file} ${STAGEDIR}${EXAMPLESDIR} -. endfor -.endif + ( cd ${WRKSRC}/examples && ${COPYTREE_SHARE} .\ + ${STAGEDIR}${EXAMPLESDIR}\ + "! ( -name Makefile -o -name Makefile\.* ) " ) .include Index: head/net/gnu-radius/files/patch-dbm =================================================================== --- head/net/gnu-radius/files/patch-dbm (revision 411355) +++ head/net/gnu-radius/files/patch-dbm (nonexistent) @@ -1,11 +0,0 @@ ---- radiusd/builddbm.c.orig 2008-12-08 14:22:12.000000000 +0100 -+++ radiusd/builddbm.c 2008-12-08 14:22:37.000000000 +0100 -@@ -58,7 +58,7 @@ - - if (2 + check_len + reply_len > closure->pair_buffer_size) { - grad_log(GRAD_LOG_ERR, "%s:%d: %s", -- closure->filename, sym->lineno, -+ closure->filename, sym->loc.line, - _("too many attributes")); - return -1; - } Property changes on: head/net/gnu-radius/files/patch-dbm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/gnu-radius/files/patch-configure =================================================================== --- head/net/gnu-radius/files/patch-configure (revision 411355) +++ head/net/gnu-radius/files/patch-configure (revision 411356) @@ -1,20 +1,20 @@ ---- configure.orig Sat Nov 20 21:39:50 2004 -+++ configure Wed Jul 27 23:13:31 2005 -@@ -22804,7 +22804,7 @@ +--- configure.orig 2008-12-17 11:09:36 UTC ++++ configure +@@ -36624,7 +36624,7 @@ if test "${ra_cv_lib_mysqlclient+set}" = echo $ECHO_N "(cached) $ECHO_C" >&6 else - for path in /usr/local/lib/mysql /usr/lib/mysql + for path in ${PREFIX}/lib/mysql /usr/local/lib/mysql /usr/lib/mysql do LIBS="$save_LIBS -lm -L$path -lmysqlclient" cat >conftest.$ac_ext <<_ACEOF -@@ -22925,7 +22925,7 @@ +@@ -36742,7 +36742,7 @@ if test "${ra_cv_lib_pq+set}" = set; the echo $ECHO_N "(cached) $ECHO_C" >&6 else - for path in /usr/local/pgsql/lib /usr/pgsql/lib + for path in ${PREFIX}/lib /usr/local/lib /usr/lib do LIBS="$save_LIBS -L$path -lpq" cat >conftest.$ac_ext <<_ACEOF Index: head/net/gnu-radius/files/patch-include-radius_radutmp.h =================================================================== --- head/net/gnu-radius/files/patch-include-radius_radutmp.h (revision 411355) +++ head/net/gnu-radius/files/patch-include-radius_radutmp.h (revision 411356) @@ -1,11 +1,11 @@ ---- include/radius/radutmp.h.orig 2009-05-07 22:24:02.000000000 +0200 -+++ include/radius/radutmp.h 2009-05-07 22:24:45.000000000 +0200 +--- include/radius/radutmp.h.orig 2008-12-15 08:03:24 UTC ++++ include/radius/radutmp.h @@ -30,7 +30,7 @@ #define P_ACCT_ENABLED 131 #define RUT_NAMESIZE 32 -#define RUT_IDSIZE 16 +#define RUT_IDSIZE 32 #define RUT_PNSIZE 24 /* Phone number size */ struct radutmp { Index: head/net/gnu-radius/files/patch-raddb_Makefile.in =================================================================== --- head/net/gnu-radius/files/patch-raddb_Makefile.in (revision 411355) +++ head/net/gnu-radius/files/patch-raddb_Makefile.in (revision 411356) @@ -1,15 +1,15 @@ ---- raddb/Makefile.in.orig Wed Jul 27 21:46:31 2005 -+++ raddb/Makefile.in Wed Jul 27 21:52:38 2005 -@@ -556,10 +556,10 @@ +--- raddb/Makefile.in.orig 2008-12-17 11:09:50 UTC ++++ raddb/Makefile.in +@@ -893,10 +893,10 @@ install-data-local: echo '================================================================='; \ else \ for file in $(raddb_files_644); do \ - ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \ + ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}.sample; \ done; \ for file in $(raddb_files_600); do \ - ${INSTALL} -m 600 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \ + ${INSTALL} -m 600 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$${file}.sample; \ done; \ for file in $(dictionaries); do \ ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \ Index: head/net/gnu-radius/files/patch-radiusd_builddbm.c =================================================================== --- head/net/gnu-radius/files/patch-radiusd_builddbm.c (nonexistent) +++ head/net/gnu-radius/files/patch-radiusd_builddbm.c (revision 411356) @@ -0,0 +1,11 @@ +--- radiusd/builddbm.c.orig 2008-12-15 08:03:24 UTC ++++ radiusd/builddbm.c +@@ -58,7 +58,7 @@ append_symbol(DBM_closure *closure, User + + if (2 + check_len + reply_len > closure->pair_buffer_size) { + grad_log(GRAD_LOG_ERR, "%s:%d: %s", +- closure->filename, sym->lineno, ++ closure->filename, sym->loc.line, + _("too many attributes")); + return -1; + } Property changes on: head/net/gnu-radius/files/patch-radiusd_builddbm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/gnu-radius/files/patch-radwho_radwho.c =================================================================== --- head/net/gnu-radius/files/patch-radwho_radwho.c (revision 411355) +++ head/net/gnu-radius/files/patch-radwho_radwho.c (revision 411356) @@ -1,43 +1,43 @@ ---- radwho/radwho.c.orig 2010-01-21 22:29:51.000000000 +0100 -+++ radwho/radwho.c 2010-01-21 22:37:37.000000000 +0100 -@@ -41,7 +41,8 @@ +--- radwho/radwho.c.orig 2008-12-15 08:03:24 UTC ++++ radwho/radwho.c +@@ -41,7 +41,8 @@ void print_header(); int want_rad_record(struct radutmp *rt); /* UTMP stuff. Uses utmpx on svr4 */ -#if defined(__svr4__) || defined(__sgi) +#include +#if defined(__svr4__) || defined(__sgi) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007) # include # include # define utmp utmpx -@@ -49,7 +50,9 @@ +@@ -49,7 +50,9 @@ int want_rad_record(struct radutmp *rt); # define UT_LINESIZE 32 # define UT_HOSTSIZE 257 # undef UTMP_FILE +/* # define UTMP_FILE UTMPX_FILE +*/ # undef WTMP_FILE # define WTMP_FILE WTMPX_FILE #else -@@ -60,13 +63,19 @@ +@@ -60,13 +63,19 @@ int want_rad_record(struct radutmp *rt); # define UT_LINESIZE 32 # define UT_HOSTSIZE 64 #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) +#if (defined(__FreeBSD__) && __FreeBSD_version < 900007) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # ifndef UTMP_FILE # define UTMP_FILE "/var/run/utmp" # endif # define ut_user ut_name #endif +#if defined(__FreeBSD__) && __FreeBSD_version >= 900007 +# define UTMP_FILE "/var/run/utmp" +# define ut_name ut_user +# define ut_time ut_tv.tv_sec +#endif + #define P_CONSOLE -1 /* Special radutmp type value for local users */ int fingerd; /* Are we run as fingerd */ Index: head/net/gnu-radius/files/radiusd.in =================================================================== --- head/net/gnu-radius/files/radiusd.in (revision 411355) +++ head/net/gnu-radius/files/radiusd.in (revision 411356) @@ -1,27 +1,27 @@ #!/bin/sh # $FreeBSD$ # -# PROVIDE radiusd +# PROVIDE: radiusd # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable radiusd: # # radiusd_enable="YES" . /etc/rc.subr name=radiusd rcvar=radiusd_enable command=%%PREFIX%%/sbin/radiusd radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/config"} required_files=${radiusd_config} pidfile=/var/run/radiusd.pid radiusd_enable=${radiusd_enable:-"NO"} load_rc_config $name run_rc_command "$1" Index: head/net/gnu-radius/pkg-plist =================================================================== --- head/net/gnu-radius/pkg-plist (revision 411355) +++ head/net/gnu-radius/pkg-plist (revision 411356) @@ -1,115 +1,111 @@ man/man1/radgrep.1.gz man/man1/radlast.1.gz man/man1/raduse.1.gz man/man1/radwho.1.gz man/man8/builddbm.8.gz man/man8/radctl.8.gz man/man8/radiusd.8.gz man/man8/radping.8.gz man/man8/radzap.8.gz bin/builddbm bin/radgrep bin/radlast bin/radping bin/radtest bin/radwho bin/radzap sbin/radauth sbin/radctl sbin/radiusd @sample etc/raddb/access.deny.sample @sample etc/raddb/client.conf.sample @sample etc/raddb/clients.sample @sample etc/raddb/config.sample etc/raddb/dict/ascend etc/raddb/dict/ascend.vs etc/raddb/dict/cisco etc/raddb/dict/compat etc/raddb/dict/livingston etc/raddb/dict/microsoft etc/raddb/dict/standard etc/raddb/dict/tunnel etc/raddb/dict/usr etc/raddb/dict/voip @sample etc/raddb/dictionary.sample @sample etc/raddb/hints.sample @sample etc/raddb/huntgroups.sample etc/raddb/nas.rc @sample etc/raddb/naslist.sample @sample etc/raddb/nastypes.sample @sample etc/raddb/realms.sample @sample etc/raddb/sqlserver.sample @sample etc/raddb/users.sample include/radius/argcv.h include/radius/debug.h include/radius/dictionary.h include/radius/envar.h include/radius/list.h include/radius/md4.h include/radius/md5.h include/radius/mem.h include/radius/raddbm.h include/radius/radius.h include/radius/radpaths.h include/radius/radscm.h include/radius/radutmp.h include/radius/sha1.h include/radius/symtab.h include/radius/types.h @comment lib/charset.alias lib/libgnuradius.a lib/libgnuradius.so lib/libgnuradius.so.0 lib/libgnuradius.so.0.0.0 share/aclocal/radius.m4 %%CLIENT%%bin/radsession %%CLIENT%%lib/libguile-gnuradius-v-%%PORTVERSION%%.so %%CLIENT%%lib/libradscm.a %%CLIENT%%lib/libradscm.so %%CLIENT%%lib/libradscm.so.1 %%CLIENT%%lib/libradscm.so.1.0.0 %%CLIENT%%lib/libservscm.a %%CLIENT%%lib/security/pam_radius.a %%CLIENT%%lib/security/pam_radius.so %%CLIENT%%libexec/nas.scm %%NLS%%share/locale/ca/LC_MESSAGES/radius.mo %%NLS%%share/locale/es/LC_MESSAGES/radius.mo %%NLS%%share/locale/fr/LC_MESSAGES/radius.mo %%NLS%%share/locale/id/LC_MESSAGES/radius.mo %%NLS%%share/locale/pl/LC_MESSAGES/radius.mo %%NLS%%share/locale/ru/LC_MESSAGES/radius.mo -@comment %%NLS%%share/locale/rw/LC_MESSAGES/radius.mo %%NLS%%share/locale/uk/LC_MESSAGES/radius.mo %%NLS%%share/locale/vi/LC_MESSAGES/radius.mo %%CLIENT%%%%DATADIR%%/%%PORTVERSION%%/scheme/gnuradius.scm %%CLIENT%%%%DATADIR%%/%%PORTVERSION%%/scheme/ipalloc.scm %%CLIENT%%%%DATADIR%%/%%PORTVERSION%%/scheme/radiusd.scm %%CLIENT%%%%DATADIR%%/%%PORTVERSION%%/scheme/ttl.scm %%CLIENT%%%%DATADIR%%/%%PORTVERSION%%/scheme/guile-procedures.txt %%DATADIR%%/%%PORTVERSION%%/rewrite/checknas.rw %%DATADIR%%/%%PORTVERSION%%/rewrite/log-hook.rw %%DATADIR%%/%%PORTVERSION%%/rewrite/nas-ip.rw %%MYSQL%%lib/radius/%%PORTVERSION%%/modules/mysql.a %%MYSQL%%lib/radius/%%PORTVERSION%%/modules/mysql.so %%PGSQL%%lib/radius/%%PORTVERSION%%/modules/postgres.a %%PGSQL%%lib/radius/%%PORTVERSION%%/modules/postgres.so %%EMACS%%%%EMACS_SITE_LISPDIR%%/radconf-mode.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/radius-mode.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/rewrite-mode.el %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascend.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c3620.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cisco.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/comos.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.syntax %%PORTEXAMPLES%%%%EXAMPLESDIR%%/filter.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hints-0.96 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jetstream.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nt.rw %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/radius.php @dir %%DATADIR%%/%%PORTVERSION%%/scheme -@dir lib/security -@unexec rm -f %B/run/radiusd.pid -@unexec rm -rf %B/log/radius 2>&1 >/dev/null || true -@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone." +@dir lib/radius/%%PORTVERSION%%/modules