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

update to freeradius-3.0.11

Browse Source
This commit is contained in:
sthen 2016-01-25 20:32:15 +00:00
parent 9e2f89b552
commit 260738232d
11 changed files with 91 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/freeradius3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2015/12/10 09:56:45 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2016/01/25 20:32:15 sthen Exp $
PORTROACH= limit:^3\.
@ -6,19 +6,19 @@ SHARED_ONLY= Yes
COMMENT-main= RADIUS server implementation
COMMENT-iodbc= freeradius iodbc 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
V= 3.0.10
REVISION= 0
REVISION-main= 3
V= 3.0.11
DISTNAME= freeradius-server-$V
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= freeradius-$V
PKGNAME-iodbc= freeradius-iodbc-$V
PKGNAME-memcached= freeradius-memcached-$V
PKGNAME-mysql= freeradius-mysql-$V
PKGNAME-pgsql= freeradius-pgsql-$V
PKGNAME-python= freeradius-python-$V
@ -56,7 +56,7 @@ TEST_IS_INTERACTIVE=Yes # doesn't exit properly
MODULES= lang/python
MULTI_PACKAGES= -main -python -ldap -iodbc -mysql -pgsql
MULTI_PACKAGES= -main -python -ldap -iodbc -memcached -mysql -pgsql
USE_GMAKE= Yes
USE_LIBTOOL= no#...has its own _special_ libtool.
@ -81,7 +81,7 @@ WANTLIB-main += c crypto curl execinfo gdbm hiredis idn json-c m nghttp2
WANTLIB-main += pcap pcre perl pthread readline sqlite3 ssl talloc termcap
WANTLIB-main += util ykclient yubikey z
PSEUDO_FLAVORS= no_python no_ldap no_iodbc no_mysql no_pgsql
PSEUDO_FLAVORS= no_python no_ldap no_iodbc no_memcached no_mysql no_pgsql
FLAVOR?=
.include <bsd.port.arch.mk>
@ -116,6 +116,14 @@ 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

4
net/freeradius3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (freeradius-server-3.0.10.tar.bz2) = WYrEesCJ77x1CA5V+FWNutMbEt3SLgLMCqONWVPR1ww=
SIZE (freeradius-server-3.0.10.tar.bz2) = 3058586
SHA256 (freeradius-server-3.0.11.tar.bz2) = K2EJth/JPp/N092KkcOrvwzoIyJE0dIU1xpOW3+q24A=
SIZE (freeradius-server-3.0.11.tar.bz2) = 3073060

8
net/freeradius3/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.1.1.1 2015/11/12 12:59:37 sthen Exp $
$OpenBSD: patch-configure,v 1.2 2016/01/25 20:32:15 sthen Exp $
Don't pick up collectd if installed at build time.
--- configure.orig Wed Nov 11 17:16:18 2015
+++ configure Wed Nov 11 17:19:35 2015
@@ -7005,7 +7005,7 @@ if test "x$smart_lib" != "x"; then
--- configure.orig Mon Jan 25 18:27:03 2016
+++ configure Mon Jan 25 20:09:38 2016
@@ -7002,7 +7002,7 @@ if test "x$smart_lib" != "x"; then
SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS"
fi

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

@ -1,11 +1,11 @@
$OpenBSD: patch-raddb_certs_Makefile,v 1.2 2015/12/10 09:56:45 sthen Exp $
$OpenBSD: patch-raddb_certs_Makefile,v 1.3 2016/01/25 20:32:15 sthen Exp $
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
--- raddb/certs/Makefile.orig Mon Jan 25 18:27:03 2016
+++ raddb/certs/Makefile Mon Jan 25 20:09:38 2016
@@ -37,11 +37,11 @@ server: server.pem server.vrfy
verify: server.vrfy client.vrfy
passwords.mk: server.cnf ca.cnf client.cnf
- @echo "PASSWORD_SERVER = '$(shell grep output_password server.cnf | sed 's/.*=//;s/^ *//')'" > $@

