summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/freeradius-freetds/Makefile15
-rw-r--r--net/freeradius-freetds/PLIST4
-rw-r--r--net/freeradius-iodbc/Makefile15
-rw-r--r--net/freeradius-iodbc/PLIST4
-rw-r--r--net/freeradius-krb5/Makefile15
-rw-r--r--net/freeradius-krb5/PLIST4
-rw-r--r--net/freeradius-ldap/Makefile13
-rw-r--r--net/freeradius-ldap/PLIST4
-rw-r--r--net/freeradius-memcached/Makefile15
-rw-r--r--net/freeradius-memcached/PLIST4
-rw-r--r--net/freeradius-mysql/Makefile15
-rw-r--r--net/freeradius-mysql/PLIST4
-rw-r--r--net/freeradius-perl/Makefile15
-rw-r--r--net/freeradius-perl/PLIST4
-rw-r--r--net/freeradius-pgsql/Makefile14
-rw-r--r--net/freeradius-pgsql/PLIST4
-rw-r--r--net/freeradius-python/Makefile18
-rw-r--r--net/freeradius-python/PLIST4
-rw-r--r--net/freeradius-rest/Makefile14
-rw-r--r--net/freeradius-rest/PLIST4
-rw-r--r--net/freeradius-sqlite3/Makefile16
-rw-r--r--net/freeradius-sqlite3/PLIST4
-rw-r--r--net/freeradius-unixodbc/Makefile15
-rw-r--r--net/freeradius-unixodbc/PLIST4
-rw-r--r--net/freeradius-yubikey/Makefile14
-rw-r--r--net/freeradius-yubikey/PLIST4
-rw-r--r--net/freeradius/Makefile16
-rw-r--r--net/freeradius/Makefile.common27
-rw-r--r--net/freeradius/PLIST16
-rw-r--r--net/freeradius/distinfo13
-rw-r--r--net/freeradius/patches/patch-main_util.c3
-rw-r--r--net/freeradius/patches/patch-src_lib_debug.c41
32 files changed, 171 insertions, 191 deletions
diff --git a/net/freeradius-freetds/Makefile b/net/freeradius-freetds/Makefile
index 93a407bef06..01768ef3d56 100644
--- a/net/freeradius-freetds/Makefile
+++ b/net/freeradius-freetds/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2018/09/25 12:20:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-freetds/}
-COMMENT= Free RADIUS FreeTDS support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-freetds/}
+COMMENT= Free RADIUS FreeTDS support
-CONFIGURE_ARGS+= --with-rlm_sql_freetds
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_sql_freetds
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_freetds.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_freetds.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../databases/freetds/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-freetds/PLIST b/net/freeradius-freetds/PLIST
index 2d4b0920447..00c1bdc03c1 100644
--- a/net/freeradius-freetds/PLIST
+++ b/net/freeradius-freetds/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_sql_freetds.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_sql_freetds.${SOEXT}
diff --git a/net/freeradius-iodbc/Makefile b/net/freeradius-iodbc/Makefile
index 46814e6c73a..e8a327fbbdc 100644
--- a/net/freeradius-iodbc/Makefile
+++ b/net/freeradius-iodbc/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-iodbc/}
-COMMENT= Free RADIUS iODBC support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-iodbc/}
+COMMENT= Free RADIUS iODBC support
-CONFIGURE_ARGS+= --with-rlm_sql_iodbc
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_sql_iodbc
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_iodbc.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_iodbc.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../databases/iodbc/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-iodbc/PLIST b/net/freeradius-iodbc/PLIST
index a98459e5159..302fc97486d 100644
--- a/net/freeradius-iodbc/PLIST
+++ b/net/freeradius-iodbc/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_sql_iodbc.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_sql_iodbc.${SOEXT}
diff --git a/net/freeradius-krb5/Makefile b/net/freeradius-krb5/Makefile
index 6239bb04402..fea396aad7d 100644
--- a/net/freeradius-krb5/Makefile
+++ b/net/freeradius-krb5/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-krb5/}
-COMMENT= Free RADIUS rlm_krb5 module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-krb5/}
+COMMENT= Free RADIUS rlm_krb5 module
-CONFIGURE_ARGS+= --with-rlm_krb5
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_krb5
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_krb5.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_krb5.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-krb5/PLIST b/net/freeradius-krb5/PLIST
index cb268a1b7bf..0a8c93b13c8 100644
--- a/net/freeradius-krb5/PLIST
+++ b/net/freeradius-krb5/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_krb5.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_krb5.${SOEXT}
diff --git a/net/freeradius-ldap/Makefile b/net/freeradius-ldap/Makefile
index ac98ff6b65b..ec9fd3d7339 100644
--- a/net/freeradius-ldap/Makefile
+++ b/net/freeradius-ldap/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-ldap/}
-COMMENT= Free RADIUS rlm_ldap module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-ldap/}
+COMMENT= Free RADIUS rlm_ldap module
-CONFIGURE_ARGS+= --with-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_ldap.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_ldap.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../databases/openldap-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-ldap/PLIST b/net/freeradius-ldap/PLIST
index 136e07cb4c3..2875d7d049c 100644
--- a/net/freeradius-ldap/PLIST
+++ b/net/freeradius-ldap/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_ldap.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_ldap.${SOEXT}
diff --git a/net/freeradius-memcached/Makefile b/net/freeradius-memcached/Makefile
index 2af1e57f4ac..e4fca57494f 100644
--- a/net/freeradius-memcached/Makefile
+++ b/net/freeradius-memcached/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-memcached/}
-COMMENT= Free RADIUS support for memcached
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-memcached/}
+COMMENT= Free RADIUS support for memcached
-CONFIGURE_ARGS+= --with-rlm_cache_memcached
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_cache_memcached
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_cache_memcached.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_cache_memcached.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../devel/libmemcached/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/net/freeradius-memcached/PLIST b/net/freeradius-memcached/PLIST
index 83b490e4682..d912241158a 100644
--- a/net/freeradius-memcached/PLIST
+++ b/net/freeradius-memcached/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_cache_memcached.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_cache_memcached.${SOEXT}
diff --git a/net/freeradius-mysql/Makefile b/net/freeradius-mysql/Makefile
index b98498e36b6..567ac11b6e1 100644
--- a/net/freeradius-mysql/Makefile
+++ b/net/freeradius-mysql/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:52 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-mysql/}
-COMMENT= Free RADIUS MySQL support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-mysql/}
+COMMENT= Free RADIUS MySQL support
-CONFIGURE_ARGS+= --with-rlm_sql_mysql
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_sql_mysql
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_mysql.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_mysql.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-mysql/PLIST b/net/freeradius-mysql/PLIST
index bf8c3af26d5..0f1509b0bdb 100644
--- a/net/freeradius-mysql/PLIST
+++ b/net/freeradius-mysql/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_sql_mysql.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:52 adam Exp $
+lib/rlm_sql_mysql.${SOEXT}
diff --git a/net/freeradius-perl/Makefile b/net/freeradius-perl/Makefile
index 1032530503d..ac0a62ee04f 100644
--- a/net/freeradius-perl/Makefile
+++ b/net/freeradius-perl/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2018/09/25 12:20:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2019/07/04 07:44:53 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-perl/}
-COMMENT= Free RADIUS rlm_perl module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-perl/}
+COMMENT= Free RADIUS rlm_perl module
-CONFIGURE_ARGS+= --with-rlm_perl
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_perl
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_perl.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_perl.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-perl/PLIST b/net/freeradius-perl/PLIST
index 32d4beed2f5..e0a0370e175 100644
--- a/net/freeradius-perl/PLIST
+++ b/net/freeradius-perl/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_perl.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_perl.${SOEXT}
diff --git a/net/freeradius-pgsql/Makefile b/net/freeradius-pgsql/Makefile
index 04c900ae0a6..1e6b3388747 100644
--- a/net/freeradius-pgsql/Makefile
+++ b/net/freeradius-pgsql/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/04 07:44:53 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-pgsql/}
-COMMENT= Free RADIUS PostgreSQL support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-pgsql/}
+COMMENT= Free RADIUS PostgreSQL support
+CATEGORIES= net
-CONFIGURE_ARGS+= --with-rlm_sql_postgresql
+CONFIGURE_ARGS+= --with-rlm_sql_postgresql
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_postgresql.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_postgresql.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../mk/pgsql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-pgsql/PLIST b/net/freeradius-pgsql/PLIST
index 6cd1762d16e..9ab19cf0347 100644
--- a/net/freeradius-pgsql/PLIST
+++ b/net/freeradius-pgsql/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:28 fhajny Exp $
-lib/rlm_sql_postgresql.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_sql_postgresql.${SOEXT}
diff --git a/net/freeradius-python/Makefile b/net/freeradius-python/Makefile
index 857b06cfc6d..5aa2b72ec14 100644
--- a/net/freeradius-python/Makefile
+++ b/net/freeradius-python/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 07:33:10 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/04 07:44:53 adam Exp $
-PKGREVISION= 1
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-python/}
-COMMENT= Free RADIUS rlm_python module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-python/}
+COMMENT= Free RADIUS rlm_python module
-PYTHON_VERSIONS_ACCEPTED= 27
-
-CONFIGURE_ARGS+= --with-rlm_python
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_python
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_python.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_python.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../lang/python/pyversion.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-python/PLIST b/net/freeradius-python/PLIST
index e671eaf7890..08ebc883924 100644
--- a/net/freeradius-python/PLIST
+++ b/net/freeradius-python/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:29 fhajny Exp $
-lib/rlm_python.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_python.${SOEXT}
diff --git a/net/freeradius-rest/Makefile b/net/freeradius-rest/Makefile
index 727e123a42a..3bd07687b39 100644
--- a/net/freeradius-rest/Makefile
+++ b/net/freeradius-rest/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2019/07/01 04:08:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/07/04 07:44:53 adam Exp $
-PKGREVISION= 2
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-rest/}
-COMMENT= Free RADIUS rlm_rest module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-rest/}
+COMMENT= Free RADIUS rlm_rest module
-CONFIGURE_ARGS+= --with-rlm_rest
+CONFIGURE_ARGS+= --with-rlm_rest
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_rest.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_rest.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../textproc/json-c/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/net/freeradius-rest/PLIST b/net/freeradius-rest/PLIST
index 6cffa3f6c2b..183775e31a5 100644
--- a/net/freeradius-rest/PLIST
+++ b/net/freeradius-rest/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:29 fhajny Exp $
-lib/rlm_rest.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_rest.${SOEXT}
diff --git a/net/freeradius-sqlite3/Makefile b/net/freeradius-sqlite3/Makefile
index 7da222d7b29..6f401da7051 100644
--- a/net/freeradius-sqlite3/Makefile
+++ b/net/freeradius-sqlite3/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2019/04/03 00:32:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2019/07/04 07:44:53 adam Exp $
-PKGREVISION= 2
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-sqlite3/}
-COMMENT= Free RADIUS SQLite support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-sqlite3/}
+COMMENT= Free RADIUS SQLite support
-CONFIGURE_ARGS+= --with-rlm_sql_iodbc
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_sql_iodbc
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_sqlite.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_sqlite.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-sqlite3/PLIST b/net/freeradius-sqlite3/PLIST
index fb3c731ace1..b43ce640e05 100644
--- a/net/freeradius-sqlite3/PLIST
+++ b/net/freeradius-sqlite3/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:29 fhajny Exp $
-lib/rlm_sql_sqlite.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_sql_sqlite.${SOEXT}
diff --git a/net/freeradius-unixodbc/Makefile b/net/freeradius-unixodbc/Makefile
index b0a4ea20116..d8ee2d43094 100644
--- a/net/freeradius-unixodbc/Makefile
+++ b/net/freeradius-unixodbc/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:53 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-unixodbc/}
-COMMENT= Free RADIUS UNIXODBC support
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-unixodbc/}
+COMMENT= Free RADIUS UNIXODBC support
-CONFIGURE_ARGS+= --with-rlm_sql_unixodbc
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_sql_unixodbc
+CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --without-rlm_yubikey
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_unixodbc.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_unixodbc.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../databases/unixodbc/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-unixodbc/PLIST b/net/freeradius-unixodbc/PLIST
index c419587d058..babe2436e24 100644
--- a/net/freeradius-unixodbc/PLIST
+++ b/net/freeradius-unixodbc/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:29 fhajny Exp $
-lib/rlm_sql_unixodbc.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_sql_unixodbc.${SOEXT}
diff --git a/net/freeradius-yubikey/Makefile b/net/freeradius-yubikey/Makefile
index 0584ed1cc99..17fca77af77 100644
--- a/net/freeradius-yubikey/Makefile
+++ b/net/freeradius-yubikey/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/04 07:44:53 adam Exp $
.include "../../net/freeradius/Makefile.module"
-PKGNAME= ${DISTNAME:S/-server/-yubikey/}
-COMMENT= Free RADIUS rlm_yubikey module
-CATEGORIES= net
+PKGNAME= ${DISTNAME:S/-server/-yubikey/}
+COMMENT= Free RADIUS rlm_yubikey module
-CONFIGURE_ARGS+= --with-rlm_yubikey
-CONFIGURE_ARGS+= --without-rlm_ldap
+CONFIGURE_ARGS+= --with-rlm_yubikey
+CONFIGURE_ARGS+= --without-rlm_ldap
do-install:
- ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_yubikey.so ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_yubikey.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib
.include "../../security/libyubikey/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius-yubikey/PLIST b/net/freeradius-yubikey/PLIST
index 62d4bfda4fa..01615cf23d6 100644
--- a/net/freeradius-yubikey/PLIST
+++ b/net/freeradius-yubikey/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 10:07:29 fhajny Exp $
-lib/rlm_yubikey.so
+@comment $NetBSD: PLIST,v 1.2 2019/07/04 07:44:53 adam Exp $
+lib/rlm_yubikey.${SOEXT}
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 1338fdbb2d6..6c3e8951363 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.99 2018/10/08 15:50:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.100 2019/07/04 07:44:52 adam Exp $
.include "Makefile.common"
-PKGNAME= ${DISTNAME:S/-server//}
-COMMENT= Free RADIUS server implementation
+PKGNAME= ${DISTNAME:S/-server//}
+COMMENT= Free RADIUS server implementation
BUILD_DEFS+= VARBASE
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
@@ -42,14 +42,8 @@ OWN_DIRS_PERMS+= ${VARBASE}/run/radiusd \
PKG_SYSCONFSUBDIR= raddb
-OPSYSVARS+= SOEXT
-SOEXT.Darwin= dylib
-SOEXT.*= so
-PLIST_SUBST+= SOEXT=${SOEXT}
-PRINT_PLIST_AWK+= {gsub(/\.${SOEXT}$$/, ".$${SOEXT}");}
-
FILES_SUBST+= RADIUS_USER=${RADIUS_USER} RADIUS_GROUP=${RADIUS_GROUP}
-MESSAGE_SUBST+= BOOTSTRAP=${PKG_SYSCONFDIR:Q}/certs/bootstrap
+MESSAGE_SUBST+= BOOTSTRAP=${PKG_SYSCONFDIR}/certs/bootstrap
EGDIR= ${PREFIX}/share/examples/freeradius
@@ -181,7 +175,7 @@ EGFILES= certs/ca.cnf certs/client.cnf certs/inner-server.cnf \
sites-available/virtual.example.com \
users templates.conf trigger.conf
-EGDIRS= certs mods-available mods-config mods-config/attr_filter mods-config/files \
+EGDIRS= certs mods-available mods-config mods-config/attr_filter mods-config/files \
mods-config/perl mods-config/preprocess mods-config/sql mods-config/sql/counter \
mods-config/sql/counter/mysql mods-config/sql/counter/postgresql \
mods-config/sql/counter/sqlite mods-config/sql/cui mods-config/sql/cui/mysql \
diff --git a/net/freeradius/Makefile.common b/net/freeradius/Makefile.common
index ff414adef04..e8a109d2da9 100644
--- a/net/freeradius/Makefile.common
+++ b/net/freeradius/Makefile.common
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile.common,v 1.4 2018/10/08 15:50:39 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.5 2019/07/04 07:44:52 adam Exp $
# used by net/freeradius/Makefile.module
-DISTNAME= freeradius-server-3.0.17
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= freeradius-server-3.0.19
+CATEGORIES= net
+MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.freeradius.org/
-LICENSE= gnu-gpl-v2
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://www.freeradius.org/
+LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
USE_LANGUAGES+= c c++
-
+USE_TOOLS+= gmake perl
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-openssl-include-dir=${BUILDLINK_PREFIX.openssl}/include
CONFIGURE_ARGS+= --with-openssl-lib-dir=${BUILDLINK_PREFIX.openssl}/lib
CONFIGURE_ARGS+= --without-rlm_yubikey
@@ -26,6 +25,12 @@ MAKE_ENV+= PACKAGE=yes
INSTALLATION_DIRS+= lib
+OPSYSVARS+= SOEXT
+SOEXT.Darwin= dylib
+SOEXT.*= so
+PLIST_SUBST+= SOEXT=${SOEXT}
+PRINT_PLIST_AWK+= {gsub(/\.${SOEXT}$$/, ".$${SOEXT}");}
+
.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/talloc/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 56d4a502700..d931ae262a5 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2018/09/25 12:16:36 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/07/04 07:44:52 adam Exp $
bin/dhcpclient
bin/map_unit
bin/rad_counter
@@ -15,6 +15,7 @@ bin/radzap
bin/rlm_ippool_tool
bin/smbencrypt
include/freeradius/attributes.h
+include/freeradius/autoconf.h
include/freeradius/base64.h
include/freeradius/build.h
include/freeradius/conf.h
@@ -39,6 +40,7 @@ include/freeradius/radiusd.h
include/freeradius/radpaths.h
include/freeradius/radutmp.h
include/freeradius/realms.h
+include/freeradius/regex.h
include/freeradius/rfc2865.h
include/freeradius/rfc2866.h
include/freeradius/rfc2867.h
@@ -71,9 +73,13 @@ include/freeradius/rfc7155.h
include/freeradius/rfc7268.h
include/freeradius/rfc7499.h
include/freeradius/rfc7930.h
+include/freeradius/rfc8045.h
+include/freeradius/rfc8559.h
include/freeradius/sha1.h
include/freeradius/stats.h
include/freeradius/sysutmp.h
+include/freeradius/tcp.h
+include/freeradius/threads.h
include/freeradius/tls.h
include/freeradius/token.h
include/freeradius/udpfromto.h
@@ -439,6 +445,7 @@ share/examples/freeradius/mods-config/sql/ippool/mysql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/oracle/procedures.sql
share/examples/freeradius/mods-config/sql/ippool/oracle/queries.conf
share/examples/freeradius/mods-config/sql/ippool/oracle/schema.sql
+share/examples/freeradius/mods-config/sql/ippool/postgresql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/sqlite/queries.conf
@@ -511,6 +518,7 @@ share/examples/freeradius/policy.d/eap
share/examples/freeradius/policy.d/filter
share/examples/freeradius/policy.d/moonshot-targeted-ids
share/examples/freeradius/policy.d/operator-name
+share/examples/freeradius/policy.d/rfc7542
share/examples/freeradius/proxy.conf
share/examples/freeradius/radiusd.conf
share/examples/freeradius/sites-available/README
@@ -574,6 +582,7 @@ share/freeradius/dictionary.audiocodes
share/freeradius/dictionary.avaya
share/freeradius/dictionary.azaire
share/freeradius/dictionary.bay
+share/freeradius/dictionary.bigswitch
share/freeradius/dictionary.bintec
share/freeradius/dictionary.bluecoat
share/freeradius/dictionary.boingo
@@ -632,6 +641,7 @@ share/freeradius/dictionary.hp
share/freeradius/dictionary.huawei
share/freeradius/dictionary.iana
share/freeradius/dictionary.iea
+share/freeradius/dictionary.infinera
share/freeradius/dictionary.infoblox
share/freeradius/dictionary.infonet
share/freeradius/dictionary.ipunplugged
@@ -671,6 +681,7 @@ share/freeradius/dictionary.packeteer
share/freeradius/dictionary.paloalto
share/freeradius/dictionary.patton
share/freeradius/dictionary.perle
+share/freeradius/dictionary.pfsense
share/freeradius/dictionary.propel
share/freeradius/dictionary.prosoft
share/freeradius/dictionary.proxim
@@ -710,6 +721,8 @@ share/freeradius/dictionary.rfc7155
share/freeradius/dictionary.rfc7268
share/freeradius/dictionary.rfc7499
share/freeradius/dictionary.rfc7930
+share/freeradius/dictionary.rfc8045
+share/freeradius/dictionary.rfc8559
share/freeradius/dictionary.riverbed
share/freeradius/dictionary.riverstone
share/freeradius/dictionary.roaringpenguin
@@ -742,6 +755,7 @@ share/freeradius/dictionary.usr
share/freeradius/dictionary.usr.illegal
share/freeradius/dictionary.utstarcom
share/freeradius/dictionary.valemount
+share/freeradius/dictionary.verizon
share/freeradius/dictionary.versanet
share/freeradius/dictionary.vqp
share/freeradius/dictionary.walabi
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index ad10f95a7eb..dc676d1ee59 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.37 2018/12/19 22:52:32 manu Exp $
+$NetBSD: distinfo,v 1.38 2019/07/04 07:44:52 adam Exp $
-SHA1 (freeradius-server-3.0.17.tar.bz2) = a0d4372ee124cbee6b90a4463ff068afe70e06ca
-RMD160 (freeradius-server-3.0.17.tar.bz2) = c335fe2ef39ca2311ac85b2ec3d5941bbbb5e6e6
-SHA512 (freeradius-server-3.0.17.tar.bz2) = f4510d8e77eb7c72a21fbfad851f13460ff4b5a35f0b7bea6102076ceb71188a63b277fb7e4fcd9c3033b396b63e1bf0e455cc03608d7ab1380d1662407cb399
-Size (freeradius-server-3.0.17.tar.bz2) = 3075724 bytes
+SHA1 (freeradius-server-3.0.19.tar.bz2) = 6bb57e634ad6e85f6c324f851296c688edbc3b11
+RMD160 (freeradius-server-3.0.19.tar.bz2) = 753b89e13b80312131149cdaf26b944bc802e338
+SHA512 (freeradius-server-3.0.19.tar.bz2) = 9bb3401a52288de541a2272149f4341840dc1df7203583746bef46c0b1b1f2b8886931c9f6f9ce3d92951e271ab5a84a50a8587a3acd69cc20bc86f5817d28e1
+Size (freeradius-server-3.0.19.tar.bz2) = 3127564 bytes
SHA1 (patch-ai) = e32ffd24b93e2cef2e72ef9a8ea59d49e1571dc0
SHA1 (patch-configure.ac) = ffec1f851d23f560797c12eba5092f2940e4d662
SHA1 (patch-main_command.c) = 1c79b29eb13df341906c710c8dd41860a27473dd
-SHA1 (patch-main_util.c) = b9cefdb9bc30df0906184e8c0bb883e5258767c3
-SHA1 (patch-src_lib_debug.c) = 7547fdd6abf1048cb1ca846900fc9e4d734f8b8a
+SHA1 (patch-main_util.c) = e8814255c32c8469e81d62f2c7092e8d42744e85
SHA1 (patch-src_lib_udpfromto.c) = 2457f0a7223b1f3ef86d0af020290b26380e6319
diff --git a/net/freeradius/patches/patch-main_util.c b/net/freeradius/patches/patch-main_util.c
index 64f86ec342c..21cb9e3600b 100644
--- a/net/freeradius/patches/patch-main_util.c
+++ b/net/freeradius/patches/patch-main_util.c
@@ -1,4 +1,5 @@
-$NetBSD: patch-main_util.c,v 1.1 2017/08/26 10:07:28 fhajny Exp $
+$NetBSD: patch-main_util.c,v 1.2 2019/07/04 07:44:52 adam Exp $
+
O_DIRECTORY to open(2) is a Linuxism.
--- src/main/util.c.orig 2016-09-29 15:19:48.000000000 +0000
diff --git a/net/freeradius/patches/patch-src_lib_debug.c b/net/freeradius/patches/patch-src_lib_debug.c
deleted file mode 100644
index bcf2d5dfe06..00000000000
--- a/net/freeradius/patches/patch-src_lib_debug.c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_lib_debug.c,v 1.1 2018/12/19 22:52:32 manu Exp $
-
-Fix startup crash when running outside of gdb on BSD systems.
-
-From upstream https://github.com/FreeRADIUS/freeradius-server/commit/1f8cd27b78c011826bc0744debb4ed60b3f0584a
-
---- src/lib//debug.c.orig 2018-12-16 03:31:31.909930476 +0100
-+++ src/lib//debug.c 2018-12-19 10:05:49.848809433 +0100
-@@ -105,13 +105,21 @@
-
- static TALLOC_CTX *talloc_null_ctx;
- static TALLOC_CTX *talloc_autofree_ctx;
-
-+/*
-+ * On BSD systems, ptrace(PT_DETACH) uses a third argument for
-+ * resume address, with the magic value (void *)1 to resume where
-+ * process stopped. Specifying NULL there leads to a crash because
-+ * process resumes at address 0.
-+ */
- #ifdef HAVE_SYS_PTRACE_H
- # ifdef __linux__
- # define _PTRACE(_x, _y) ptrace(_x, _y, NULL, NULL)
-+# define _PTRACE_DETACH(_x) ptrace(PT_DETACH, _x, NULL, NULL)
- # else
- # define _PTRACE(_x, _y) ptrace(_x, _y, NULL, 0)
-+# define _PTRACE_DETACH(_x) ptrace(PT_DETACH, _x, (void *)1, NULL)
- # endif
-
- # ifdef HAVE_CAPABILITY_H
- # include <sys/capability.h>
-@@ -205,9 +213,9 @@
- fprintf(stderr, "Writing ptrace status to parent failed: %s", fr_syserror(errno));
- }
-
- /* Detach */
-- _PTRACE(PT_DETACH, ppid);
-+ _PTRACE_DETACH(ppid);
- exit(0);
- }
-
- ret = DEBUG_STATE_ATTACHED;