package/freeradius-server: update to 3.2.6

See here for the release notes:
https://www.freeradius.org/release_notes/

Patch 0001 is rebased to this version.
Patch 0005 is upstream.
Patch 0009 got renamed to fillup the gap.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Waldemar Brodkorb 2024-08-26 10:19:04 +02:00 committed by Thomas Petazzoni
parent 3ded56bd1b
commit 88c3ea5a08
5 changed files with 11 additions and 49 deletions

View file

@ -10,28 +10,27 @@ Upstream: Not applicable
Signed-off-by: David Gouarin <david.gouarin@thalesgroup.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
[Fabrice: update for 3.2.3]
SIgned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[Waldemar: update for 3.2.6]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
scripts/libtool.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 57915e1053..c28260dd7e 100644
index 64c2fe0804..9dc7910463 100644
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
# binary!
${JLIBTOOL}: ${top_makedir}/jlibtool.c
@@ -40,8 +40,8 @@ all install: ${JLIBTOOL}
# binary!
${JLIBTOOL}: ${top_makedir}/jlibtool.c
$(Q)mkdir -p $(dir $@)
- $(Q)echo CC jlibtool.c
- $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS}
+ $(Q)echo HOSTCC jlibtool.c
+ $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS}
clean: jlibtool_clean
clean: jlibtool_clean
--
2.17.1

View file

@ -1,37 +0,0 @@
From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001
From: Jared Bents <jared.bents@rockwellcollins.com>
Date: Tue, 4 Feb 2020 08:22:11 -0600
Subject: [PATCH] modules/rlm_sql: remove mysql_version.h
remove mysql_version.h as mysql.h is included and mysql_version.h
should not be included by per the header file warning
Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html
Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
[Applied upstream as https://github.com/FreeRADIUS/freeradius-server/commit/f20e80fce5f1b0589dccdf441b5d835188c0dfa2]
---
src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index a7992647cd..ea44d0cc7a 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -34,12 +34,10 @@ RCSID("$Id$")
#include "config.h"
#ifdef HAVE_MYSQL_MYSQL_H
-# include <mysql/mysql_version.h>
# include <mysql/errmsg.h>
# include <mysql/mysql.h>
# include <mysql/mysqld_error.h>
#elif defined(HAVE_MYSQL_H)
-# include <mysql_version.h>
# include <errmsg.h>
# include <mysql.h>
# include <mysqld_error.h>
--
2.17.1

View file

@ -1,4 +1,4 @@
# Locally computed, after checking
# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig
sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2
# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.6.tar.bz2.sig
sha256 18bbb2318448f13918897ae7a38b36afd3db7dd5c66f78ad24d2e0051269d9b2 freeradius-server-3.2.6.tar.bz2
sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT

View file

@ -4,7 +4,7 @@
#
################################################################################
FREERADIUS_SERVER_VERSION = 3.2.3
FREERADIUS_SERVER_VERSION = 3.2.6
FREERADIUS_SERVER_SOURCE = \
freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2
FREERADIUS_SERVER_SITE = https://freeradius.org/ftp/pub/freeradius