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

update to freeradius-3.0.20

Browse Source
This commit is contained in:
sthen 2019-11-19 13:03:49 +00:00
parent 289bc15185
commit a64ae3dbe6
6 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/freeradius3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2019/11/19 12:19:38 sthen Exp $
# $OpenBSD: Makefile,v 1.42 2019/11/19 13:03:49 sthen Exp $
PORTROACH= limit:^3\.
@ -11,10 +11,9 @@ COMMENT-mysql= freeradius mysql rlm addon
COMMENT-pgsql= freeradius pgsql rlm addon
COMMENT-python= freeradius python rlm addon
V= 3.0.19
V= 3.0.20
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2
REVISION= 1
PKGNAME-main= freeradius-$V
PKGNAME-freetds= freeradius-freetds-$V
@ -46,29 +45,26 @@ CONFIGURE_ENV= ac_cv_path_LOCATE= \
ac_cv_path_SNMPWALK=${LOCALBASE}/bin/snmpwalk \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/freeradius
# Disabling modules via --without-rlm_FOO doesn't seem to work as of 3.0.10.
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/freeradius \
--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
# an experimental py3 module exists, not built by default yet
MODULES= lang/python
# thread-local storage
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
COMPILER_LANGS = c
MULTI_PACKAGES= -main -freetds -iodbc -ldap -memcached -mysql -pgsql -python
USE_GMAKE= Yes
USE_LIBTOOL= no#...has its own _special_ libtool.
# Not really trying to build with this, but --without-rlm_pam doesn't disable
# it, so just list as a bdep to avoid risk of broken bulk builds.
BUILD_DEPENDS+= security/openpam
RUN_DEPENDS-main= #empty
LIB_DEPENDS-main= databases/gdbm \
databases/libhiredis \
@ -85,8 +81,9 @@ WANTLIB-main += c crypto curl execinfo gdbm hiredis json-c m nghttp2
WANTLIB-main += pcap pcre perl pthread readline sqlite3 ssl talloc
WANTLIB-main += ykclient yubikey z
PSEUDO_FLAVORS= no_freetds no_iodbc no_ldap no_memcached no_mysql \
no_pgsql no_python
.for i in ${MULTI_PACKAGES:N-main}
PSEUDO_FLAVORS+= no_${i:S/-//}
.endfor
FLAVOR?=
.include <bsd.port.arch.mk>
@ -96,7 +93,7 @@ FLAVOR?=
CONFIGURE_ARGS+= --without-rlm_python
.endif
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS}
WANTLIB-python= ${MODPY_WANTLIB} m pthread util
WANTLIB-python= ${MODPY_WANTLIB} intl m pthread util
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
# rlm_ldap
@ -107,7 +104,7 @@ CONFIGURE_ARGS+= --with-ldap-include-dir=${LOCALBASE}/include
CONFIGURE_ARGS+= --without-rlm_ldap
.endif
LIB_DEPENDS-ldap= databases/openldap
WANTLIB-ldap= ldap-2.4
WANTLIB-ldap= ldap
RUN_DEPENDS-ldap= #empty
# rlm_sql_freetds
@ -147,7 +144,7 @@ CONFIGURE_ARGS+= --with-mysql-include-dir=${LOCALBASE}/include/mysql
CONFIGURE_ARGS+= --without-rlm_sql_mysql
.endif
LIB_DEPENDS-mysql= databases/mariadb
WANTLIB-mysql= crypto iconv m mariadb ssl z
WANTLIB-mysql= mariadb
RUN_DEPENDS-mysql= #empty
# rlm_sql_postgresql

4
net/freeradius3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freeradius-server-3.0.19.tar.bz2) = 9FfDVuB7bDzOPgUjHGjiO9+6hFLQ20ef4cheEU5ig8k=
SIZE (freeradius-server-3.0.19.tar.bz2) = 3127564
SHA256 (freeradius-server-3.0.20.tar.bz2) = 4lJHhwrrFU0vde/eIlcwlcDxBdhXQO+Voq0YbF5eyBU=
SIZE (freeradius-server-3.0.20.tar.bz2) = 3161984

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

