cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace freeradius 2.x with 3.x (move net/freeradius3 into place and add

Browse Source 
@pkgpath markers). it is not a direct upgrade (config locations have
been rearranged) so add an @ask-update guard only shown to any users who
are still running 2.x pointing at the upstream information and giving a
chance to bail out.
This commit is contained in:
sthen 2021-09-16 10:36:38 +00:00
parent ab49e1fb88
commit 320d9bd00c
62 changed files with 1151 additions and 2524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1269 2021/09/10 04:35:07 rsadowski Exp $
# $OpenBSD: Makefile,v 1.1270 2021/09/16 10:36:38 sthen Exp $
SUBDIR =
SUBDIR += adns
@ -106,7 +106,6 @@
SUBDIR += fpdns
SUBDIR += fping
SUBDIR += freeradius
SUBDIR += freeradius3
SUBDIR += freetalk
SUBDIR += ftpcopy
SUBDIR += ftpsesame
@ -615,7 +614,6 @@
SUBDIR += py-siphon,python3
SUBDIR += py-slixmpp,python3
SUBDIR += py-smbc,python3
SUBDIR += py-snmp
SUBDIR += py-snmp,python3
SUBDIR += py-socketio-client,python3
SUBDIR += py-socks

206
net/freeradius/Makefile
View File

