From 808200c9f3de9c433ec51266a5284bc7cb26f698 Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Sat, 12 Jul 2025 17:00:37 +0200 Subject: [PATCH 1/4] coturn: update to 4.7.0 - Update version to 4.7.0 - Refresh patches - Explicitely provide config file (`-c` option) - Add option to enable prometheus exporter Signed-off-by: Vladimir Ermakov --- net/coturn/Makefile | 22 +++++++++++++++------ net/coturn/files/turnserver.conf | 2 +- net/coturn/patches/01-includes.patch | 2 +- net/coturn/patches/02-fix-flags-dupes.patch | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/net/coturn/Makefile b/net/coturn/Makefile index 30f7b07b..1cecafc7 100644 --- a/net/coturn/Makefile +++ b/net/coturn/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coturn -PKG_VERSION:=4.6.2 +PKG_VERSION:=4.7.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/coturn/coturn -PKG_MIRROR_HASH:=55a7d63edfde6548cd6d6f1b62f6997beeebc66e0ff07b0afd175829434cbf3a +PKG_MIRROR_HASH:=d98e18fe023fc4fc21386e837e0b57540d805f1ca519d88d2c31081015f7c9ab PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-COTURN-CITRIX COMBINED-CITRIX-VIVOCHA-BSD MIT-HASH @@ -26,7 +26,8 @@ PKG_CONFIG_DEPENDS+= \ CONFIG_COTURN_ENABLE_MYSQL \ CONFIG_COTURN_ENABLE_POSTGRESQL \ CONFIG_COTURN_ENABLE_REDIS \ - CONFIG_COTURN_ENABLE_SQLITE + CONFIG_COTURN_ENABLE_SQLITE \ + CONFIG_COTURN_ENABLE_PROMETHEUS include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -47,7 +48,10 @@ define Package/coturn +COTURN_ENABLE_MYSQL:libmariadb \ +COTURN_ENABLE_POSTGRESQL:libpq \ +COTURN_ENABLE_REDIS:libhiredis \ - +COTURN_ENABLE_SQLITE:libsqlite3 + +COTURN_ENABLE_SQLITE:libsqlite3 \ + +COTURN_ENABLE_PROMETHEUS:libprom \ + +COTURN_ENABLE_PROMETHEUS:libmicrohttpd \ + +COTURN_ENABLE_PROMETHEUS:libatomic FILE_MODES:=/etc/turnserver:turnserver:turnserver:0750 endef @@ -86,6 +90,12 @@ define Package/coturn/config help Enable Redis support + config COTURN_ENABLE_PROMETHEUS + bool "Prometheus support" + default n + help + Enable Prometheus exporter + endmenu endef @@ -127,14 +137,14 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS+= \ ARCHIVERCMD="$(TARGET_AR) -r" \ LIBEV_OK=1 \ - TURN_NO_PROMETHEUS=1 \ TURN_NO_SCTP=1 \ TURN_NO_SYSTEMD=1 \ TURN_NO_MONGO=1 \ $(if $(CONFIG_COTURN_ENABLE_MYSQL),,TURN_NO_MYSQL=1) \ $(if $(CONFIG_COTURN_ENABLE_POSTGRESQL),,TURN_NO_PQ=1) \ $(if $(CONFIG_COTURN_ENABLE_REDIS),,TURN_NO_HIREDIS=1) \ - $(if $(CONFIG_COTURN_ENABLE_SQLITE),,TURN_NO_SQLITE=1) + $(if $(CONFIG_COTURN_ENABLE_SQLITE),,TURN_NO_SQLITE=1) \ + $(if $(CONFIG_COTURN_ENABLE_PROMETHEUS),,TURN_NO_PROMETHEUS=1) define Build/InstallDev endef diff --git a/net/coturn/files/turnserver.conf b/net/coturn/files/turnserver.conf index d6eec32f..40cd6630 100644 --- a/net/coturn/files/turnserver.conf +++ b/net/coturn/files/turnserver.conf @@ -3,4 +3,4 @@ config turnserver 'general' option enabled '0' option log_stderr '0' option log_stdout '0' - option options '--pidfile /var/run/turnserver.pid --log-file syslog --no-cli --proc-user turnserver --proc-group turnserver' + option options '-c /etc/turnserver.conf --pidfile /var/run/turnserver.pid --log-file syslog --no-cli --proc-user turnserver --proc-group turnserver' diff --git a/net/coturn/patches/01-includes.patch b/net/coturn/patches/01-includes.patch index 9cd7a7cc..c70c38a4 100644 --- a/net/coturn/patches/01-includes.patch +++ b/net/coturn/patches/01-includes.patch @@ -5,5 +5,5 @@ -LIBEVENT_INCLUDE = -I${PREFIX}/include/ -I/usr/local/include/ +LIBEVENT_INCLUDE = - INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE} + INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE} diff --git a/net/coturn/patches/02-fix-flags-dupes.patch b/net/coturn/patches/02-fix-flags-dupes.patch index b42f26dd..0d2bc51a 100644 --- a/net/coturn/patches/02-fix-flags-dupes.patch +++ b/net/coturn/patches/02-fix-flags-dupes.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -1049,9 +1049,9 @@ ${ECHO_CMD} "# Generated by configure sc +@@ -1046,9 +1046,9 @@ ${ECHO_CMD} "# Generated by configure sc ${ECHO_CMD} "#################################" >> Makefile ${ECHO_CMD} "ECHO_CMD = ${ECHO_CMD}" >> Makefile ${ECHO_CMD} "CC = ${CC}" >> Makefile From 924aa7dd684decff5ec84b2e8f633e19f3c0876d Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Tue, 15 Jul 2025 09:53:02 +0200 Subject: [PATCH 2/4] libprom: add prometheus instrumentation library 0.1.3 - Add library for Coturn. Signed-off-by: Vladimir Ermakov --- libs/libprom/Makefile | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 libs/libprom/Makefile diff --git a/libs/libprom/Makefile b/libs/libprom/Makefile new file mode 100644 index 00000000..70bda31a --- /dev/null +++ b/libs/libprom/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2010-2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libprom +PKG_VERSION:=0.1.3 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=v$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/digitalocean/prometheus-client-c.git +PKG_MIRROR_HASH:=e3c5d90dff57fca810abd46e65b46ac1205f7049d4022d8244180b68c43b4320 + +PKG_MAINTAINER:=Vladimir Ermakov +PKG_LICENSE:=Apache-2.0 + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +CMAKE_INSTALL:=1 +CMAKE_SOURCE_SUBDIR:=prom + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/libprom + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Prometheus instrumentation library for C + URL:=https://github.com/digitalocean/prometheus-client-c +endef + +define Package/libprom/description + This project provides shared libraries for instrumenting software via Prometheus. +endef + +define Package/libprom/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprom.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libprom)) From e3e8bf7c5f8fcbd30dcaf05c8696f41525060577 Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Fri, 20 Mar 2026 09:55:13 +0100 Subject: [PATCH 3/4] coturn: update to 4.9.0 Release note: https://github.com/coturn/coturn/releases/tag/4.9.0 Signed-off-by: Vladimir Ermakov --- net/coturn/Makefile | 4 ++-- net/coturn/patches/02-fix-flags-dupes.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/coturn/Makefile b/net/coturn/Makefile index 1cecafc7..a435f620 100644 --- a/net/coturn/Makefile +++ b/net/coturn/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coturn -PKG_VERSION:=4.7.0 +PKG_VERSION:=4.9.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/coturn/coturn -PKG_MIRROR_HASH:=d98e18fe023fc4fc21386e837e0b57540d805f1ca519d88d2c31081015f7c9ab +PKG_MIRROR_HASH:=a22da37fb444d337ce01b8251af8ce5d04d8a8d7158482f4a292760412884c67 PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-COTURN-CITRIX COMBINED-CITRIX-VIVOCHA-BSD MIT-HASH diff --git a/net/coturn/patches/02-fix-flags-dupes.patch b/net/coturn/patches/02-fix-flags-dupes.patch index 0d2bc51a..f5b2365b 100644 --- a/net/coturn/patches/02-fix-flags-dupes.patch +++ b/net/coturn/patches/02-fix-flags-dupes.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -1046,9 +1046,9 @@ ${ECHO_CMD} "# Generated by configure sc +@@ -1053,9 +1053,9 @@ ${ECHO_CMD} "# Generated by configure sc ${ECHO_CMD} "#################################" >> Makefile ${ECHO_CMD} "ECHO_CMD = ${ECHO_CMD}" >> Makefile ${ECHO_CMD} "CC = ${CC}" >> Makefile From ed20ae8c461de557ca59681509240d00d738bb1c Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Wed, 15 Apr 2026 15:25:01 +0200 Subject: [PATCH 4/4] coturn: update to 4.10.0 Release note: https://github.com/coturn/coturn/releases/tag/4.10.0 Signed-off-by: Vladimir Ermakov --- net/coturn/Makefile | 4 ++-- net/coturn/patches/03-fix-recvmmsg-glibc.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 net/coturn/patches/03-fix-recvmmsg-glibc.patch diff --git a/net/coturn/Makefile b/net/coturn/Makefile index a435f620..79c085c7 100644 --- a/net/coturn/Makefile +++ b/net/coturn/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coturn -PKG_VERSION:=4.9.0 +PKG_VERSION:=4.10.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/coturn/coturn -PKG_MIRROR_HASH:=a22da37fb444d337ce01b8251af8ce5d04d8a8d7158482f4a292760412884c67 +PKG_MIRROR_HASH:=2522a4bab37d66ece99f630ead2d085bb9380f2324f9b03b6f731fd5dab3d8ef PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-COTURN-CITRIX COMBINED-CITRIX-VIVOCHA-BSD MIT-HASH diff --git a/net/coturn/patches/03-fix-recvmmsg-glibc.patch b/net/coturn/patches/03-fix-recvmmsg-glibc.patch new file mode 100644 index 00000000..dd84bc60 --- /dev/null +++ b/net/coturn/patches/03-fix-recvmmsg-glibc.patch @@ -0,0 +1,13 @@ +--- a/src/apps/relay/dtls_listener.c ++++ b/src/apps/relay/dtls_listener.c +@@ -32,6 +32,10 @@ + * SUCH DAMAGE. + */ + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ + #include "apputils.h" + #include "mainrelay.h" + #include