@ -1,4 +1,4 @@
$OpenBSD: patch-raddb_radiusd_conf_in,v 1.4 2019/02/28 18:46:49 sthen Exp $
$OpenBSD: patch-raddb_radiusd_conf_in,v 1.5 2019/11/19 13:03:49 sthen Exp $
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig
+++ raddb/radiusd.conf.in
@ -11,7 +11,7 @@ Index: raddb/radiusd.conf.in
# pidfile: Where to place the PID of the RADIUS server.
#
@@ -447,8 +447,8 @@ security {
@@ -501,8 +501,8 @@ security {
# member. This can allow for some finer-grained access
# controls.
#

16
net/freeradius3/patches/patch-src_main_tls_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_main_tls_c,v 1.7 2019/02/28 18:46:49 sthen Exp $
$OpenBSD: patch-src_main_tls_c,v 1.8 2019/11/19 13:03:49 sthen Exp $
Index: src/main/tls.c
--- src/main/tls.c.orig
+++ src/main/tls.c
@@ -1579,7 +1579,8 @@ done:
@@ -1565,7 +1565,8 @@ done:
return 0;
}
@ -13,7 +13,7 @@ Index: src/main/tls.c
static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
#else
static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
@@ -2129,7 +2130,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
@@ -2120,7 +2121,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
char cn_str[1024];
char buf[64];
X509 *client_cert;
@ -23,7 +23,7 @@ Index: src/main/tls.c
const STACK_OF(X509_EXTENSION) *ext_list;
#else
STACK_OF(X509_EXTENSION) *ext_list;
@@ -2328,7 +2330,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
@@ -2319,7 +2321,8 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
}
if (lookup == 0) {
@ -33,7 +33,7 @@ Index: src/main/tls.c
ext_list = X509_get0_extensions(client_cert);
#else
X509_CINF *client_inf;
@@ -3167,7 +3170,7 @@ post_ca:
@@ -3182,7 +3185,7 @@ post_ca:
#ifdef SSL_OP_NO_TLSv1
if (conf->disable_tlsv1) {
ctx_options |= SSL_OP_NO_TLSv1;
@ -42,7 +42,7 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1");
#endif
}
@@ -3177,7 +3180,7 @@ post_ca:
@@ -3192,7 +3195,7 @@ post_ca:
#ifdef SSL_OP_NO_TLSv1_1
if (conf->disable_tlsv1_1) {
ctx_options |= SSL_OP_NO_TLSv1_1;
@ -51,7 +51,7 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
#endif
}
@@ -3188,7 +3191,7 @@ post_ca:
@@ -3203,7 +3206,7 @@ post_ca:
if (conf->disable_tlsv1_2) {
ctx_options |= SSL_OP_NO_TLSv1_2;
@ -60,7 +60,7 @@ Index: src/main/tls.c
WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
#endif
}
@@ -3379,14 +3382,14 @@ post_ca:
@@ -3394,14 +3397,14 @@ post_ca:
*/
SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.14 2019/11/19 12:19:39 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2019/11/19 13:03:49 sthen Exp $
@option is-branch
@conflict freeradius-*
@conflict radiusd-cistron-*
@ -465,6 +465,8 @@ share/examples/freeradius/mods-available/perl
@sample ${FREERADIUS_ETC}/mods-available/perl
share/examples/freeradius/mods-available/preprocess
@sample ${FREERADIUS_ETC}/mods-available/preprocess
@comment share/examples/freeradius/mods-available/python3
@comment @sample ${FREERADIUS_ETC}/mods-available/python3
share/examples/freeradius/mods-available/radutmp
@sample ${FREERADIUS_ETC}/mods-available/radutmp
share/examples/freeradius/mods-available/realm
@ -570,6 +572,10 @@ share/examples/freeradius/mods-config/sql/ippool-dhcp/sqlite/queries.conf
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/sqlite/queries.conf
share/examples/freeradius/mods-config/sql/ippool-dhcp/sqlite/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool-dhcp/sqlite/schema.sql
@comment share/examples/freeradius/mods-config/sql/ippool/mongo/
@comment @sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mongo/
@comment share/examples/freeradius/mods-config/sql/ippool/mongo/queries.conf
@comment @sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mongo/queries.conf
share/examples/freeradius/mods-config/sql/ippool/sqlite/
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/sqlite/
share/examples/freeradius/mods-config/sql/ippool/sqlite/queries.conf
@ -578,6 +584,10 @@ share/examples/freeradius/mods-config/sql/ippool/sqlite/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/sqlite/schema.sql
share/examples/freeradius/mods-config/sql/main/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/
@comment share/examples/freeradius/mods-config/sql/main/mongo/
@comment @sample ${FREERADIUS_ETC}/mods-config/sql/main/mongo/
@comment share/examples/freeradius/mods-config/sql/main/mongo/queries.conf
@comment @sample ${FREERADIUS_ETC}/mods-config/sql/main/mongo/queries.conf
share/examples/freeradius/mods-config/sql/main/sqlite/
@sample ${FREERADIUS_ETC}/mods-config/sql/main/sqlite/
share/examples/freeradius/mods-config/sql/main/sqlite/queries.conf
@ -675,6 +685,8 @@ share/examples/freeradius/sites-available/check-eap-tls
@sample ${FREERADIUS_ETC}/sites-available/check-eap-tls
share/examples/freeradius/sites-available/coa
@sample ${FREERADIUS_ETC}/sites-available/coa
share/examples/freeradius/sites-available/coa-relay
@sample ${FREERADIUS_ETC}/sites-available/coa-relay
share/examples/freeradius/sites-available/control-socket
@sample ${FREERADIUS_ETC}/sites-available/control-socket
share/examples/freeradius/sites-available/copy-acct-to-home-server
@ -794,6 +806,7 @@ share/freeradius/dictionary.erx
share/freeradius/dictionary.extreme
share/freeradius/dictionary.f5
share/freeradius/dictionary.fdxtended
share/freeradius/dictionary.force10
share/freeradius/dictionary.fortinet
share/freeradius/dictionary.foundry
share/freeradius/dictionary.freedhcp
@ -916,6 +929,7 @@ share/freeradius/dictionary.telkom
share/freeradius/dictionary.terena
share/freeradius/dictionary.trapeze
share/freeradius/dictionary.travelping
share/freeradius/dictionary.tripplite
share/freeradius/dictionary.tropos
share/freeradius/dictionary.ukerna
share/freeradius/dictionary.unix

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-mysql,v 1.5 2019/11/19 12:19:39 sthen Exp $
@comment $OpenBSD: PLIST-mysql,v 1.6 2019/11/19 13:03:49 sthen Exp $
@option is-branch
@conflict freeradius-mysql-*
@so lib/freeradius/rlm_sql_mysql.so
@ -37,6 +37,8 @@ share/examples/freeradius/mods-config/sql/ippool/mysql/
@mode 640
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/procedure.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/procedure.sql
share/examples/freeradius/mods-config/sql/ippool/mysql/schema.sql
@sample ${FREERADIUS_ETC}/mods-config/sql/ippool/mysql/schema.sql
@mode 750