@ -1,137 +1,209 @@
# $OpenBSD: Makefile,v 1.80 2021/06/22 14:01:21 tb Exp $
# $OpenBSD: Makefile,v 1.81 2021/09/16 10:36:38 sthen Exp $
PORTROACH= limit:^2\.
SHARED_LIBS += freeradius-radius 4.2 # .0.0
SHARED_LIBS += freeradius-eap 4.1 # .0.0
PORTROACH= limit:^3\.
COMMENT-main= RADIUS server implementation
COMMENT-freetds= freeradius freetds rlm addon
COMMENT-iodbc= freeradius iodbc rlm addon
COMMENT-ldap= freeradius ldap rlm addon
COMMENT-memcached= freeradius memcached rlm addon
COMMENT-mysql= freeradius mysql rlm addon
COMMENT-pgsql= freeradius pgsql rlm addon
COMMENT-ldap= freeradius ldap rlm addon
COMMENT-python= freeradius python rlm addon
COMMENT-python3= freeradius python3 rlm addon (experimental)
V= 2.2.10
REVISION= 3
V= 3.0.23
REVISION= 0
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= freeradius-$V
PKGNAME-freetds= freeradius-freetds-$V
PKGNAME-iodbc= freeradius-iodbc-$V
PKGNAME-ldap= freeradius-ldap-$V
PKGNAME-memcached= freeradius-memcached-$V
PKGNAME-mysql= freeradius-mysql-$V
PKGNAME-pgsql= freeradius-pgsql-$V
PKGNAME-ldap= freeradius-ldap-$V
PKGNAME-python= freeradius-python-$V
PKGNAME-python3= freeradius-python3-$V
CATEGORIES= net security
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.freeradius.org/pub/radius/old/
MASTER_SITES= https://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/ \
ftp://ftp.freeradius.org/pub/freeradius/ \
ftp://ftp.freeradius.org/pub/freeradius/old/
HOMEPAGE= http://www.freeradius.org/
HOMEPAGE= https://freeradius.org/
MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>
# GPLv2 - LGPLv2 - OpenSSL exemption
PERMIT_PACKAGE= Yes
CONFIGURE_STYLE=autoconf dest
AUTOCONF_VERSION=2.69
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_header_execinfo_h=false
DEBUG_PACKAGES= ${BUILD_PACKAGES}
CONFIGURE_ARGS= --with-large-files \
--with-snmp \
--with-pic \
--without-rlm-perl \
--without-rlm-python \
--without-rlm_eap_ikev2 \
--without-rlm_pam \
--without-rlm_sql_oracle \
--without-rlm_sql_db2 \
--without-rlm_sql_unixodbc \
--disable-ltdl-install \
--with-system-libltdl
CONFIGURE_STYLE= gnu
# Don't allow FR_LOCATE_DIR to use locate(1) to guess possible
# locations for libs etc.
CONFIGURE_ENV= ac_cv_path_LOCATE= \
ac_cv_path_SNMPGET=${LOCALBASE}/bin/snmpget \
ac_cv_path_SNMPWALK=${LOCALBASE}/bin/snmpwalk \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/freeradius \
--without-rlm_mongo \
--without-rlm_oracle \
--without-rlm_pam
# No option to disable collectd; bodged via patch-configure.
TEST_TARGET= test
TEST_DEPENDS= freeradius-$V:net/freeradius
TEST_DEPENDS= freeradius-$V:${BUILD_PKGPATH}
TEST_IS_INTERACTIVE=Yes # doesn't exit properly
# For manual tests, eapol_test from wpa_supplicant is useful.
# See http://deployingradius.com/scripts/eapol_test/
MULTI_PACKAGES= -main -ldap -mysql -pgsql -iodbc
SUBST_VARS+= V
MODULES= lang/python
CFLAGS= -I${LOCALBASE}/include
# thread-local storage
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
MULTI_PACKAGES= -main -freetds -iodbc -ldap -memcached -mysql -pgsql -python -python3
USE_GMAKE= Yes
# undefined reference to `lt__PROGRAM__LTX_preloaded_symbols'
USE_LIBTOOL= gnu
BUILD_DEPENDS= net/net-snmp
USE_LIBTOOL= no#...has its own _special_ libtool.
RUN_DEPENDS-main= #empty
LIB_DEPENDS-main= databases/gdbm \
devel/libtool,-ltdl
WANTLIB-main= c iconv intl pcap pthread readline \
curses gdbm>=3 ltdl>=4 crypto ssl
databases/libhiredis \
databases/sqlite3 \
devel/json-c \
devel/libtalloc \
security/yubico/yubico-c \
security/yubico/yubico-c-client \
devel/pcre \
net/curl
PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_iodbc
WANTLIB-main += c crypto curl execinfo gdbm hiredis json-c m
WANTLIB-main += pcap pcre perl pthread readline sqlite3 ssl talloc
WANTLIB-main += ykclient yubikey
.for i in ${MULTI_PACKAGES:N-main}
PSEUDO_FLAVORS+= no_${i:S/-//}
.endfor
FLAVOR?=
.include <bsd.port.arch.mk>
# rlm_python
.if ! ${BUILD_PACKAGES:M-python}
CONFIGURE_ARGS+= --without-rlm_python
.endif
LIB_DEPENDS-python= lang/python/2.7
WANTLIB-python= python2.7 intl m pthread util
RUN_DEPENDS-python= lang/python/2.7
# rlm_python3
.if ${BUILD_PACKAGES:M-python3}
CONFIGURE_ARGS+= --with-rlm_python3
.else
CONFIGURE_ARGS+= --without-rlm_python3
.endif
LIB_DEPENDS-python3= ${MODPY_LIB_DEPENDS}
WANTLIB-python3= ${MODPY_WANTLIB} intl m pthread util
RUN_DEPENDS-python3= ${MODPY_RUN_DEPENDS}
# rlm_ldap
.if ${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+= --with-ldap-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-ldap-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_ldap
.endif
LIB_DEPENDS-ldap= databases/openldap
WANTLIB-ldap= ldap
RUN_DEPENDS-ldap= #empty
# rlm_sql_freetds
.if ${BUILD_PACKAGES:M-freetds}
CONFIGURE_ARGS+= --with-freetds-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-freetds-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_sql_freetds
.endif
LIB_DEPENDS-freetds= databases/freetds
WANTLIB-freetds= ct
# rlm_sql_iodbc
.if ${BUILD_PACKAGES:M-iodbc}
CONFIGURE_ARGS+= --with-rlm_sql_iodbc
CONFIGURE_ARGS+= --with-iodbc-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-iodbc-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
.endif
LIB_DEPENDS-iodbc= databases/iodbc
WANTLIB-iodbc= iodbc>=2
RUN_DEPENDS-iodbc= #empty
.if !${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+= --without-rlm_ldap
# rlm_sql_memcached
.if ! ${BUILD_PACKAGES:M-memcached}
CONFIGURE_ARGS+= --without-rlm_sql_memcached
.endif
LIB_DEPENDS-memcached= devel/libmemcached
WANTLIB-memcached= memcached pthread
RUN_DEPENDS-memcached= #empty
LIB_DEPENDS-ldap= databases/openldap \
${BASE_PKGPATH}
WANTLIB-ldap= crypto ssl sasl2 \
lber>=8 ldap_r>=8 freeradius-radius>=1 pthread
RUN_DEPENDS-ldap= #empty
.if !${BUILD_PACKAGES:M-mysql}
# rlm_sql_mysql
.if ${BUILD_PACKAGES:M-mysql}
CONFIGURE_ARGS+= --with-mysql-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-mysql-include-dir=${LOCALBASE}/include/mysql
.else
CONFIGURE_ARGS+= --without-rlm_sql_mysql
.endif
LIB_DEPENDS-mysql= databases/mariadb
WANTLIB-mysql= crypto ssl m pthread z mysqlclient_r
WANTLIB-mysql= mariadb
RUN_DEPENDS-mysql= #empty
# rlm_sql_postgresql
.if ${BUILD_PACKAGES:M-pgsql}
CONFIGURE_ARGS+= --with-rlm-sql-postgresql-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql
.else
CONFIGURE_ARGS+= --without-rlm_sql_postgresql
.endif
LIB_DEPENDS-pgsql= databases/postgresql
WANTLIB-pgsql= pq>=2
WANTLIB-pgsql= pq
RUN_DEPENDS-pgsql= #empty
.for i in ${MULTI_PACKAGES:N-main}
RUN_DEPENDS$i += freeradius-$V:net/freeradius
WANTLIB$i ?= #empty
.endfor
FAKE_FLAGS= raddbdir=${WRKINST}${PREFIX}/share/examples/freeradius
FREERADIUS_ETC= ${SYSCONFDIR}/raddb
SUBST_VARS= FREERADIUS_ETC
MAKE_FLAGS= PACKAGE=openbsd VERBOSE=1
FAKE_FLAGS= VERBOSE=1 R=${WRKINST} \
raddbdir=${PREFIX}/share/examples/freeradius
post-configure:
perl -pi -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
${SUBST_CMD} ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure
sed -i -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
sed -i -e 's,/usr/local,${TRUEPREFIX},g' ${WRKSRC}/doc/README
rm ${WRKSRC}/doc/README${PATCHORIG}
# pre-create examples dir, otherwise build tries to create it twice and fails.
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freeradius
post-install:
.for f in bin/radlast bin/radtest sbin/checkrad sbin/radwatch \
share/examples/freeradius/dictionary share/examples/freeradius/radiusd.conf
perl -pi -e 's,\$$\{DESTDIR},,g' ${PREFIX}/$f
.endfor
rm ${PREFIX}/lib/freeradius/*.la ${PREFIX}/lib/freeradius/*.a \
${PREFIX}/lib/libfreeradius-eap-*.la
pre-test:
perl -pi -e 's,\$${DESTDIR},${DESTDIR},g' ${WRKSRC}/raddb/radiusd.conf
rm ${PREFIX}/lib/freeradius/*.*a
rm -r \
${PREFIX}/share/examples/freeradius/mods-config/sql/*/oracle \
${PREFIX}/share/examples/freeradius/mods-config/sql/*/mongo \
${PREFIX}/share/doc/freeradius/antora
chmod -R u+rwX,og+rX ${PREFIX}/share/examples/freeradius/
${SUBST_CMD} -c -m 555 ${FILESDIR}/freeradius-enable.sh \
${PREFIX}/share/freeradius/freeradius-enable.sh
rm ${PREFIX}/share/examples/freeradius/mods-available/eap${PATCHORIG}
.include <bsd.port.mk>

4
net/freeradius/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freeradius-server-2.2.10.tar.bz2) = pGtFzSPu+rDd3XURYgPSioZrSeoNkgByXypZfsvE1Mg=
SIZE (freeradius-server-2.2.10.tar.bz2) = 2794367
SHA256 (freeradius-server-3.0.23.tar.bz2) = CM5Cvw7CF3BMoWNhnAbvyuim1qiuemJtd9qab9IQ4jU=
SIZE (freeradius-server-3.0.23.tar.bz2) = 3381917

9
net/freeradius3/files/freeradius-enable.sh → net/freeradius/files/freeradius-enable.sh
View File

@ -7,6 +7,15 @@ if [[ $1 != firstrun ]]; then
exit 1
fi
if [[ -e ${FREERADIUS_ETC}/attrs ]]; then
echo You have a file indicating that you are trying to upgrade from
echo FreeRADIUS 2.x to 3.x with existing configuration. You should move
echo ${FREERADIUS_ETC} out of the way, reinstall, and rebuild configuration
echo based on your old setup. For more information, see
echo https://github.com/FreeRADIUS/freeradius-server/blob/v3.0.x/raddb/README.rst
exit 1
fi
# if any of these exist, we are already configured and should bail out
if [[ -e ${FREERADIUS_ETC}/hints || -e ${FREERADIUS_ETC}/huntgroups || \
-e ${FREERADIUS_ETC}/users || -e ${FREERADIUS_ETC}/certs/server.pem || \

26
net/freeradius/patches/patch-Makefile
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-Makefile,v 1.7 2014/07/17 00:20:51 sthen Exp $
--- Makefile.orig Mon Apr 28 20:13:08 2014
+++ Makefile Wed Jul 9 00:38:52 2014
@@ -45,14 +45,6 @@ test:
#
export DESTDIR := $(R)
install:
- $(INSTALL) -d -m 755 $(R)$(sbindir)
- $(INSTALL) -d -m 755 $(R)$(bindir)
- $(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 755 $(R)$(datadir)
$(INSTALL) -d -m 755 $(R)$(dictdir)
for i in 1 5 8; do \
$(INSTALL) -d -m 755 $(R)$(mandir)/man$$i; \
@@ -66,7 +58,6 @@ install:
for i in dictionary*; do \
$(INSTALL) -m 644 $$i $(R)$(dictdir); \
done
- $(LIBTOOL) --finish $(R)$(libdir)
ifneq ($(RADMIN),)
ifneq ($(RGROUP),)

2
net/freeradius3/patches/patch-configure → net/freeradius/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.10 2021/05/26 12:12:38 sthen Exp $
$OpenBSD: patch-configure,v 1.9 2021/09/16 10:36:38 sthen Exp $
Don't allow picking up collectdclient, freeradius autoconf's "smart"
library detection doesn't offer a nice way to do it.

2
net/freeradius3/patches/patch-doc_README → net/freeradius/patches/patch-doc_README
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-doc_README,v 1.3 2018/04/19 20:48:31 sthen Exp $
$OpenBSD: patch-doc_README,v 1.1 2021/09/16 10:36:38 sthen Exp $
Be explicit about the path; there is also /usr/sbin/radiusd in base.

37
net/freeradius/patches/patch-raddb_certs_Makefile
View File

@ -1,23 +1,36 @@
$OpenBSD: patch-raddb_certs_Makefile,v 1.1 2015/11/03 22:54:23 sthen Exp $
$OpenBSD: patch-raddb_certs_Makefile,v 1.2 2021/09/16 10:36:38 sthen Exp $
don't rely on gmake
Don't rely on gmake.
--- raddb/certs/Makefile.orig Mon Nov 2 23:15:54 2015
+++ raddb/certs/Makefile Mon Nov 2 23:16:14 2015
@@ -34,11 +34,11 @@ ca: ca.der
server: server.pem server.vrfy
Index: raddb/certs/Makefile
--- raddb/certs/Makefile.orig
+++ raddb/certs/Makefile
@@ -20,7 +20,12 @@ endif
#
# Set the passwords
#
-include passwords.mk
+PASSWORD_SERVER!= grep output_password server.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_INNER!= grep output_password inner-server.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_CA!= grep output_password ca.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_CLIENT!= grep output_password client.cnf | sed 's/.*=//;s/^ *//'
+USER_NAME!= grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//'
+CA_DEFAULT_DAYS!= grep default_days ca.cnf | sed 's/.*=//;s/^ *//'
passwords.mk: server.cnf ca.cnf client.cnf
######################################################################
#
@@ -44,14 +49,6 @@ inner-server: inner-server.pem inner-server.vrfy
.PHONY: verify
verify: server.vrfy client.vrfy
-
-passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf
- @echo "PASSWORD_SERVER = '$(shell grep output_password server.cnf | sed 's/.*=//;s/^ *//')'" > $@
- @echo "PASSWORD_INNER = '$(shell grep output_password inner-server.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "PASSWORD_CA = '$(shell grep output_password ca.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "PASSWORD_CLIENT = '$(shell grep output_password client.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "USER_NAME = '$(shell grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "CA_DEFAULT_DAYS = '$(shell grep default_days ca.cnf | sed 's/.*=//;s/^ *//')'" >> $@
+ echo "PASSWORD_SERVER = '`grep output_password server.cnf | sed 's/.*=//;s/^ *//'`'" > $@
+ echo "PASSWORD_CA = '`grep output_password ca.cnf | sed 's/.*=//;s/^ *//'`'" >> $@
+ echo "PASSWORD_CLIENT = '`grep output_password client.cnf | sed 's/.*=//;s/^ *//'`'" >> $@
+ echo "USER_NAME = '`grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//'`'" >> $@
+ echo "CA_DEFAULT_DAYS = '`grep default_days ca.cnf | sed 's/.*=//;s/^ *//'`'" >> $@
######################################################################
#

2
net/freeradius3/patches/patch-raddb_mods-available_eap → net/freeradius/patches/patch-raddb_mods-available_eap
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-raddb_mods-available_eap,v 1.1 2021/07/07 12:28:42 sthen Exp $
$OpenBSD: patch-raddb_mods-available_eap,v 1.1 2021/09/16 10:36:38 sthen Exp $
This text appears to be to cover OS like Debian where unless overridden
the default cipher list is "DEFAULT@SECLEVEL=2" which disables TLS 1.0/1.1

89
net/freeradius/patches/patch-raddb_radiusd_conf_in
View File

@ -1,82 +1,25 @@
$OpenBSD: patch-raddb_radiusd_conf_in,v 1.14 2015/06/23 21:38:06 sthen Exp $
--- raddb/radiusd.conf.in.orig Wed Apr 22 18:31:54 2015
+++ raddb/radiusd.conf.in Mon Jun 22 09:30:57 2015
@@ -103,7 +103,7 @@ db_dir = ${raddbdir}
$OpenBSD: patch-raddb_radiusd_conf_in,v 1.15 2021/09/16 10:36:38 sthen Exp $
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig
+++ raddb/radiusd.conf.in
@@ -135,7 +135,7 @@ db_dir = ${raddbdir}
# make
# make install
#
-libdir = @libdir@
+libdir = @libdir@/freeradius
+libdir = @libdir@/freeradius
# pidfile: Where to place the PID of the RADIUS server.
#
@@ -164,8 +164,8 @@ pidfile = ${run_dir}/${name}.pid
# It will join all groups where "user" is a member. This can allow
# for some finer-grained access controls.
#
-#user = radius
-#group = radius
+user = _freeradius
+group = _freeradius
# panic_action: Command to execute if the server dies unexpectedly.
#
@@ -576,8 +576,8 @@ security {
#
# allowed values: {no, yes}
#
-proxy_requests = yes
-$INCLUDE proxy.conf
+proxy_requests = no
+#$INCLUDE ${confdir}/proxy.conf
# CLIENTS CONFIGURATION
@@ -593,7 +593,7 @@ $INCLUDE proxy.conf
# Anything listed in 'clients.conf' will take precedence over the
# information from the old-style configuration files.
#
-$INCLUDE clients.conf
+$INCLUDE ${confdir}/clients.conf
# THREAD POOL CONFIGURATION
@@ -727,12 +727,12 @@ modules {
# For all EAP related authentications.
# Now in another file, because it is very large.
@@ -531,8 +531,8 @@ security {
# member. This can allow for some finer-grained access
# controls.
#
- $INCLUDE eap.conf
+ $INCLUDE ${confdir}/eap.conf
-# user = radius
-# group = radius
+ user = _freeradius
+ group = _freeradius
# Include another file that has the SQL-related configuration.
# This is another file only because it tends to be big.
#
-# $INCLUDE sql.conf
+# $INCLUDE ${confdir}/sql.conf
#
# This module is an SQL enabled version of the counter module.
@@ -744,12 +744,12 @@ modules {
# totally dependent on the SQL module to process Accounting
# packets.
#
-# $INCLUDE sql/mysql/counter.conf
+# $INCLUDE ${confdir}/sql/mysql/counter.conf
#
# IP addresses managed in an SQL table.
#
-# $INCLUDE sqlippool.conf
+# $INCLUDE ${confdir}/sqlippool.conf
}
# Instantiation
@@ -823,7 +823,7 @@ instantiate {
# to multiple times.
#
######################################################################
-$INCLUDE policy.conf
+$INCLUDE ${confdir}/policy.conf
######################################################################
#
# Core dumps are a bad thing. This should only be set to
# 'yes' if you're debugging a problem with the server.

2
net/freeradius3/patches/patch-scripts_libtool_mk → net/freeradius/patches/patch-scripts_libtool_mk
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-scripts_libtool_mk,v 1.2 2015/12/10 09:56:45 sthen Exp $
$OpenBSD: patch-scripts_libtool_mk,v 1.1 2021/09/16 10:36:38 sthen Exp $
Don't hide command lines.

12
net/freeradius/patches/patch-src_lib_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_lib_Makefile,v 1.8 2014/07/17 00:20:51 sthen Exp $
--- src/lib/Makefile.orig Mon Apr 28 20:13:08 2014
+++ src/lib/Makefile Wed Jul 9 00:39:27 2014
@@ -41,7 +41,7 @@ TARGET = $(LIBPREFIX)freeradius-radius
all: $(TARGET).la
$(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION) \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) \
$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
$(LT_OBJS): $(INCLUDES)

2
net/freeradius3/patches/patch-src_main_cb_c → net/freeradius/patches/patch-src_main_cb_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_main_cb_c,v 1.2 2021/07/07 12:28:42 sthen Exp $
$OpenBSD: patch-src_main_cb_c,v 1.1 2021/09/16 10:36:39 sthen Exp $
Index: src/main/cb.c
--- src/main/cb.c.orig

2
net/freeradius3/patches/patch-src_main_detail_c → net/freeradius/patches/patch-src_main_detail_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_main_detail_c,v 1.6 2021/05/26 12:12:38 sthen Exp $
$OpenBSD: patch-src_main_detail_c,v 1.1 2021/09/16 10:36:39 sthen Exp $
Cope with 32-bit arch with 64-bit time variables.

122
net/freeradius/patches/patch-src_main_radsniff_c
View File

@ -1,23 +1,103 @@
$OpenBSD: patch-src_main_radsniff_c,v 1.3 2014/04/13 20:16:03 ajacoutot Exp $
--- src/main/radsniff.c.orig Mon Sep 10 13:51:34 2012
+++ src/main/radsniff.c Sun Apr 13 17:43:53 2014
@@ -40,7 +40,7 @@ static VALUE_PAIR *filter_vps = NULL;
$OpenBSD: patch-src_main_radsniff_c,v 1.4 2021/09/16 10:36:39 sthen Exp $
OpenBSD libpcap uses nonstandard "bpf_timeval" variables which are a
different size to timeval on some arch..
This patch is enough to let it build but is incomplete and unlikely to
allow radsniff to actually work.
Index: src/main/radsniff.c
--- src/main/radsniff.c.orig
+++ src/main/radsniff.c
@@ -1003,7 +1003,8 @@ static inline int rs_request_to_pcap(rs_event_t *event
#define RS_CLEANUP_NOW(_x, _s)\
{\
_x->silent_cleanup = _s;\
- _x->when = header->ts;\
+ _x->when.tv_sec = header->ts.tv_sec;\
+ _x->when.tv_usec = header->ts.tv_usec;\
rs_packet_cleanup(_x);\
_x = NULL;\
} while (0)
@@ -1038,10 +1039,12 @@ static void rs_packet_process(uint64_t count, rs_event
memset(&search, 0, sizeof(search));
static int minimal = 0;
static int do_sort = 0;
-struct timeval start_pcap = {0, 0};
+struct bpf_timeval start_pcap = {0, 0};
static rbtree_t *filter_tree = NULL;
static rbtree_t *request_tree = NULL;
static pcap_dumper_t *pcap_dumper = NULL;
@@ -165,8 +165,8 @@ static void sort(RADIUS_PACKET *packet)
}
if (!start_pcap.tv_sec) {
- start_pcap = header->ts;
+ start_pcap.tv_sec = header->ts.tv_sec;
+ start_pcap.tv_usec = header->ts.tv_usec;
}
if (RIDEBUG_ENABLED()) {
+ /* XXX convert pcap timeval */
rs_time_print(timestr, sizeof(timestr), &header->ts);
}
@@ -1135,11 +1138,13 @@ static void rs_packet_process(uint64_t count, rs_event
current = rad_alloc(conf, false);
if (!current) {
REDEBUG("Failed allocating memory to hold decoded packet");
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
return;
}
- current->timestamp = header->ts;
+ current->timestamp.tv_sec = header->ts.tv_sec;
+ current->timestamp.tv_usec = header->ts.tv_usec;
current->data_len = header->caplen - (p - data);
memcpy(&current->data, &p, sizeof(current->data));
@@ -1259,6 +1264,7 @@ static void rs_packet_process(uint64_t count, rs_event
* The delay is so we can detect retransmissions.
*/
original->linked = talloc_steal(original, current);
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original, &original->when,
&original->event)) {
@@ -1339,6 +1345,7 @@ static void rs_packet_process(uint64_t count, rs_event
search.expect = rad_alloc_reply(current, current);
if (!search.expect) {
REDEBUG("Failed allocating memory to hold expected reply");
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
rad_free(&current);
return;
@@ -1489,7 +1496,9 @@ static void rs_packet_process(uint64_t count, rs_event
/*
* Insert a callback to remove the request from the tree
*/
- original->packet->timestamp = header->ts;
+ original->packet->timestamp.tv_sec = header->ts.tv_sec;
+ original->packet->timestamp.tv_usec = header->ts.tv_usec;
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original,
&original->when, &original->event)) {
@@ -1510,6 +1519,7 @@ static void rs_packet_process(uint64_t count, rs_event
return;
}
+ /* XXX convert pcap timeval */
rs_tv_sub(&header->ts, &start_pcap, &elapsed);
/*
@@ -1539,6 +1549,7 @@ static void rs_packet_process(uint64_t count, rs_event
* Were filtering on response, now print out the full data from the request
*/
if (conf->filter_response && RIDEBUG_ENABLED() && (conf->event_flags & RS_NORMAL)) {
+ /* XXX convert pcap timeval */
rs_time_print(timestr, sizeof(timestr), &original->packet->timestamp);
rs_tv_sub(&original->packet->timestamp, &start_pcap, &elapsed);
rs_packet_print(original, original->id, RS_NORMAL, original->in,
@@ -1621,7 +1632,8 @@ static void rs_got_packet(fr_event_list_t *el, int fd,
}
do {
- now = header->ts;
+ now.tv_sec = header->ts.tv_sec;
+ now.tv_usec = header->ts.tv_usec;
} while (fr_event_run(el, &now) == 1);
count++;
#define USEC 1000000
-static void tv_sub(const struct timeval *end, const struct timeval *start,
- struct timeval *elapsed)
+static void tv_sub(const struct bpf_timeval *end, const struct bpf_timeval *start,
+ struct bpf_timeval *elapsed)
{
elapsed->tv_sec = end->tv_sec - start->tv_sec;
if (elapsed->tv_sec > 0) {

2
net/freeradius3/patches/patch-src_main_tls_c → net/freeradius/patches/patch-src_main_tls_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_main_tls_c,v 1.11 2021/07/07 12:28:42 sthen Exp $
$OpenBSD: patch-src_main_tls_c,v 1.1 2021/09/16 10:36:39 sthen Exp $
Index: src/main/tls.c
--- src/main/tls.c.orig

12
net/freeradius/patches/patch-src_modules_rlm_eap_libeap_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_libeap_Makefile,v 1.7 2014/07/17 00:20:51 sthen Exp $
--- src/modules/rlm_eap/libeap/Makefile.orig Mon Apr 28 20:13:08 2014
+++ src/modules/rlm_eap/libeap/Makefile Wed Jul 9 00:39:47 2014
@@ -27,7 +27,7 @@ TARGET = $(LIBPREFIX)freeradius-eap
all: $(TARGET).la
$(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) \
$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ \
$(LIBRADIUS) $(LIBS)
@for x in .libs/* $^; do \

58
net/freeradius/patches/patch-src_modules_rlm_eap_libeap_eap_tls_c
View File

@ -1,58 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_libeap_eap_tls_c,v 1.1 2021/06/22 14:01:21 tb Exp $
Use SSL_get_session() instead of reaching into the SSL struct.
Index: src/modules/rlm_eap/libeap/eap_tls.c
--- src/modules/rlm_eap/libeap/eap_tls.c.orig
+++ src/modules/rlm_eap/libeap/eap_tls.c
@@ -129,7 +129,7 @@ int eaptls_success(EAP_HANDLER *handler, int peap_flag
(((vp = pairfind(request->config_items, 1127)) != NULL) &&
(vp->vp_integer == 0))) {
SSL_CTX_remove_session(tls_session->ctx,
- tls_session->ssl->session);
+ SSL_get_session(tls_session->ssl));
tls_session->allow_session_resumption = 0;
/*
@@ -167,12 +167,12 @@ int eaptls_success(EAP_HANDLER *handler, int peap_flag
}
if (vps) {
- SSL_SESSION_set_ex_data(tls_session->ssl->session,
+ SSL_SESSION_set_ex_data(SSL_get_session(tls_session->ssl),
eaptls_session_idx, vps);
} else {
RDEBUG2("WARNING: No information to cache: session caching will be disabled for this session.");
SSL_CTX_remove_session(tls_session->ctx,
- tls_session->ssl->session);
+ SSL_get_session(tls_session->ssl));
}
/*
@@ -181,7 +181,7 @@ int eaptls_success(EAP_HANDLER *handler, int peap_flag
*/
} else {
- vps = SSL_SESSION_get_ex_data(tls_session->ssl->session,
+ vps = SSL_SESSION_get_ex_data(SSL_get_session(tls_session->ssl),
eaptls_session_idx);
if (!vps) {
RDEBUG("WARNING: No information in cached session!");
@@ -248,7 +248,7 @@ int eaptls_fail(EAP_HANDLER *handler, int peap_flag)
/*
* Force the session to NOT be cached.
*/
- SSL_CTX_remove_session(tls_session->ctx, tls_session->ssl->session);
+ SSL_CTX_remove_session(tls_session->ctx, SSL_get_session(tls_session->ssl));
eaptls_compose(handler->eap_ds, &reply);
@@ -792,7 +792,7 @@ static eaptls_status_t eaptls_operation(eaptls_status_
*/
if (!tls_handshake_recv(handler->request, tls_session)) {
DEBUG2("TLS receive handshake failed during operation");
- SSL_CTX_remove_session(tls_session->ctx, tls_session->ssl->session);
+ SSL_CTX_remove_session(tls_session->ctx, SSL_get_session(tls_session->ssl));
return EAPTLS_FAIL;
}

54
net/freeradius/patches/patch-src_modules_rlm_eap_libeap_mppe_keys_c
View File

@ -1,54 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_libeap_mppe_keys_c,v 1.2 2021/06/22 14:01:21 tb Exp $
Index: src/modules/rlm_eap/libeap/mppe_keys.c
--- src/modules/rlm_eap/libeap/mppe_keys.c.orig
+++ src/modules/rlm_eap/libeap/mppe_keys.c
@@ -135,10 +135,12 @@ void eaptls_gen_mppe_keys(VALUE_PAIR **reply_vps, SSL
unsigned char *p;
size_t prf_size;
+#ifndef LIBRESSL_VERSION_NUMBER
if (!s->s3) {
DEBUG("ERROR: No SSLv3 information");
return;
}
+#endif
prf_size = strlen(prf_label);
@@ -194,10 +196,12 @@ void eapttls_gen_challenge(SSL *s, uint8_t *buffer, si
uint8_t *p = seed;
#endif
+#ifndef LIBRESSL_VERSION_NUMBER
if (!s->s3) {
DEBUG("ERROR: No SSLv3 information");
return;
}
+#endif
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
SSL_export_keying_material(s, buffer, size, EAPTLS_PRF_CHALLENGE,
@@ -224,18 +228,19 @@ void eaptls_gen_eap_key(SSL *s, uint32_t header, VALUE
{
VALUE_PAIR *vp;
+#ifndef LIBRESSL_VERSION_NUMBER
if (!s->s3) {
DEBUG("ERROR: No SSLv3 information");
return;
}
+#endif
vp = paircreate(PW_EAP_SESSION_ID, PW_TYPE_OCTETS);
if (!vp) return;
vp->vp_octets[0] = header & 0xff;
- memcpy(vp->vp_octets + 1, s->s3->client_random, SSL3_RANDOM_SIZE);
- memcpy(vp->vp_octets + 1 + SSL3_RANDOM_SIZE,
- s->s3->server_random, SSL3_RANDOM_SIZE);
+ SSL_get_client_random(s, vp->vp_octets + 1, SSL3_RANDOM_SIZE);
+ SSL_get_server_random(s, vp->vp_octets + 1 + SSL3_RANDOM_SIZE, SSL3_RANDOM_SIZE);
vp->length = 1 + 2 * SSL3_RANDOM_SIZE;
pairadd(vps, vp);
}

2
net/freeradius3/patches/patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c → net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c,v 1.3 2021/07/07 12:28:42 sthen Exp $
$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_fast_rlm_eap_fast_c,v 1.1 2021/09/16 10:36:39 sthen Exp $
Index: src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
--- src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c.orig

41
net/freeradius/patches/patch-src_modules_rlm_eap_types_rlm_eap_tls_rlm_eap_tls_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_tls_rlm_eap_tls_c,v 1.4 2021/05/10 14:53:33 tb Exp $
Index: src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
--- src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c.orig
+++ src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -228,12 +228,15 @@ static int generate_eph_rsa_key(SSL_CTX *ctx)
static void cbtls_remove_session(UNUSED SSL_CTX *ctx, SSL_SESSION *sess)
{
size_t size;
+ const unsigned char *session_id;
+ unsigned int session_id_length;
char buffer[2 * MAX_SESSION_SIZE + 1];
- size = sess->session_id_length;
+ session_id = SSL_SESSION_get_id(sess, &session_id_length);
+ size = session_id_length;
if (size > MAX_SESSION_SIZE) size = MAX_SESSION_SIZE;
- fr_bin2hex(sess->session_id, buffer, size);
+ fr_bin2hex(session_id, buffer, size);
DEBUG2(" SSL: Removing session %s from the cache", buffer);
SSL_SESSION_free(sess);
@@ -244,12 +247,15 @@ static void cbtls_remove_session(UNUSED SSL_CTX *ctx,
static int cbtls_new_session(UNUSED SSL *s, SSL_SESSION *sess)
{
size_t size;
+ const unsigned char *session_id;
+ unsigned int session_id_length;
char buffer[2 * MAX_SESSION_SIZE + 1];
- size = sess->session_id_length;
+ session_id = SSL_SESSION_get_id(sess, &session_id_length);
+ size = session_id_length;
if (size > MAX_SESSION_SIZE) size = MAX_SESSION_SIZE;
- fr_bin2hex(sess->session_id, buffer, size);
+ fr_bin2hex(session_id, buffer, size);
DEBUG2(" SSL: adding session %s to cache", buffer);

2
net/freeradius3/patches/patch-src_modules_rlm_pap_rlm_pap_c → net/freeradius/patches/patch-src_modules_rlm_pap_rlm_pap_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_modules_rlm_pap_rlm_pap_c,v 1.1 2021/05/26 12:12:38 sthen Exp $
$OpenBSD: patch-src_modules_rlm_pap_rlm_pap_c,v 1.1 2021/09/16 10:36:39 sthen Exp $
Index: src/modules/rlm_pap/rlm_pap.c
--- src/modules/rlm_pap/rlm_pap.c.orig

12
net/freeradius/patches/patch-src_modules_rlm_perl_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_modules_rlm_perl_Makefile_in,v 1.3 2008/01/21 22:21:24 rui Exp $
--- src/modules/rlm_perl/Makefile.in.orig Sun Jan 22 21:46:41 2006
+++ src/modules/rlm_perl/Makefile.in Mon Jan 21 16:21:31 2008
@@ -7,7 +7,7 @@ SRCS = rlm_perl.c
HEADERS =
RLM_CFLAGS = @perl_cflags@
RLM_LIBS = @perl_ldflags@
-RLM_INSTALL = install-scripts
+RLM_INSTALL =
## this uses the RLM_CFLAGS and RLM_LIBS and SRCS defs to make TARGET.
include ../rules.mak

12
net/freeradius/patches/patch-src_modules_rlm_sql_drivers_rlm_sql_iodbc_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_modules_rlm_sql_drivers_rlm_sql_iodbc_configure,v 1.2 2014/04/13 20:16:03 ajacoutot Exp $
--- src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.orig Mon Sep 10 13:51:34 2012
+++ src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure Sun Apr 13 17:43:53 2014
@@ -2639,7 +2639,7 @@ smart_lib=
smart_lib_dir=
if test "x$smart_try_dir" != "x"; then
- for try in $smart_try_dir; do
+ for try in $smart_try_dir ${LOCALBASE}/lib; do
LIBS="-L$try -liodbc $old_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */

24
net/freeradius/patches/patch-src_modules_rlm_sql_drivers_rules_mak
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_modules_rlm_sql_drivers_rules_mak,v 1.7 2014/07/17 00:20:51 sthen Exp $
--- src/modules/rlm_sql/drivers/rules.mak.orig Mon Apr 28 20:13:08 2014
+++ src/modules/rlm_sql/drivers/rules.mak Wed Jul 9 00:41:22 2014
@@ -101,9 +101,9 @@ build-module: $(TARGET).la
done
$(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) -avoid-version \
-module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
- -rpath $(libdir) $^ $(RLM_SQL_LIBS)
+ -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
#######################################################################
#
@@ -146,7 +146,5 @@ reconfig:
install:
if [ "x$(TARGET)" != "x" ]; then \
$(LIBTOOL) --mode=install $(INSTALL) -c \
- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
+ $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
fi

8
net/freeradius/patches/patch-src_modules_rlm_unix_rlm_unix_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_modules_rlm_unix_rlm_unix_c,v 1.1 2015/11/19 14:19:05 sthen Exp $
--- src/modules/rlm_unix/rlm_unix.c.orig Thu Nov 19 14:13:04 2015
+++ src/modules/rlm_unix/rlm_unix.c Thu Nov 19 14:13:38 2015
@@ -211,7 +211,7 @@ static int unix_getpw(UNUSED void *instance, REQUEST *
$OpenBSD: patch-src_modules_rlm_unix_rlm_unix_c,v 1.2 2021/09/16 10:36:39 sthen Exp $
--- src/modules/rlm_unix/rlm_unix.c.orig Thu Nov 19 14:13:59 2015
+++ src/modules/rlm_unix/rlm_unix.c Thu Nov 19 14:14:18 2015
@@ -218,7 +218,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(UNUS
return RLM_MODULE_USERLOCK;
}
#else /* OSFC2 */

24
net/freeradius/patches/patch-src_modules_rules_mak
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_modules_rules_mak,v 1.10 2014/07/17 00:20:51 sthen Exp $
--- src/modules/rules.mak.orig Mon Apr 28 20:13:08 2014
+++ src/modules/rules.mak Wed Jul 9 00:42:45 2014
@@ -120,9 +120,9 @@ build-module: $(TARGET).la $(RLM_UTILS)
done
$(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS)
- $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \
+ $(LIBTOOL) --mode=link --tag=CC $(CC) -avoid-version \
-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
- -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
+ -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
#######################################################################
#
@@ -169,7 +169,5 @@ install:
@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
if [ "x$(TARGET)" != "x" ]; then \
$(LIBTOOL) --mode=install $(INSTALL) -c \
- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \
- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \
+ $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
fi

2
net/freeradius3/patches/patch-src_modules_stable → net/freeradius/patches/patch-src_modules_stable
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_modules_stable,v 1.1 2021/07/07 12:28:42 sthen Exp $
$OpenBSD: patch-src_modules_stable,v 1.1 2021/09/16 10:36:39 sthen Exp $
Index: src/modules/stable
--- src/modules/stable.orig

9
net/freeradius/patches/patch-src_tests_runtests_sh
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-src_tests_runtests_sh,v 1.1 2010/05/17 16:39:25 sthen Exp $
--- src/tests/runtests.sh.orig Mon May 10 23:28:35 2010
+++ src/tests/runtests.sh Mon May 10 23:28:20 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
PORT=12340
HOME_PORT=12350

0
net/freeradius3/pkg/DESCR-freetds → net/freeradius/pkg/DESCR-freetds
View File

22
net/freeradius/pkg/DESCR-main
View File

@ -1,8 +1,14 @@
FreeRADIUS is an Internet authentication daemon, which implements
the RADIUS protocol, as defined in RFC 2865 (and others). It allows
Network Access Servers (NAS boxes) to perform authentication for
dial-up users. There are also RADIUS clients available for Web
servers, firewalls, Unix logins, and more. Using RADIUS allows
authentication and authorization for a network to be centralized, and
minimizes the amount of re-configuration which has to be done when
adding or deleting new users.
RADIUS, which stands for "Remote Authentication Dial In User Service",
is a network protocol - a system that defines rules and conventions for
communication between network devices - for remote user authentication
and accounting. Commonly used by Internet Service Providers (ISPs),
cellular network providers, and corporate and educational networks, the
RADIUS protocol serves three primary functions:
* Authenticates users or devices before allowing them access to a network
* Authorizes those users or devices for specific network services
* Accounts for and tracks the usage of those services
FreeRADIUS is a modular open-source implementation of the RADIUS protocol
featuring numerous authentication types, including Extensible Authentication
Protocol (EAP), support for virtual servers and more.

0
net/freeradius3/pkg/DESCR-memcached → net/freeradius/pkg/DESCR-memcached
View File

0
net/freeradius3/pkg/DESCR-python → net/freeradius/pkg/DESCR-python
View File

0
net/freeradius3/pkg/DESCR-python3 → net/freeradius/pkg/DESCR-python3
View File

3
net/freeradius/pkg/PLIST-freetds Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-freetds,v 1.1 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-freetds
@so lib/freeradius/rlm_sql_freetds.so

43
net/freeradius/pkg/PLIST-iodbc
View File

@ -1,9 +1,34 @@
@comment $OpenBSD: PLIST-iodbc,v 1.6 2016/06/29 16:14:43 espie Exp $
@option is-branch
@conflict freeradius-iodbc-*
lib/freeradius/rlm_sql_iodbc.so
share/doc/freeradius/mssql
share/examples/freeradius/sql/mssql/
@mode 640
share/examples/freeradius/sql/mssql/dialup.conf
share/examples/freeradius/sql/mssql/schema.sql
@comment $OpenBSD: PLIST-iodbc,v 1.7 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-iodbc
@so lib/freeradius/rlm_sql_iodbc.so
@group _freeradius
share/examples/freeradius/mods-config/sql/dhcp/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/
share/examples/freeradius/mods-config/sql/dhcp/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/schema.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/
share/examples/freeradius/mods-config/sql/ippool/mssql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/schema.sql
share/examples/freeradius/mods-config/sql/main/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/
share/examples/freeradius/mods-config/sql/main/mssql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/queries.conf
share/examples/freeradius/mods-config/sql/main/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/schema.sql

39
net/freeradius/pkg/PLIST-ldap
View File

@ -1,15 +1,24 @@
@comment $OpenBSD: PLIST-ldap,v 1.7 2016/06/29 16:14:43 espie Exp $
@option is-branch
@conflict freeradius-ldap-*
@conflict freeradius-server-<2.1.8
lib/freeradius/rlm_ldap.so
share/doc/freeradius/examples/iplanet.ldif
share/doc/freeradius/examples/iplanet.schema
share/doc/freeradius/examples/openldap.schema
share/doc/freeradius/ldap_howto.rst
share/doc/freeradius/rlm_ldap
@mode 640
share/examples/freeradius/ldap.attrmap
@sample ${SYSCONFDIR}/raddb/ldap.attrmap
share/examples/freeradius/modules/ldap
@sample ${SYSCONFDIR}/raddb/modules/ldap
@comment $OpenBSD: PLIST-ldap,v 1.8 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-ldap
@so lib/freeradius/rlm_ldap.so
share/doc/freeradius/schemas/ldap/
share/doc/freeradius/schemas/ldap/edir/
share/doc/freeradius/schemas/ldap/edir/freeradius-clients.ldif
share/doc/freeradius/schemas/ldap/iplanet/
share/doc/freeradius/schemas/ldap/iplanet/freeradius.ldif
share/doc/freeradius/schemas/ldap/iplanet/freeradius.schema
share/doc/freeradius/schemas/ldap/openldap/
share/doc/freeradius/schemas/ldap/openldap/freeradius-clients.ldif
share/doc/freeradius/schemas/ldap/openldap/freeradius-clients.schema
share/doc/freeradius/schemas/ldap/openldap/freeradius.ldif
share/doc/freeradius/schemas/ldap/openldap/freeradius.schema
share/doc/freeradius/schemas/ldap/samba/
share/doc/freeradius/schemas/ldap/samba/README.txt
share/doc/freeradius/schemas/ldap/samba/freeradius-attrs.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-classes.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-clients-attrs.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-clients-classes.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-user.ldif
@group _freeradius
share/examples/freeradius/mods-available/ldap
@sample ${FREERADIUS_ETC}/mods-available/ldap

938
net/freeradius/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

3
net/freeradius/pkg/PLIST-memcached Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-memcached,v 1.1 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-memcached
@so lib/freeradius/rlm_cache_memcached.so

117
net/freeradius/pkg/PLIST-mysql
View File

@ -1,37 +1,80 @@
@comment $OpenBSD: PLIST-mysql,v 1.10 2016/06/29 16:14:43 espie Exp $
@option is-branch
@conflict freeradius-mysql-*
@conflict freeradius-server-<2.2.9p1
lib/freeradius/rlm_sql_mysql.so
@mode 640
share/examples/freeradius/modules/dhcp_sqlippool
@sample ${SYSCONFDIR}/raddb/modules/dhcp_sqlippool
@mode
share/examples/freeradius/sql/mysql/
@mode 750
@sample ${SYSCONFDIR}/raddb/sql/mysql/
@mode 640
share/examples/freeradius/sql/mysql/admin.sql
share/examples/freeradius/sql/mysql/counter.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
share/examples/freeradius/sql/mysql/cui.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/cui.conf
share/examples/freeradius/sql/mysql/cui.sql
share/examples/freeradius/sql/mysql/dialup.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/dialup.conf
share/examples/freeradius/sql/mysql/ippool-dhcp.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool-dhcp.conf
share/examples/freeradius/sql/mysql/ippool.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/ippool.conf
share/examples/freeradius/sql/mysql/ippool.sql
share/examples/freeradius/sql/mysql/nas.sql
share/examples/freeradius/sql/mysql/schema.sql
share/examples/freeradius/sql/mysql/wimax.conf
@sample ${SYSCONFDIR}/raddb/sql/mysql/wimax.conf
share/examples/freeradius/sql/mysql/wimax.sql
@mode 750
share/examples/freeradius/sql/ndb/
@mode 640
share/examples/freeradius/sql/ndb/README
share/examples/freeradius/sql/ndb/admin.sql
share/examples/freeradius/sql/ndb/schema.sql
@comment $OpenBSD: PLIST-mysql,v 1.11 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-mysql
@so lib/freeradius/rlm_sql_mysql.so
@group _freeradius
share/examples/freeradius/mods-config/sql/counter/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/
share/examples/freeradius/mods-config/sql/counter/mysql/dailycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/dailycounter.conf
share/examples/freeradius/mods-config/sql/counter/mysql/expire_on_login.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/expire_on_login.conf
share/examples/freeradius/mods-config/sql/counter/mysql/monthlycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/monthlycounter.conf
share/examples/freeradius/mods-config/sql/counter/mysql/noresetcounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/noresetcounter.conf
share/examples/freeradius/mods-config/sql/cui/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/
share/examples/freeradius/mods-config/sql/cui/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/queries.conf
share/examples/freeradius/mods-config/sql/cui/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/
share/examples/freeradius/mods-config/sql/dhcp/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/mysql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/setup.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/procedure-no-skip-locked.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/procedure-no-skip-locked.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/
share/examples/freeradius/mods-config/sql/ippool/mysql/procedure-no-skip-locked.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure-no-skip-locked.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/
share/examples/freeradius/mods-config/sql/main/mysql/extras/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/setup.sql
share/examples/freeradius/mods-config/sql/main/ndb/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/
share/examples/freeradius/mods-config/sql/main/ndb/README
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/README
share/examples/freeradius/mods-config/sql/main/ndb/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/schema.sql
share/examples/freeradius/mods-config/sql/main/ndb/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/setup.sql
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql

90
net/freeradius/pkg/PLIST-pgsql
View File

@ -1,24 +1,66 @@
@comment $OpenBSD: PLIST-pgsql,v 1.7 2016/06/29 16:14:43 espie Exp $
@option is-branch
@conflict freeradius-pgsql-*
@conflict freeradius-<2.1.8
lib/freeradius/rlm_sql_postgresql.so
share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
share/examples/freeradius/sql/postgresql/
@mode 750
@sample ${SYSCONFDIR}/raddb/sql/postgresql/
@mode 640
share/examples/freeradius/sql/postgresql/admin.sql
share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
share/examples/freeradius/sql/postgresql/counter.conf
@sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
share/examples/freeradius/sql/postgresql/dialup.conf
@sample ${SYSCONFDIR}/raddb/sql/postgresql/dialup.conf
share/examples/freeradius/sql/postgresql/ippool.conf
@sample ${SYSCONFDIR}/raddb/sql/postgresql/ippool.conf
share/examples/freeradius/sql/postgresql/ippool.sql
share/examples/freeradius/sql/postgresql/nas.sql
share/examples/freeradius/sql/postgresql/schema.sql
share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
share/examples/freeradius/sql/postgresql/voip-postpaid.conf
@sample ${SYSCONFDIR}/raddb/sql/postgresql/voip-postpaid.conf
@comment $OpenBSD: PLIST-pgsql,v 1.8 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-pgsql
@so lib/freeradius/rlm_sql_postgresql.so
@group _freeradius
share/examples/freeradius/mods-config/sql/counter/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/
share/examples/freeradius/mods-config/sql/counter/postgresql/dailycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/dailycounter.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/expire_on_login.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/expire_on_login.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/monthlycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/monthlycounter.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/noresetcounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/noresetcounter.conf
share/examples/freeradius/mods-config/sql/cui/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/
share/examples/freeradius/mods-config/sql/cui/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/cui/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/
share/examples/freeradius/mods-config/sql/dhcp/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/postgresql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/setup.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/
share/examples/freeradius/mods-config/sql/ippool/postgresql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/
share/examples/freeradius/mods-config/sql/main/postgresql/extras/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/
share/examples/freeradius/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
share/examples/freeradius/mods-config/sql/main/postgresql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/main/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/setup.sql
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql

3
net/freeradius3/pkg/PLIST-python → net/freeradius/pkg/PLIST-python
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-python,v 1.4 2021/05/26 12:12:38 sthen Exp $
@comment $OpenBSD: PLIST-python,v 1.1 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-python
@so lib/freeradius/rlm_python.so
share/doc/freeradius/modules/rlm_python
@group _freeradius

3
net/freeradius3/pkg/PLIST-python3 → net/freeradius/pkg/PLIST-python3
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-python3,v 1.1 2021/07/07 12:28:42 sthen Exp $
@comment $OpenBSD: PLIST-python3,v 1.1 2021/09/16 10:36:39 sthen Exp $
@pkgpath net/freeradius3,-python3
@so lib/freeradius/rlm_python3.so
share/examples/freeradius/mods-available/python3
@sample ${FREERADIUS_ETC}/mods-available/python3

208
net/freeradius3/Makefile
View File

@ -1,208 +0,0 @@
# $OpenBSD: Makefile,v 1.55 2021/09/16 10:21:20 sthen Exp $
PORTROACH= limit:^3\.
COMMENT-main= RADIUS server implementation
COMMENT-freetds= freeradius freetds rlm addon
COMMENT-iodbc= freeradius iodbc rlm addon
COMMENT-ldap= freeradius ldap rlm addon
COMMENT-memcached= freeradius memcached rlm addon
COMMENT-mysql= freeradius mysql rlm addon
COMMENT-pgsql= freeradius pgsql rlm addon
COMMENT-python= freeradius python rlm addon
COMMENT-python3= freeradius python3 rlm addon (experimental)
V= 3.0.23
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= freeradius-$V
PKGNAME-freetds= freeradius-freetds-$V
PKGNAME-iodbc= freeradius-iodbc-$V
PKGNAME-ldap= freeradius-ldap-$V
PKGNAME-memcached= freeradius-memcached-$V
PKGNAME-mysql= freeradius-mysql-$V
PKGNAME-pgsql= freeradius-pgsql-$V
PKGNAME-python= freeradius-python-$V
PKGNAME-python3= freeradius-python3-$V
CATEGORIES= net security
MASTER_SITES= https://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/ \
ftp://ftp.freeradius.org/pub/freeradius/ \
ftp://ftp.freeradius.org/pub/freeradius/old/
HOMEPAGE= https://freeradius.org/
MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>
# GPLv2 - LGPLv2 - OpenSSL exemption
PERMIT_PACKAGE= Yes
DEBUG_PACKAGES= ${BUILD_PACKAGES}
CONFIGURE_STYLE= gnu
# Don't allow FR_LOCATE_DIR to use locate(1) to guess possible
# locations for libs etc.
CONFIGURE_ENV= ac_cv_path_LOCATE= \
ac_cv_path_SNMPGET=${LOCALBASE}/bin/snmpget \
ac_cv_path_SNMPWALK=${LOCALBASE}/bin/snmpwalk \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/freeradius \
--without-rlm_mongo \
--without-rlm_oracle \
--without-rlm_pam
# No option to disable collectd; bodged via patch-configure.
TEST_TARGET= test
TEST_DEPENDS= freeradius-$V:${BUILD_PKGPATH}
TEST_IS_INTERACTIVE=Yes # doesn't exit properly
# For manual tests, eapol_test from wpa_supplicant is useful.
# See http://deployingradius.com/scripts/eapol_test/
MODULES= lang/python
# thread-local storage
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
MULTI_PACKAGES= -main -freetds -iodbc -ldap -memcached -mysql -pgsql -python -python3
USE_GMAKE= Yes
USE_LIBTOOL= no#...has its own _special_ libtool.
RUN_DEPENDS-main= #empty
LIB_DEPENDS-main= databases/gdbm \
databases/libhiredis \
databases/sqlite3 \
devel/json-c \
devel/libtalloc \
security/yubico/yubico-c \
security/yubico/yubico-c-client \
devel/pcre \
net/curl
WANTLIB-main += c crypto curl execinfo gdbm hiredis json-c m
WANTLIB-main += pcap pcre perl pthread readline sqlite3 ssl talloc
WANTLIB-main += ykclient yubikey
.for i in ${MULTI_PACKAGES:N-main}
PSEUDO_FLAVORS+= no_${i:S/-//}
.endfor
FLAVOR?=
.include <bsd.port.arch.mk>
# rlm_python
.if ! ${BUILD_PACKAGES:M-python}
CONFIGURE_ARGS+= --without-rlm_python
.endif
LIB_DEPENDS-python= lang/python/2.7
WANTLIB-python= python2.7 intl m pthread util
RUN_DEPENDS-python= lang/python/2.7
# rlm_python3
.if ${BUILD_PACKAGES:M-python3}
CONFIGURE_ARGS+= --with-rlm_python3
.else
CONFIGURE_ARGS+= --without-rlm_python3
.endif
LIB_DEPENDS-python3= ${MODPY_LIB_DEPENDS}
WANTLIB-python3= ${MODPY_WANTLIB} intl m pthread util
RUN_DEPENDS-python3= ${MODPY_RUN_DEPENDS}
# rlm_ldap
.if ${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+= --with-ldap-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-ldap-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_ldap
.endif
LIB_DEPENDS-ldap= databases/openldap
WANTLIB-ldap= ldap
RUN_DEPENDS-ldap= #empty
# rlm_sql_freetds
.if ${BUILD_PACKAGES:M-freetds}
CONFIGURE_ARGS+= --with-freetds-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-freetds-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_sql_freetds
.endif
LIB_DEPENDS-freetds= databases/freetds
WANTLIB-freetds= ct
# rlm_sql_iodbc
.if ${BUILD_PACKAGES:M-iodbc}
CONFIGURE_ARGS+= --with-iodbc-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-iodbc-include-dir=${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --without-rlm_sql_iodbc
.endif
LIB_DEPENDS-iodbc= databases/iodbc
WANTLIB-iodbc= iodbc>=2
RUN_DEPENDS-iodbc= #empty
# rlm_sql_memcached
.if ! ${BUILD_PACKAGES:M-memcached}
CONFIGURE_ARGS+= --without-rlm_sql_memcached
.endif
LIB_DEPENDS-memcached= devel/libmemcached
WANTLIB-memcached= memcached pthread
RUN_DEPENDS-memcached= #empty
# rlm_sql_mysql
.if ${BUILD_PACKAGES:M-mysql}
CONFIGURE_ARGS+= --with-mysql-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-mysql-include-dir=${LOCALBASE}/include/mysql
.else
CONFIGURE_ARGS+= --without-rlm_sql_mysql
.endif
LIB_DEPENDS-mysql= databases/mariadb
WANTLIB-mysql= mariadb
RUN_DEPENDS-mysql= #empty
# rlm_sql_postgresql
.if ${BUILD_PACKAGES:M-pgsql}
CONFIGURE_ARGS+= --with-rlm-sql-postgresql-lib-dir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql
.else
CONFIGURE_ARGS+= --without-rlm_sql_postgresql
.endif
LIB_DEPENDS-pgsql= databases/postgresql
WANTLIB-pgsql= pq
RUN_DEPENDS-pgsql= #empty
.for i in ${MULTI_PACKAGES:N-main}
RUN_DEPENDS$i += freeradius-$V:net/freeradius3
WANTLIB$i ?= #empty
.endfor
FREERADIUS_ETC= ${SYSCONFDIR}/raddb
SUBST_VARS= FREERADIUS_ETC
MAKE_FLAGS= PACKAGE=openbsd VERBOSE=1
FAKE_FLAGS= VERBOSE=1 R=${WRKINST} \
raddbdir=${PREFIX}/share/examples/freeradius
post-configure:
sed -i -e 's,/etc/raddb,${SYSCONFDIR}/raddb,g' ${WRKSRC}/man/*/*
sed -i -e 's,/usr/local,${TRUEPREFIX},g' ${WRKSRC}/doc/README
rm ${WRKSRC}/doc/README${PATCHORIG}
# pre-create examples dir, otherwise build tries to create it twice and fails.
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freeradius
post-install:
rm ${PREFIX}/lib/freeradius/*.*a
rm -r \
${PREFIX}/share/examples/freeradius/mods-config/sql/*/oracle \
${PREFIX}/share/examples/freeradius/mods-config/sql/*/mongo \
${PREFIX}/share/doc/freeradius/antora
chmod -R u+rwX,og+rX ${PREFIX}/share/examples/freeradius/
${SUBST_CMD} -c -m 555 ${FILESDIR}/freeradius-enable.sh \
${PREFIX}/share/freeradius/freeradius-enable.sh
rm ${PREFIX}/share/examples/freeradius/mods-available/eap${PATCHORIG}
.include <bsd.port.mk>

2
net/freeradius3/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (freeradius-server-3.0.23.tar.bz2) = CM5Cvw7CF3BMoWNhnAbvyuim1qiuemJtd9qab9IQ4jU=
SIZE (freeradius-server-3.0.23.tar.bz2) = 3381917

36
net/freeradius3/patches/patch-raddb_certs_Makefile
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-raddb_certs_Makefile,v 1.7 2018/03/08 14:09:43 sthen Exp $
Don't rely on gmake.
Index: raddb/certs/Makefile
--- raddb/certs/Makefile.orig
+++ raddb/certs/Makefile
@@ -20,7 +20,12 @@ endif
#
# Set the passwords
#
-include passwords.mk
+PASSWORD_SERVER!= grep output_password server.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_INNER!= grep output_password inner-server.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_CA!= grep output_password ca.cnf | sed 's/.*=//;s/^ *//'
+PASSWORD_CLIENT!= grep output_password client.cnf | sed 's/.*=//;s/^ *//'
+USER_NAME!= grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//'
+CA_DEFAULT_DAYS!= grep default_days ca.cnf | sed 's/.*=//;s/^ *//'
######################################################################
#
@@ -44,14 +49,6 @@ inner-server: inner-server.pem inner-server.vrfy
.PHONY: verify
verify: server.vrfy client.vrfy
-
-passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf
- @echo "PASSWORD_SERVER = '$(shell grep output_password server.cnf | sed 's/.*=//;s/^ *//')'" > $@
- @echo "PASSWORD_INNER = '$(shell grep output_password inner-server.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "PASSWORD_CA = '$(shell grep output_password ca.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "PASSWORD_CLIENT = '$(shell grep output_password client.cnf | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "USER_NAME = '$(shell grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//')'" >> $@
- @echo "CA_DEFAULT_DAYS = '$(shell grep default_days ca.cnf | sed 's/.*=//;s/^ *//')'" >> $@
######################################################################
#

25
net/freeradius3/patches/patch-raddb_radiusd_conf_in
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-raddb_radiusd_conf_in,v 1.7 2021/07/07 12:28:42 sthen Exp $
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig
+++ raddb/radiusd.conf.in
@@ -135,7 +135,7 @@ db_dir = ${raddbdir}
# make
# make install
#
-libdir = @libdir@
+libdir = @libdir@/freeradius
# pidfile: Where to place the PID of the RADIUS server.
#
@@ -531,8 +531,8 @@ security {
# member. This can allow for some finer-grained access
# controls.
#
-# user = radius
-# group = radius
+ user = _freeradius
+ group = _freeradius
# Core dumps are a bad thing. This should only be set to
# 'yes' if you're debugging a problem with the server.

103
net/freeradius3/patches/patch-src_main_radsniff_c
View File

@ -1,103 +0,0 @@
$OpenBSD: patch-src_main_radsniff_c,v 1.4 2018/01/16 13:47:46 sthen Exp $
OpenBSD libpcap uses nonstandard "bpf_timeval" variables which are a
different size to timeval on some arch..
This patch is enough to let it build but is incomplete and unlikely to
allow radsniff to actually work.
Index: src/main/radsniff.c
--- src/main/radsniff.c.orig
+++ src/main/radsniff.c
@@ -1003,7 +1003,8 @@ static inline int rs_request_to_pcap(rs_event_t *event
#define RS_CLEANUP_NOW(_x, _s)\
{\
_x->silent_cleanup = _s;\
- _x->when = header->ts;\
+ _x->when.tv_sec = header->ts.tv_sec;\
+ _x->when.tv_usec = header->ts.tv_usec;\
rs_packet_cleanup(_x);\
_x = NULL;\
} while (0)
@@ -1038,10 +1039,12 @@ static void rs_packet_process(uint64_t count, rs_event
memset(&search, 0, sizeof(search));
if (!start_pcap.tv_sec) {
- start_pcap = header->ts;
+ start_pcap.tv_sec = header->ts.tv_sec;
+ start_pcap.tv_usec = header->ts.tv_usec;
}
if (RIDEBUG_ENABLED()) {
+ /* XXX convert pcap timeval */
rs_time_print(timestr, sizeof(timestr), &header->ts);
}
@@ -1135,11 +1138,13 @@ static void rs_packet_process(uint64_t count, rs_event
current = rad_alloc(conf, false);
if (!current) {
REDEBUG("Failed allocating memory to hold decoded packet");
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
return;
}
- current->timestamp = header->ts;
+ current->timestamp.tv_sec = header->ts.tv_sec;
+ current->timestamp.tv_usec = header->ts.tv_usec;
current->data_len = header->caplen - (p - data);
memcpy(&current->data, &p, sizeof(current->data));
@@ -1259,6 +1264,7 @@ static void rs_packet_process(uint64_t count, rs_event
* The delay is so we can detect retransmissions.
*/
original->linked = talloc_steal(original, current);
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original, &original->when,
&original->event)) {
@@ -1339,6 +1345,7 @@ static void rs_packet_process(uint64_t count, rs_event
search.expect = rad_alloc_reply(current, current);
if (!search.expect) {
REDEBUG("Failed allocating memory to hold expected reply");
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
rad_free(&current);
return;
@@ -1489,7 +1496,9 @@ static void rs_packet_process(uint64_t count, rs_event
/*
* Insert a callback to remove the request from the tree
*/
- original->packet->timestamp = header->ts;
+ original->packet->timestamp.tv_sec = header->ts.tv_sec;
+ original->packet->timestamp.tv_usec = header->ts.tv_usec;
+ /* XXX convert pcap timeval */
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original,
&original->when, &original->event)) {
@@ -1510,6 +1519,7 @@ static void rs_packet_process(uint64_t count, rs_event
return;
}
+ /* XXX convert pcap timeval */
rs_tv_sub(&header->ts, &start_pcap, &elapsed);
/*
@@ -1539,6 +1549,7 @@ static void rs_packet_process(uint64_t count, rs_event
* Were filtering on response, now print out the full data from the request
*/
if (conf->filter_response && RIDEBUG_ENABLED() && (conf->event_flags & RS_NORMAL)) {
+ /* XXX convert pcap timeval */
rs_time_print(timestr, sizeof(timestr), &original->packet->timestamp);
rs_tv_sub(&original->packet->timestamp, &start_pcap, &elapsed);
rs_packet_print(original, original->id, RS_NORMAL, original->in,
@@ -1621,7 +1632,8 @@ static void rs_got_packet(fr_event_list_t *el, int fd,
}
do {
- now = header->ts;
+ now.tv_sec = header->ts.tv_sec;
+ now.tv_usec = header->ts.tv_usec;
} while (fr_event_run(el, &now) == 1);
count++;

12
net/freeradius3/patches/patch-src_modules_rlm_unix_rlm_unix_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_modules_rlm_unix_rlm_unix_c,v 1.1 2015/11/19 14:19:05 sthen Exp $
--- src/modules/rlm_unix/rlm_unix.c.orig Thu Nov 19 14:13:59 2015
+++ src/modules/rlm_unix/rlm_unix.c Thu Nov 19 14:14:18 2015
@@ -218,7 +218,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(UNUS
return RLM_MODULE_USERLOCK;
}
#else /* OSFC2 */
- if ((pwd = getpwnam(name)) == NULL) {
+ if ((pwd = getpwnam_shadow(name)) == NULL) {
return RLM_MODULE_NOTFOUND;
}
encrypted_pass = pwd->pw_passwd;

1
net/freeradius3/pkg/DESCR-iodbc
View File

@ -1 +0,0 @@
freeradius iodbc rlm addon

1
net/freeradius3/pkg/DESCR-ldap
View File

@ -1 +0,0 @@
freeradius ldap rlm addon

14
net/freeradius3/pkg/DESCR-main
View File

@ -1,14 +0,0 @@
RADIUS, which stands for "Remote Authentication Dial In User Service",
is a network protocol - a system that defines rules and conventions for
communication between network devices - for remote user authentication
and accounting. Commonly used by Internet Service Providers (ISPs),
cellular network providers, and corporate and educational networks, the
RADIUS protocol serves three primary functions:
* Authenticates users or devices before allowing them access to a network
* Authorizes those users or devices for specific network services
* Accounts for and tracks the usage of those services
FreeRADIUS is a modular open-source implementation of the RADIUS protocol
featuring numerous authentication types, including Extensible Authentication
Protocol (EAP), support for virtual servers and more.

1
net/freeradius3/pkg/DESCR-mysql
View File

@ -1 +0,0 @@
freeradius mysql rlm addon

1
net/freeradius3/pkg/DESCR-pgsql
View File

@ -1 +0,0 @@
freeradius pgsql rlm addon

2
net/freeradius3/pkg/PLIST-freetds
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-freetds,v 1.2 2019/11/19 12:19:39 sthen Exp $
@so lib/freeradius/rlm_sql_freetds.so

35
net/freeradius3/pkg/PLIST-iodbc
View File

@ -1,35 +0,0 @@
@comment $OpenBSD: PLIST-iodbc,v 1.6 2021/05/26 12:12:38 sthen Exp $
@option is-branch
@conflict freeradius-iodbc-*
@so lib/freeradius/rlm_sql_iodbc.so
@group _freeradius
share/examples/freeradius/mods-config/sql/dhcp/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/
share/examples/freeradius/mods-config/sql/dhcp/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mssql/schema.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mssql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/
share/examples/freeradius/mods-config/sql/ippool/mssql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mssql/schema.sql
share/examples/freeradius/mods-config/sql/main/mssql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/
share/examples/freeradius/mods-config/sql/main/mssql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mssql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/queries.conf
share/examples/freeradius/mods-config/sql/main/mssql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mssql/schema.sql

25
net/freeradius3/pkg/PLIST-ldap
View File

@ -1,25 +0,0 @@
@comment $OpenBSD: PLIST-ldap,v 1.6 2021/05/26 12:12:38 sthen Exp $
@option is-branch
@conflict freeradius-ldap-*
@so lib/freeradius/rlm_ldap.so
share/doc/freeradius/schemas/ldap/
share/doc/freeradius/schemas/ldap/edir/
share/doc/freeradius/schemas/ldap/edir/freeradius-clients.ldif
share/doc/freeradius/schemas/ldap/iplanet/
share/doc/freeradius/schemas/ldap/iplanet/freeradius.ldif
share/doc/freeradius/schemas/ldap/iplanet/freeradius.schema
share/doc/freeradius/schemas/ldap/openldap/
share/doc/freeradius/schemas/ldap/openldap/freeradius-clients.ldif
share/doc/freeradius/schemas/ldap/openldap/freeradius-clients.schema
share/doc/freeradius/schemas/ldap/openldap/freeradius.ldif
share/doc/freeradius/schemas/ldap/openldap/freeradius.schema
share/doc/freeradius/schemas/ldap/samba/
share/doc/freeradius/schemas/ldap/samba/README.txt
share/doc/freeradius/schemas/ldap/samba/freeradius-attrs.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-classes.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-clients-attrs.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-clients-classes.ldif
share/doc/freeradius/schemas/ldap/samba/freeradius-user.ldif
@group _freeradius
share/examples/freeradius/mods-available/ldap
@sample ${FREERADIUS_ETC}/mods-available/ldap

1002
net/freeradius3/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff

2
net/freeradius3/pkg/PLIST-memcached
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-memcached,v 1.2 2019/11/19 12:19:39 sthen Exp $
@so lib/freeradius/rlm_cache_memcached.so

81
net/freeradius3/pkg/PLIST-mysql
View File

@ -1,81 +0,0 @@
@comment $OpenBSD: PLIST-mysql,v 1.8 2021/05/26 12:12:38 sthen Exp $
@option is-branch
@conflict freeradius-mysql-*
@so lib/freeradius/rlm_sql_mysql.so
@group _freeradius
share/examples/freeradius/mods-config/sql/counter/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/
share/examples/freeradius/mods-config/sql/counter/mysql/dailycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/dailycounter.conf
share/examples/freeradius/mods-config/sql/counter/mysql/expire_on_login.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/expire_on_login.conf
share/examples/freeradius/mods-config/sql/counter/mysql/monthlycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/monthlycounter.conf
share/examples/freeradius/mods-config/sql/counter/mysql/noresetcounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/mysql/noresetcounter.conf
share/examples/freeradius/mods-config/sql/cui/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/
share/examples/freeradius/mods-config/sql/cui/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/queries.conf
share/examples/freeradius/mods-config/sql/cui/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/mysql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/
share/examples/freeradius/mods-config/sql/dhcp/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/mysql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/mysql/setup.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/procedure-no-skip-locked.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/procedure-no-skip-locked.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/mysql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/
share/examples/freeradius/mods-config/sql/ippool/mysql/procedure-no-skip-locked.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure-no-skip-locked.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/
share/examples/freeradius/mods-config/sql/main/mysql/extras/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/extras/wimax/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/extras/wimax/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/queries.conf
share/examples/freeradius/mods-config/sql/main/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/schema.sql
share/examples/freeradius/mods-config/sql/main/mysql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/mysql/setup.sql
share/examples/freeradius/mods-config/sql/main/ndb/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/
share/examples/freeradius/mods-config/sql/main/ndb/README
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/README
share/examples/freeradius/mods-config/sql/main/ndb/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/schema.sql
share/examples/freeradius/mods-config/sql/main/ndb/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/ndb/setup.sql
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql

67
net/freeradius3/pkg/PLIST-pgsql
View File

@ -1,67 +0,0 @@
@comment $OpenBSD: PLIST-pgsql,v 1.9 2021/05/26 12:12:38 sthen Exp $
@option is-branch
@conflict freeradius-pgsql-*
@so lib/freeradius/rlm_sql_postgresql.so
@group _freeradius
share/examples/freeradius/mods-config/sql/counter/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/
share/examples/freeradius/mods-config/sql/counter/postgresql/dailycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/dailycounter.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/expire_on_login.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/expire_on_login.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/monthlycounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/monthlycounter.conf
share/examples/freeradius/mods-config/sql/counter/postgresql/noresetcounter.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/counter/postgresql/noresetcounter.conf
share/examples/freeradius/mods-config/sql/cui/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/
share/examples/freeradius/mods-config/sql/cui/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/cui/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/cui/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/
share/examples/freeradius/mods-config/sql/dhcp/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/dhcp/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/dhcp/postgresql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/dhcp/postgresql/setup.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/ippool/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/
share/examples/freeradius/mods-config/sql/ippool/postgresql/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/ippool/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/
share/examples/freeradius/mods-config/sql/main/postgresql/extras/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/
share/examples/freeradius/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/cisco_h323_db_schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/extras/voip-postpaid.conf
share/examples/freeradius/mods-config/sql/main/postgresql/process-radacct.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/process-radacct.sql
share/examples/freeradius/mods-config/sql/main/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/main/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/schema.sql
share/examples/freeradius/mods-config/sql/main/postgresql/setup.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/main/postgresql/setup.sql
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf
share/examples/freeradius/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql

13
net/freeradius3/pkg/freeradius.rc
View File

@ -1,13 +0,0 @@
#!/bin/ksh
#
# $OpenBSD: freeradius.rc,v 1.2 2018/01/11 19:27:05 rpe Exp $
daemon="${TRUEPREFIX}/sbin/radiusd"
. /etc/rc.d/rc.subr
rc_pre() {
/usr/bin/install -d -o _freeradius /var/run/radiusd
}
rc_cmd $1