10
net/freeradius3/patches/patch-scripts_jlibtool_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-scripts_jlibtool_c,v 1.1.1.1 2015/11/12 12:59:37 sthen Exp $
--- scripts/jlibtool.c.orig Thu Jun 25 23:12:27 2015
+++ scripts/jlibtool.c Thu Jun 25 23:12:48 2015
$OpenBSD: patch-scripts_jlibtool_c,v 1.2 2016/01/25 20:32:15 sthen Exp $
--- scripts/jlibtool.c.orig Mon Jan 25 18:27:03 2016
+++ scripts/jlibtool.c Mon Jan 25 20:10:16 2016
@@ -79,7 +79,7 @@
# define LD_LIBRARY_PATH_LOCAL "DYLD_FALLBACK_LIBRARY_PATH"
#endif
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__sun) && defined(__GNUC__))
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__sun) && defined(__GNUC__))
# define SHELL_CMD "/bin/sh"
# define DYNAMIC_LIB_EXT "so"
# define MODULE_LIB_EXT "so"

8
net/freeradius3/patches/patch-src_main_detail_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_main_detail_c,v 1.2 2015/12/10 09:56:45 sthen Exp $
$OpenBSD: patch-src_main_detail_c,v 1.3 2016/01/25 20:32:15 sthen Exp $
Cope with 32-bit arch with 64-bit time variables.
--- src/main/detail.c.orig Wed Nov 11 12:39:27 2015
+++ src/main/detail.c Wed Nov 11 12:39:35 2015
@@ -736,7 +736,7 @@ open_file:
--- src/main/detail.c.orig Mon Jan 25 18:27:03 2016
+++ src/main/detail.c Mon Jan 25 20:09:38 2016
@@ -754,7 +754,7 @@ open_file:
*/
alloc_packet:
if (data->done_entry) {

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

@ -1,4 +1,4 @@
$OpenBSD: patch-src_main_radsniff_c,v 1.2 2015/12/10 09:56:45 sthen Exp $
$OpenBSD: patch-src_main_radsniff_c,v 1.3 2016/01/25 20:32:15 sthen Exp $
OpenBSD libpcap uses nonstandard "bpf_timeval" variables which are a
different size to timeval on some arch..
@ -6,8 +6,8 @@ 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.
--- src/main/radsniff.c.orig Wed Nov 11 12:39:49 2015
+++ src/main/radsniff.c Wed Nov 11 12:44:57 2015
--- src/main/radsniff.c.orig Mon Jan 25 18:27:03 2016
+++ src/main/radsniff.c Mon Jan 25 20:09:38 2016
@@ -1000,7 +1000,8 @@ static inline int rs_request_to_pcap(rs_event_t *event
#define RS_CLEANUP_NOW(_x, _s)\
{\
@ -32,7 +32,7 @@ allow radsniff to actually work.
rs_time_print(timestr, sizeof(timestr), &header->ts);
}
@@ -1122,11 +1125,13 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1132,11 +1135,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");
@ -47,7 +47,7 @@ allow radsniff to actually work.
current->data_len = header->caplen - (p - data);
memcpy(&current->data, &p, sizeof(current->data));
@@ -1246,6 +1251,7 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1256,6 +1261,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);
@ -55,7 +55,7 @@ allow radsniff to actually work.
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original, &original->when,
&original->event)) {
@@ -1326,6 +1332,7 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1336,6 +1342,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");
@ -63,7 +63,7 @@ allow radsniff to actually work.
rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
rad_free(&current);
return;
@@ -1476,7 +1483,9 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1486,7 +1493,9 @@ static void rs_packet_process(uint64_t count, rs_event
/*
* Insert a callback to remove the request from the tree
*/
@ -74,7 +74,7 @@ allow radsniff to actually work.
rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when);
if (!fr_event_insert(event->list, _rs_event, original,
&original->when, &original->event)) {
@@ -1497,6 +1506,7 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1507,6 +1516,7 @@ static void rs_packet_process(uint64_t count, rs_event
return;
}
@ -82,7 +82,7 @@ allow radsniff to actually work.
rs_tv_sub(&header->ts, &start_pcap, &elapsed);
/*
@@ -1526,6 +1536,7 @@ static void rs_packet_process(uint64_t count, rs_event
@@ -1536,6 +1546,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)) {
@ -90,7 +90,7 @@ allow radsniff to actually work.
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,
@@ -1608,7 +1619,8 @@ static void rs_got_packet(fr_event_list_t *el, int fd,
@@ -1618,7 +1629,8 @@ static void rs_got_packet(fr_event_list_t *el, int fd,
}
do {

38
net/freeradius3/patches/patch-src_modules_rlm_eap_types_rlm_eap_pwd_rlm_eap_pwd_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_modules_rlm_eap_types_rlm_eap_pwd_rlm_eap_pwd_c,v 1.1 2015/11/27 13:13:07 sthen Exp $
From a8229d513e851bb3993c938e892b637f7f513521 Mon Sep 17 00:00:00 2001
From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 27 Oct 2015 22:54:31 -0400
Subject: [PATCH] Closes #1320 create User-name from peer ID correctly
--- src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c.orig Mon Oct 5 19:22:28 2015
+++ src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c Fri Nov 27 12:59:18 2015
@@ -279,7 +279,6 @@ static int mod_process(void *arg, eap_handler_t *handl
uint8_t exch, *in, *ptr, msk[MSK_EMSK_LEN], emsk[MSK_EMSK_LEN];
uint8_t peer_confirm[SHA256_DIGEST_LENGTH];
BIGNUM *x = NULL, *y = NULL;
- char *p;
if (((eap_ds = handler->eap_ds) == NULL) || !inst) return 0;
@@ -426,17 +425,13 @@ static int mod_process(void *arg, eap_handler_t *handl
RDEBUG("pwd unable to create fake request!");
return 0;
}
- fake->username = pair_make_request("User-Name", NULL, T_OP_EQ);
+ fake->username = fr_pair_afrom_num(fake, PW_USER_NAME, 0);
if (!fake->username) {
- RDEBUG("pwd unanable to create value pair for username!");
+ RDEBUG("Failed creating pair for peer id");
talloc_free(fake);
return 0;
}
- fake->username->vp_length = session->peer_id_len;
- fake->username->vp_strvalue = p = talloc_array(fake->username, char, fake->username->vp_length + 1);
- memcpy(p, session->peer_id, session->peer_id_len);
- p[fake->username->vp_length] = '\0';
-
+ fr_pair_value_bstrncpy(fake->username, session->peer_id, session->peer_id_len);
fr_pair_add(&fake->packet->vps, fake->username);
if ((vp = fr_pair_find_by_num(request->config, PW_VIRTUAL_SERVER, 0, TAG_ANY)) != NULL) {

1
net/freeradius3/pkg/DESCR-memcached Normal file
View File

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

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2015/11/12 15:27:11 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2016/01/25 20:32:15 sthen Exp $
@conflict freeradius-*
@conflict radiusd-cistron-*
@conflict radiusd-lucent-*
@ -31,6 +31,7 @@ include/freeradius/conffile.h
include/freeradius/detail.h
include/freeradius/event.h
include/freeradius/features.h
include/freeradius/freeradius.h
include/freeradius/hash.h
include/freeradius/heap.h
include/freeradius/libradius.h
@ -47,11 +48,44 @@ include/freeradius/radiusd.h
include/freeradius/radpaths.h
include/freeradius/radutmp.h
include/freeradius/realms.h
include/freeradius/rfc2865.h
include/freeradius/rfc2866.h
include/freeradius/rfc2867.h
include/freeradius/rfc2868.h
include/freeradius/rfc2869.h
include/freeradius/rfc3162.h
include/freeradius/rfc3576.h
include/freeradius/rfc3580.h
include/freeradius/rfc4072.h
include/freeradius/rfc4372.h
include/freeradius/rfc4603.h
include/freeradius/rfc4675.h
include/freeradius/rfc4679.h
include/freeradius/rfc4818.h
include/freeradius/rfc4849.h
include/freeradius/rfc5090.h
include/freeradius/rfc5176.h
include/freeradius/rfc5447.h
include/freeradius/rfc5580.h
include/freeradius/rfc5607.h
include/freeradius/rfc5904.h
include/freeradius/rfc6519.h
include/freeradius/rfc6572.h
include/freeradius/rfc6677.h
include/freeradius/rfc6911.h
include/freeradius/rfc6929.h
include/freeradius/rfc6930.h
include/freeradius/rfc7055.h
include/freeradius/rfc7155.h
include/freeradius/rfc7268.h
include/freeradius/rfc7499.h
include/freeradius/sha1.h
include/freeradius/stats.h
include/freeradius/sysutmp.h
include/freeradius/tls.h
include/freeradius/token.h
include/freeradius/udpfromto.h
include/freeradius/vqp.h
lib/freeradius/
lib/freeradius/libfreeradius-dhcp.so
lib/freeradius/libfreeradius-eap.so
@ -107,7 +141,6 @@ lib/freeradius/rlm_sql.so
lib/freeradius/rlm_sql_null.so
lib/freeradius/rlm_sql_sqlite.so
lib/freeradius/rlm_sqlcounter.so
lib/freeradius/rlm_sqlhpwippool.so
lib/freeradius/rlm_sqlippool.so
lib/freeradius/rlm_test.so
lib/freeradius/rlm_unix.so
@ -284,8 +317,11 @@ share/doc/freeradius/rfc/rfc7599.txt
share/doc/freeradius/schemas/
share/doc/freeradius/schemas/logstash/
share/doc/freeradius/schemas/logstash/README
share/doc/freeradius/schemas/logstash/kibana3-dashboard.json
share/doc/freeradius/schemas/logstash/kibana4-dashboard.json
share/doc/freeradius/schemas/logstash/log-courier.conf
share/doc/freeradius/schemas/logstash/logstash-radius.conf
share/doc/freeradius/schemas/logstash/radius-mapping.sh
share/doc/freeradius/schemas/logstash/radius.conf
share/doc/freeradius/schemas/sql
share/doc/freeradius/vendor/
share/doc/freeradius/vendor/ascend
@ -326,8 +362,6 @@ share/examples/freeradius/hints
share/examples/freeradius/huntgroups
share/examples/freeradius/mods-available/
@sample ${FREERADIUS_ETC}/mods-available/
@comment share/examples/freeradius/mods-available/pam
@comment share/examples/freeradius/mods-available/unbound
share/examples/freeradius/mods-available/README.rst
@sample ${FREERADIUS_ETC}/mods-available/README.rst
share/examples/freeradius/mods-available/abfab_psk_sql
@ -402,6 +436,7 @@ share/examples/freeradius/mods-available/opendirectory
@sample ${FREERADIUS_ETC}/mods-available/opendirectory
share/examples/freeradius/mods-available/otp
@sample ${FREERADIUS_ETC}/mods-available/otp
@comment share/examples/freeradius/mods-available/pam
share/examples/freeradius/mods-available/pap
@sample ${FREERADIUS_ETC}/mods-available/pap
share/examples/freeradius/mods-available/passwd
@ -438,6 +473,7 @@ share/examples/freeradius/mods-available/sqlippool
@sample ${FREERADIUS_ETC}/mods-available/sqlippool
share/examples/freeradius/mods-available/sradutmp
@sample ${FREERADIUS_ETC}/mods-available/sradutmp
@comment share/examples/freeradius/mods-available/unbound
share/examples/freeradius/mods-available/unix
@sample ${FREERADIUS_ETC}/mods-available/unix
share/examples/freeradius/mods-available/unpack
@ -731,6 +767,7 @@ share/freeradius/dictionary.gandalf
share/freeradius/dictionary.garderos
share/freeradius/dictionary.gemtek
share/freeradius/dictionary.h3c
share/freeradius/dictionary.hillstone
share/freeradius/dictionary.hp
share/freeradius/dictionary.huawei
share/freeradius/dictionary.iana
@ -744,11 +781,13 @@ share/freeradius/dictionary.juniper
share/freeradius/dictionary.karlnet
share/freeradius/dictionary.kineto
share/freeradius/dictionary.lancom
share/freeradius/dictionary.lantronix
share/freeradius/dictionary.livingston
share/freeradius/dictionary.localweb
share/freeradius/dictionary.lucent
share/freeradius/dictionary.manzara
share/freeradius/dictionary.meinberg
share/freeradius/dictionary.meraki
share/freeradius/dictionary.merit
share/freeradius/dictionary.meru
share/freeradius/dictionary.microsoft

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

@ -0,0 +1,2 @@
@comment $OpenBSD: PLIST-memcached,v 1.1 2016/01/25 20:32:15 sthen Exp $
lib/freeradius/rlm_cache_memcached.so