diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index e8b4a2b0dda3..b1660936c8d6 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -1,77 +1,76 @@ PORTNAME= gnu-radius -PORTVERSION= 1.6.1 -PORTREVISION= 18 +PORTVERSION= 1.7 CATEGORIES= net MASTER_SITES= GNU/radius DISTNAME= radius-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GNU RADIUS server WWW= https://www.gnu.org/software/radius/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl -USES= cpe gmake libtool +USES= cpe gmake libtool tar:bz2 USE_RC_SUBR= radiusd USE_SUBMAKE= yes USE_LDCONFIG= yes CPE_PRODUCT= radius CPE_VENDOR= gnu CONFLICTS= freeradius-0.* openradius-0.* radiusd-cistron-1.* GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip 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 MYSQL PGSQL EXAMPLES DBM SNMP EMACS PAM NLS OPTIONS_DEFAULT=MYSQL OPTIONS_SUB= yes CLIENT_DESC= Build client EMACS_DESC= Install Emacs dotfiles SNMP_CONFIGURE_ENABLE= snmp CLIENT_CONFIGURE_ENABLE= client -CLIENT_USES= guile:1.8,alias +CLIENT_USES= guile:3.0,alias CLIENT_CONFIGURE_OFF= --without-guile MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres DBM_CONFIGURE_ENABLE= dbm=ndbm EMACS_USES= emacs NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls PAM_CONFIGURE_ENABLE= pam 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 post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ( cd ${WRKSRC}/examples && ${COPYTREE_SHARE} .\ ${STAGEDIR}${EXAMPLESDIR}\ "! ( -name Makefile -o -name Makefile\.* ) " ) post-install-EMACS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} ${INSTALL_DATA} ${WRKSRC}/elisp/*.el \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/net/gnu-radius/distinfo b/net/gnu-radius/distinfo index 55bb81f03279..927a15dc8a5b 100644 --- a/net/gnu-radius/distinfo +++ b/net/gnu-radius/distinfo @@ -1,2 +1,3 @@ -SHA256 (radius-1.6.1.tar.gz) = 3053b670704aa2fbcb6235d9a8f2e31329849faa5eca8c2b9a55cb35ff0993d0 -SIZE (radius-1.6.1.tar.gz) = 2602368 +TIMESTAMP = 1776835676 +SHA256 (radius-1.7.tar.bz2) = 457e2ba00f992bbf7242ac36971ba35eb9b4cfdfd909c75c1c3d639192e744b3 +SIZE (radius-1.7.tar.bz2) = 1648302 diff --git a/net/gnu-radius/files/patch-configure b/net/gnu-radius/files/patch-configure index 099476f4a950..a6b487f0c93c 100644 --- a/net/gnu-radius/files/patch-configure +++ b/net/gnu-radius/files/patch-configure @@ -1,20 +1,20 @@ ---- configure.orig 2008-12-17 11:09:36 UTC +--- configure.orig 2025-12-11 11:41:24 UTC +++ configure -@@ -36624,7 +36624,7 @@ if test "${ra_cv_lib_mysqlclient+set}" = - echo $ECHO_N "(cached) $ECHO_C" >&6 - else +@@ -18595,7 +18595,7 @@ else $as_nop + printf %s "(cached) " >&6 + else $as_nop - 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 -@@ -36742,7 +36742,7 @@ if test "${ra_cv_lib_pq+set}" = set; the - echo $ECHO_N "(cached) $ECHO_C" >&6 - else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18681,7 +18681,7 @@ else $as_nop + printf %s "(cached) " >&6 + else $as_nop - 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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/net/gnu-radius/files/patch-gnu_argp-ba.c b/net/gnu-radius/files/patch-gnu_argp-ba.c deleted file mode 100644 index 8c17bd0e1361..000000000000 --- a/net/gnu-radius/files/patch-gnu_argp-ba.c +++ /dev/null @@ -1,8 +0,0 @@ ---- gnu/argp-ba.c.orig 2008-12-15 08:05:24 UTC -+++ gnu/argp-ba.c -@@ -23,4 +23,4 @@ - the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help - messages), embedded in a sentence that says something like `Report bugs to - ADDR.'. */ --const char *argp_program_bug_address; -+extern const char *argp_program_bug_address; diff --git a/net/gnu-radius/files/patch-include-radius_radutmp.h b/net/gnu-radius/files/patch-include_radius_radutmp.h similarity index 73% rename from net/gnu-radius/files/patch-include-radius_radutmp.h rename to net/gnu-radius/files/patch-include_radius_radutmp.h index 75d2feca51de..29f9630161b5 100644 --- a/net/gnu-radius/files/patch-include-radius_radutmp.h +++ b/net/gnu-radius/files/patch-include_radius_radutmp.h @@ -1,11 +1,11 @@ ---- include/radius/radutmp.h.orig 2008-12-15 08:03:24 UTC +--- include/radius/radutmp.h.orig 2025-12-11 11:21:32 UTC +++ include/radius/radutmp.h -@@ -30,7 +30,7 @@ +@@ -27,7 +27,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 { diff --git a/net/gnu-radius/files/patch-lib_readline.c b/net/gnu-radius/files/patch-lib_readline.c index 051053810cd5..c0572691669b 100644 --- a/net/gnu-radius/files/patch-lib_readline.c +++ b/net/gnu-radius/files/patch-lib_readline.c @@ -1,11 +1,11 @@ ---- lib/readline.c.orig 2026-03-26 21:35:33 UTC +--- lib/readline.c.orig 2025-12-11 11:21:32 UTC +++ lib/readline.c -@@ -144,7 +144,7 @@ grad_readline_init(char *name, +@@ -129,7 +129,7 @@ grad_readline_init(char *name, return; #ifdef WITH_READLINE rl_readline_name = name; -- rl_attempted_completion_function = (CPPFunction *) completion_fp; +- rl_attempted_completion_function = completion_fp; + rl_attempted_completion_function = (rl_completion_func_t *) completion_fp; rl_getc_function = grad_getc; #endif } diff --git a/net/gnu-radius/files/patch-raddb_Makefile.in b/net/gnu-radius/files/patch-raddb_Makefile.in index 1f03bc8e30c6..a9e8e13d5a1d 100644 --- a/net/gnu-radius/files/patch-raddb_Makefile.in +++ b/net/gnu-radius/files/patch-raddb_Makefile.in @@ -1,15 +1,15 @@ ---- raddb/Makefile.in.orig 2008-12-17 11:09:50 UTC +--- raddb/Makefile.in.orig 2025-12-11 11:41:25 UTC +++ raddb/Makefile.in -@@ -893,10 +893,10 @@ install-data-local: +@@ -794,10 +794,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; \ + for file in $(dictionaries); do \ + ${INSTALL} -m 644 $(top_srcdir)/raddb/$$file $(DESTDIR)$(raddbdir)/$$file; \ diff --git a/net/gnu-radius/files/patch-radiusd_builddbm.c b/net/gnu-radius/files/patch-radiusd_builddbm.c index 3a5618f4b07a..ae7a4187769c 100644 --- a/net/gnu-radius/files/patch-radiusd_builddbm.c +++ b/net/gnu-radius/files/patch-radiusd_builddbm.c @@ -1,11 +1,11 @@ ---- radiusd/builddbm.c.orig 2008-12-15 08:03:24 UTC +--- radiusd/builddbm.c.orig 2025-12-11 11:21:32 UTC +++ radiusd/builddbm.c -@@ -58,7 +58,7 @@ append_symbol(DBM_closure *closure, User +@@ -56,7 +56,7 @@ append_symbol(DBM_closure *closure, User_symbol *sym) - 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; - } + 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; + } diff --git a/net/gnu-radius/files/patch-radwho_radwho.c b/net/gnu-radius/files/patch-radwho_radwho.c index f9fb462a77f7..062892549806 100644 --- a/net/gnu-radius/files/patch-radwho_radwho.c +++ b/net/gnu-radius/files/patch-radwho_radwho.c @@ -1,43 +1,41 @@ ---- radwho/radwho.c.orig 2008-12-15 08:03:24 UTC +--- radwho/radwho.c.orig 2025-12-11 11:21:33 UTC +++ radwho/radwho.c -@@ -41,7 +41,8 @@ void print_header(); +@@ -39,7 +39,8 @@ int want_rad_record(struct radutmp *rt); int want_rad_record(struct radutmp *rt); /* UTMP stuff. Uses utmpx on svr4 */ --#if defined(__svr4__) || defined(__sgi) +-#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 @@ int want_rad_record(struct radutmp *rt); +@@ -47,7 +48,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 @@ int want_rad_record(struct radutmp *rt); +@@ -58,11 +61,17 @@ 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 - ++#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 */ + #endif - int fingerd; /* Are we run as fingerd */ + #define P_CONSOLE -1 /* Special radutmp type value for local users */