From 53e3e5d127391a36912654a3a82ce1d40ca49eca Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 3 Jul 2022 22:53:27 +0200 Subject: [PATCH] radsecproxy: update to 1.9.1 Remove upstreamed patches: - 100-fix-setstacksize-for-glibc-2.34.patch Refresh patches: - 200-logdest-on-foreground.patch Changes: Misc: - OpenSSL 3.0 compatibility Bug Fixes: - Fix refused startup with openssl <1.1 - Fix compiler issue for Fedora 33 on s390x - Fix small memory leak in config parser - Fix lazy certificate check when connecting to TLS servers - Fix connect is aborted if first host in list has invalid certificate - Fix setstacksize for glibc 2.34 - Fix system defaults/settings for TLS version not honored Signed-off-by: Nick Hainke --- net/radsecproxy/Makefile | 6 +- .../100-fix-setstacksize-for-glibc-2.34.patch | 58 ------------------- .../patches/200-logdest-on-foreground.patch | 2 +- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 net/radsecproxy/patches/100-fix-setstacksize-for-glibc-2.34.patch diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile index 0f89fac019..eec4cebdf4 100644 --- a/net/radsecproxy/Makefile +++ b/net/radsecproxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radsecproxy -PKG_VERSION:=1.9.0 -PKG_RELEASE:=3 +PKG_VERSION:=1.9.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/radsecproxy/radsecproxy/releases/download/$(PKG_VERSION)/ -PKG_HASH:=440624c53ae67c8e245b9b60ad4d29525471e957d923d94cf72945efc40f4a28 +PKG_HASH:=e08e4e04d188deafd0b55b2f66b1e7fff9bdb553fb170846590317d02c9dc5db PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_LICENSE:=BSD-3-CLAUSE diff --git a/net/radsecproxy/patches/100-fix-setstacksize-for-glibc-2.34.patch b/net/radsecproxy/patches/100-fix-setstacksize-for-glibc-2.34.patch deleted file mode 100644 index 537fd11f14..0000000000 --- a/net/radsecproxy/patches/100-fix-setstacksize-for-glibc-2.34.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 241164a201e03acce363e902fb25e452827211f0 Mon Sep 17 00:00:00 2001 -From: Fabian Mauchle -Date: Mon, 26 Jul 2021 14:12:15 +0200 -Subject: [PATCH] fix setstacksize for glibc 2.34 (fix #91) - ---- - ChangeLog | 1 + - radsecproxy.c | 10 ++++++++-- - radsecproxy.h | 12 +++--------- - 3 files changed, 12 insertions(+), 11 deletions(-) - ---- a/radsecproxy.c -+++ b/radsecproxy.c -@@ -3031,6 +3031,7 @@ int createpidfile(const char *pidfile) { - int radsecproxy_main(int argc, char **argv) { - pthread_t sigth; - sigset_t sigset; -+ size_t stacksize; - struct list_node *entry; - uint8_t foreground = 0, pretend = 0, loglevel = 0; - char *configfile = NULL, *pidfile = NULL; -@@ -3042,8 +3043,13 @@ int radsecproxy_main(int argc, char **ar - - if (pthread_attr_init(&pthread_attr)) - debugx(1, DBG_ERR, "pthread_attr_init failed"); -- if (pthread_attr_setstacksize(&pthread_attr, PTHREAD_STACK_SIZE)) -- debugx(1, DBG_ERR, "pthread_attr_setstacksize failed"); -+#if defined(PTHREAD_STACK_MIN) -+ stacksize = THREAD_STACK_SIZE > PTHREAD_STACK_MIN ? THREAD_STACK_SIZE : PTHREAD_STACK_MIN; -+#else -+ stacksize = THREAD_STACK_SIZE; -+#endif -+ if (pthread_attr_setstacksize(&pthread_attr, stacksize)) -+ debug(DBG_WARN, "pthread_attr_setstacksize failed! Using system default. Memory footprint might be increased!"); - #if defined(HAVE_MALLOPT) - if (mallopt(M_TRIM_THRESHOLD, 4 * 1024) != 1) - debugx(1, DBG_ERR, "mallopt failed"); ---- a/radsecproxy.h -+++ b/radsecproxy.h -@@ -28,15 +28,9 @@ - #define STATUS_SERVER_PERIOD 25 - #define IDLE_TIMEOUT 300 - --/* We want PTHREAD_STACK_SIZE to be 32768, but some platforms -- * have a higher minimum value defined in PTHREAD_STACK_MIN. */ --#define PTHREAD_STACK_SIZE 32768 --#if defined(PTHREAD_STACK_MIN) --#if PTHREAD_STACK_MIN > PTHREAD_STACK_SIZE --#undef PTHREAD_STACK_SIZE --#define PTHREAD_STACK_SIZE PTHREAD_STACK_MIN --#endif --#endif -+/* Target value for stack size. -+ * Some platforms might define higher minimums in PTHREAD_STACK_MIN. */ -+#define THREAD_STACK_SIZE 32768 - - /* For systems that only support RFC 2292 Socket API, but not RFC 3542 - * like Cygwin */ diff --git a/net/radsecproxy/patches/200-logdest-on-foreground.patch b/net/radsecproxy/patches/200-logdest-on-foreground.patch index 3d00aaba0c..54c18f35ad 100644 --- a/net/radsecproxy/patches/200-logdest-on-foreground.patch +++ b/net/radsecproxy/patches/200-logdest-on-foreground.patch @@ -1,6 +1,6 @@ --- a/radsecproxy.c +++ b/radsecproxy.c -@@ -3073,15 +3073,13 @@ int radsecproxy_main(int argc, char **ar +@@ -3075,15 +3075,13 @@ int radsecproxy_main(int argc, char **ar options.loglevel = loglevel; else if (options.loglevel) debug_set_level(options.loglevel);