diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-03-31 05:13:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-04-02 16:12:46 +0200 |
| commit | f0baf9a752917e916eeec3636cce0a64d04cdca0 (patch) | |
| tree | 12ca8f4d8efbffce8e9c37ca7703038462eccc18 | |
| parent | 93d2c561b61410f073b9327badee5f4b4b74b851 (diff) | |
freeradius-server: update to 3.0.13
| -rw-r--r-- | package/freeradius-server/Makefile | 8 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-scripts_libtool_mk | 6 | ||||
| -rw-r--r-- | package/freeradius-server/patches/patch-src_main_tls_c | 16 |
3 files changed, 23 insertions, 7 deletions
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 81a9ec700..6cf58e7b4 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 3.0.12 +PKG_VERSION:= 3.0.13 PKG_RELEASE:= 1 -PKG_HASH:= 4a5af6efcf7fef08ea9bb02979200131e1332a48341c529da73bea76d3b25da0 +PKG_HASH:= 34da25c1a0e39dc57821ed6d1af1c1cc8bb7e280169cc8b4003acbfc4184328e PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius PKG_DEPENDS:= libltdl libpcre libtalloc libressl @@ -24,10 +24,10 @@ PKG_SUBPKGS+= FREERADIUS_MOD_SQL_MYSQL FREERADIUS_MOD_SQL_PGSQL FREERADIUS_UTIL # sub package build dependencies PKGSB_FREERADIUS_MOD_LDAP:= openldap -PKGSB_FREERADIUS_MOD_SQL_MYSQL:= mysql +PKGSB_FREERADIUS_MOD_SQL_MYSQL:= mariadb PKGSB_FREERADIUS_MOD_SQL_PGSQL:= postgresql PKGSS_FREERADIUS_MOD_LDAP:= libopenldap -PKGSS_FREERADIUS_MOD_SQL_MYSQL:= libmysqlclient +PKGSS_FREERADIUS_MOD_SQL_MYSQL:= libmariadbclient PKGSS_FREERADIUS_MOD_SQL_PGSQL:= libpq PKGSD_FREERADIUS_DEMOCERTS:= Demo certificates to test the server diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk index 94e30ed46..c9f83db69 100644 --- a/package/freeradius-server/patches/patch-scripts_libtool_mk +++ b/package/freeradius-server/patches/patch-scripts_libtool_mk @@ -1,6 +1,6 @@ ---- freeradius-server-3.0.8.orig/scripts/libtool.mk 2015-04-22 19:21:34.000000000 +0200 -+++ freeradius-server-3.0.8/scripts/libtool.mk 2015-05-13 16:40:27.000000000 +0200 -@@ -33,7 +33,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL" +--- freeradius-server-3.0.13.orig/scripts/libtool.mk 2017-03-06 14:58:04.000000000 +0100 ++++ freeradius-server-3.0.13/scripts/libtool.mk 2017-03-30 05:46:58.583531343 +0200 +@@ -44,7 +44,7 @@ ifeq "${LIBTOOL}" "JLIBTOOL" ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) $(Q)echo CC jlibtool.c diff --git a/package/freeradius-server/patches/patch-src_main_tls_c b/package/freeradius-server/patches/patch-src_main_tls_c new file mode 100644 index 000000000..3eb635e97 --- /dev/null +++ b/package/freeradius-server/patches/patch-src_main_tls_c @@ -0,0 +1,16 @@ +--- freeradius-server-3.0.13.orig/src/main/tls.c 2017-03-06 14:58:04.000000000 +0100 ++++ freeradius-server-3.0.13/src/main/tls.c 2017-03-30 05:52:35.584542618 +0200 +@@ -2131,13 +2131,9 @@ int cbtls_verify(int ok, X509_STORE_CTX + } + + if (lookup == 0) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- ext_list = X509_get0_extensions(client_cert); +-#else + X509_CINF *client_inf; + client_inf = client_cert->cert_info; + ext_list = client_inf->extensions; +-#endif + } else { + ext_list = NULL; + } |