PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/asterisk/dahdi-linux.git
-PKG_SOURCE_DATE=2023-09-21
-PKG_SOURCE_VERSION:=1bb9088f2baff8c4e3fec536044cc48072cf9905
-PKG_MIRROR_HASH:=b32eb405d64c981f64922840f616cf362636ccc93506986c0b92bd4dcca5ab30
+PKG_SOURCE_DATE=2024-04-12
+PKG_SOURCE_VERSION:=83d89b64d9151dbe4eb53b9ebc8640a08fcf4d63
+PKG_MIRROR_HASH:=67acfb62213270050d941643cb763c315cc6a2682a94fc517975707918e42ecb
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
-@@ -64,9 +64,8 @@ obj-m += $(DAHDI_MODULES_EXTRA)
+@@ -72,9 +72,8 @@ obj-m += $(DAHDI_MODULES_EXTRA)
# If you want to build OSLEC, include the code in the standard location:
# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
# well:
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
-@@ -12,6 +12,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/
+@@ -13,6 +13,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp/
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE13XP) += wcte13xp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_HFCS) += hfcs/
ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
--- a/drivers/dahdi/Kconfig
+++ b/drivers/dahdi/Kconfig
-@@ -235,4 +235,14 @@ config DAHDI_DYNAMIC_LOC
- If unsure, say Y.
+@@ -282,6 +282,16 @@ config DAHDI_WCTE11XP
+ If unsure, say Y.
+config DAHDI_HFCS
+ tristate "Support for various HFC-S PCI BRI adapters"
+ If unsure, say Y.
+
source "drivers/dahdi/xpp/Kconfig"
+
+ config DAHDI_OPVXA1200
--- /dev/null
+++ b/drivers/dahdi/hfcs/base.c
@@ -0,0 +1,1742 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
-@@ -1768,11 +1769,13 @@ out:
+@@ -1771,11 +1772,13 @@ out:
static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
{
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
- drivers/dahdi/dahdi-base.c | 14 +++++++-------
- drivers/dahdi/wcaxx-base.c | 2 ++
- drivers/dahdi/wctdm24xxp/base.c | 2 ++
- drivers/dahdi/xpp/card_global.c | 2 +-
- 4 files changed, 12 insertions(+), 8 deletions(-)
+ drivers/dahdi/dahdi-base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
-@@ -7930,7 +7930,7 @@ static inline void __dahdi_process_getau
- memset(getlin, 0, DAHDI_CHUNKSIZE * sizeof(short));
- txb[0] = DAHDI_LIN2X(0, ms);
- memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
-- /* fallthrough */
-+ fallthrough;
- case DAHDI_CONF_CONF: /* Normal conference mode */
- if (is_pseudo_chan(ms)) /* if pseudo-channel */
- {
-@@ -7954,7 +7954,7 @@ static inline void __dahdi_process_getau
- memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
- break;
- }
-- /* fall through */
-+ fallthrough;
- case DAHDI_CONF_CONFMON: /* Conference monitor mode */
- if (ms->confmode & DAHDI_CONF_LISTENER) {
- /* Subtract out last sample written to conf */
-@@ -8493,7 +8493,7 @@ static void __dahdi_hooksig_pvt(struct d
- break;
- }
- #endif
-- /* fallthrough */
-+ fallthrough;
- case DAHDI_SIG_FXSGS: /* FXS Groundstart */
- if (rxsig == DAHDI_RXSIG_ONHOOK) {
- chan->ringdebtimer = RING_DEBOUNCE_TIME;
-@@ -8512,7 +8512,7 @@ static void __dahdi_hooksig_pvt(struct d
- chan->gotgs = 1;
- }
- }
-- /* fallthrough */
-+ fallthrough;
- case DAHDI_SIG_FXOLS: /* FXO Loopstart */
- case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
- switch(rxsig) {
-@@ -8612,7 +8612,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
- __dahdi_hooksig_pvt(chan, DAHDI_RXSIG_START);
- break;
- }
-- /* Fall through */
-+ fallthrough;
- case DAHDI_SIG_EM_E1:
- case DAHDI_SIG_FXOLS: /* FXO Loopstart */
- case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
-@@ -8630,7 +8630,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
+@@ -8645,7 +8645,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
break;
case DAHDI_SIG_FXSKS: /* FXS Kewlstart */
case DAHDI_SIG_FXSGS: /* FXS Groundstart */
case DAHDI_SIG_FXSLS:
if (!(cursig & DAHDI_BBIT)) {
/* Check for ringing first */
-@@ -9059,7 +9059,7 @@ static inline void __dahdi_process_putau
- memcpy(ss->putlin, putlin, DAHDI_CHUNKSIZE * sizeof(short));
- break;
- }
-- /* fall through */
-+ fallthrough;
- case DAHDI_CONF_CONFANN: /* Conference with announce */
- if (ms->confmode & DAHDI_CONF_TALKER) {
- /* Store temp value */
---- a/drivers/dahdi/wcaxx-base.c
-+++ b/drivers/dahdi/wcaxx-base.c
-@@ -1456,7 +1456,7 @@ wcaxx_check_battery_lost(struct wcaxx *w
- break;
- case BATTERY_UNKNOWN:
- mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK);
-- /* fallthrough */
-+ fallthrough;
- case BATTERY_PRESENT:
- fxo->battery_state = BATTERY_DEBOUNCING_LOST;
- fxo->battdebounce_timer = wc->framecount + battdebounce;
-@@ -1567,7 +1567,7 @@ wcaxx_check_battery_present(struct wcaxx
- break;
- case BATTERY_UNKNOWN:
- mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK);
-- /* fallthrough */
-+ fallthrough;
- case BATTERY_LOST:
- fxo->battery_state = BATTERY_DEBOUNCING_PRESENT;
- fxo->battdebounce_timer = wc->framecount + battdebounce;
---- a/drivers/dahdi/wctdm24xxp/base.c
-+++ b/drivers/dahdi/wctdm24xxp/base.c
-@@ -1964,7 +1964,7 @@ wctdm_check_battery_lost(struct wctdm *w
- break;
- case BATTERY_UNKNOWN:
- mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK);
-- /* fallthrough */
-+ fallthrough;
- case BATTERY_PRESENT:
- fxo->battery_state = BATTERY_DEBOUNCING_LOST;
- fxo->battdebounce_timer = wc->framecount + battdebounce;
-@@ -2074,7 +2074,7 @@ wctdm_check_battery_present(struct wctdm
- break;
- case BATTERY_UNKNOWN:
- mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK);
-- /* fallthrough */
-+ fallthrough;
- case BATTERY_LOST:
- fxo->battery_state = BATTERY_DEBOUNCING_PRESENT;
- fxo->battdebounce_timer = wc->framecount + battdebounce;
---- a/drivers/dahdi/xpp/card_global.c
-+++ b/drivers/dahdi/xpp/card_global.c
-@@ -148,7 +148,7 @@ static int execute_chip_command(xpd_t *x
- XPD_NOTICE(xpd,
- "'I' is deprecated in register commands. "
- "Use 'S' instead.\n");
-- /* fall through */
-+ fallthrough;
- case 'S':
- do_subreg = 1;
- num_args += 2; /* register + subreg */
+++ /dev/null
-From eea6daaa4cae1ddcd8e32c8b9e4273ba3244838c Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Fri, 12 May 2023 20:19:04 +0200
-Subject: [PATCH 2/6] dahdi: fix always true compilation warning
-
-Fix always true compilation warning on statically allocated array. Check
-content of the array instead.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- drivers/dahdi/dahdi-base.c | 6 +++---
- drivers/dahdi/dahdi_dynamic_ethmf.c | 2 +-
- drivers/dahdi/xpp/xbus-core.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/dahdi/dahdi-base.c
-+++ b/drivers/dahdi/dahdi-base.c
-@@ -928,9 +928,9 @@ static int dahdi_seq_show(struct seq_fil
- if (!s)
- return -ENODEV;
-
-- if (s->name)
-+ if (*(s->name))
- seq_printf(sfile, "Span %d: %s ", s->spanno, s->name);
-- if (s->desc)
-+ if (*(s->desc))
- seq_printf(sfile, "\"%s\"", s->desc);
- else
- seq_printf(sfile, "\"\"");
-@@ -969,7 +969,7 @@ static int dahdi_seq_show(struct seq_fil
- for (x = 0; x < s->channels; x++) {
- struct dahdi_chan *chan = s->chans[x];
-
-- if (chan->name)
-+ if (*(chan->name))
- seq_printf(sfile, "\t%4d %s ", chan->channo,
- chan->name);
-
---- a/drivers/dahdi/dahdi_dynamic_ethmf.c
-+++ b/drivers/dahdi/dahdi_dynamic_ethmf.c
-@@ -535,7 +535,7 @@ static void ztdethmf_destroy(struct dahd
- kfree(z->msgbuf);
- kfree(z);
- } else {
-- if (z && z->span && z->span->name) {
-+ if (z && z->span && *(z->span->name)) {
- printk(KERN_ERR "Cannot find interface for %s\n",
- z->span->name);
- }
---- a/drivers/dahdi/xpp/xbus-core.c
-+++ b/drivers/dahdi/xpp/xbus-core.c
-@@ -120,7 +120,7 @@ int xbus_check_unique(xbus_t *xbus)
- {
- if (!xbus)
- return -ENOENT;
-- if (xbus->label && *(xbus->label)) {
-+ if (*(xbus->label)) {
- xbus_t *xbus_old;
-
- XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label);
+++ /dev/null
-From d0699f781e96df6c1fd10551c92fa27695b297da Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Fri, 12 May 2023 20:19:45 +0200
-Subject: [PATCH 3/6] dahdi-sysfs-chan: fix bug if clause does not guard
-
-Fix bug if clause does not guard by a typo by missing the if clause and
-not correctly removing the device.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- drivers/dahdi/dahdi-sysfs-chan.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/dahdi/dahdi-sysfs-chan.c
-+++ b/drivers/dahdi/dahdi-sysfs-chan.c
-@@ -381,10 +381,11 @@ static void fixed_devfiles_remove(void)
- return;
- for (i = 0; i < ARRAY_SIZE(fixed_minors); i++) {
- void *d = fixed_minors[i].dev;
-- if (d && !IS_ERR(d))
-+ if (d && !IS_ERR(d)) {
- dahdi_dbg(DEVICES, "Removing fixed device file %s\n",
- fixed_minors[i].name);
- DEL_DAHDI_DEV(fixed_minors[i].minor);
-+ }
- }
- }
-
+++ /dev/null
-From 88cfe20bcd0be443fc7613fd287147d1c54b5f7f Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Fri, 12 May 2023 20:21:39 +0200
-Subject: [PATCH 5/6] dahdi: skip checking on releasing
-
-Skip checking on releasing since xb is statically allocated and always
-present.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- drivers/dahdi/wcte13xp-base.c | 3 +--
- drivers/dahdi/wcte43x-base.c | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/dahdi/wcte13xp-base.c
-+++ b/drivers/dahdi/wcte13xp-base.c
-@@ -2707,8 +2707,7 @@ static int __devinit te13xp_init_one(str
- return 0;
-
- fail_exit:
-- if (&wc->xb)
-- wcxb_release(&wc->xb);
-+ wcxb_release(&wc->xb);
-
- free_wc(wc);
- return res;
---- a/drivers/dahdi/wcte43x-base.c
-+++ b/drivers/dahdi/wcte43x-base.c
-@@ -3521,8 +3521,7 @@ static int __devinit t43x_init_one(struc
- return 0;
-
- fail_exit:
-- if (&wc->xb)
-- wcxb_release(&wc->xb);
-+ wcxb_release(&wc->xb);
-
- if (debug)
- dev_info(&wc->xb.pdev->dev, "***At fail_exit in init_one***\n");
--- a/drivers/dahdi/xpp/xbus-core.c
+++ b/drivers/dahdi/xpp/xbus-core.c
-@@ -1772,7 +1772,7 @@ static void xbus_fill_proc_queue(struct
+@@ -1775,7 +1775,7 @@ static void xbus_fill_proc_queue(struct
s32 rem;
s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
seq_printf(sfile,
--- /dev/null
+From d2563faf053da31e1329e7313339669f31c989da Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Wed, 20 Mar 2024 19:48:33 +0100
+Subject: [PATCH] dahdi_echocan_mg2: rename ABS define to PARA_ABS
+
+Rename ABS define to PARA_ABS to fix compilation error with mips 24kc
+arch.
+
+This target define in his ASM header a similar define ABS that cause
+conflicts and redefinition error for this driver.
+
+Rename ABS to PARA_ABS to better suite the usage as it's abs usage with
+value decremented by one if it's the max negative int.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ drivers/dahdi/dahdi_echocan_mg2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/dahdi/dahdi_echocan_mg2.c
++++ b/drivers/dahdi/dahdi_echocan_mg2.c
+@@ -44,7 +44,7 @@
+ static int debug;
+ static int aggressive;
+
+-#define ABS(a) abs(a!=-32768?a:-32767)
++#define PARA_ABS(a) abs(a!=-32768?a:-32767)
+
+ #define RESTORE_COEFFS {\
+ int x;\
+@@ -464,9 +464,9 @@ static inline short sample_update(struct
+ RESTORE_COEFFS;
+ }
+
+- sign_error = ABS(rs) - ABS(isig);
++ sign_error = PARA_ABS(rs) - PARA_ABS(isig);
+
+- if (ABS(sign_error) > MAX_SIGN_ERROR)
++ if (PARA_ABS(sign_error) > MAX_SIGN_ERROR)
+ {
+ rs = 0;
+ RESTORE_COEFFS;
--- /dev/null
+--- a/drivers/dahdi/opvxa1200/Kbuild
++++ b/drivers/dahdi/opvxa1200/Kbuild
+@@ -1,6 +1,6 @@
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200) += opvxa1200.o
+
+-EXTRA_CFLAGS += -I$(src)/.. -Wno-undef
++EXTRA_CFLAGS += -I$(src)/.. -Wno-undef -Wno-error=unused-variable
+
+ opvxa1200-objs := base.o
+
PKG_SOURCE_URL:=https://github.com/freeswitch/freetdm.git
PKG_SOURCE_DATE:=2021-08-30
PKG_SOURCE_VERSION:=8918ee1c3637cad0f9d41a402d26d3aa076fc202
-PKG_MIRROR_HASH:=c910ff0fb62c8a174f6e0bbd749783da1ecd71634d4dcde48b118909f4981943
+PKG_MIRROR_HASH:=fd7e658f27bcca67fceeacd72e61bdbb6bea784df2def3ca2659a28ce2079e7b
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=libsrtp
-PKG_VERSION:=2.4.2
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.0
+PKG_RELEASE:=1
-PKG_SOURCE:=libsrtp-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/cisco/libsrtp/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/cisco/libsrtp
+PKG_MIRROR_HASH:=7ee6ba7138e7e3c4b16dbb6aa1cd639dcca517f2aa3f7dafb2cf245d932e8448
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk
PKG_SOURCE_DATE=2023-06-16
PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4
PKG_RELEASE:=1
-PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920
+PKG_MIRROR_HASH:=4b380960934ca4feda6d615ae8e7bb3245d87276f04d86e12c2f5939aa36608e
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_SOURCE_VERSION:=503dba87d726854b74b49e70679e64e6e86d5812
PKG_SOURCE_DATE=2022-11-04
PKG_RELEASE:=1
-PKG_MIRROR_HASH:=0d585c108ec18d136ce03704b96d0a6769e617c820fc74f735e3e192ad282611
+PKG_MIRROR_HASH:=3cd8ea6e641a7623ba06000832ec5079e08f6f5eb234a3270710856fa0a37609
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
PKG_SOURCE_VERSION:=2f029ec8778420538c8151c6aceba0f7b44b07c9
PKG_SOURCE_DATE:=2021-09-11
-PKG_MIRROR_HASH:=0c57aeb33dc7efb0078e77907e0bc616f1714251e64d647a59faffe5af8bac73
+PKG_MIRROR_HASH:=9691624fb3465fb6af4f5d391dc4c0fc99dbb095e29cbef0574cf5838fb27053
PKG_SOURCE_PROTO:=git
PKG_LICENSE:=GPL-2.0
PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
PKG_SOURCE_VERSION:=968caa458920965c5dd15c31bcd50d21a891ab20
PKG_SOURCE_DATE:=2020-12-19
-PKG_MIRROR_HASH:=627e9057a70b01d1fd69c80c0f6a138c79aace10082d76016af23a6bafd2a3d7
+PKG_MIRROR_HASH:=705cd1cd30fc5db3143f87077e2c6511aaa463e1e160ad161a23ccd978fde24e
PKG_SOURCE_PROTO:=git
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=https://github.com/traud/asterisk-opus.git
PKG_SOURCE_DATE:=2021-11-01
PKG_SOURCE_VERSION:=20522fbcd3fdf6f0adb20602d096d14cd69055e8
-PKG_MIRROR_HASH:=e14dc42b0e5f4720e3f028e0b426f4e660bf315a103a015820ca3697e1fe9985
+PKG_MIRROR_HASH:=b69ff63f18a21168d94da97da453ebac30aa1de05d1fbef72723b6231c902e2f
PKG_SOURCE_PROTO:=git
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+PKG_BUILD_DEPENDS:=glib2/host
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=coturn
-PKG_VERSION:=4.6.1
+PKG_VERSION:=4.6.2
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/coturn/coturn/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=8fba86e593ed74adc46e002e925cccff2819745371814f42465fbe717483f1d8
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/coturn/coturn
+PKG_MIRROR_HASH:=55a7d63edfde6548cd6d6f1b62f6997beeebc66e0ff07b0afd175829434cbf3a
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>, Sebastian Kemper <sebastian_ml@gmx.net>
PKG_LICENSE:=BSD-COTURN-CITRIX COMBINED-CITRIX-VIVOCHA-BSD MIT-HASH
PKG_LICENSE_FILES:=LICENSE src/apps/relay/dbdrivers/* src/server/ns_turn_khash.h
-
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>, Sebastian Kemper <sebastian_ml@gmx.net>
-
-PKG_BUILD_PARALLEL:=1
+PKG_CPE_ID:=cpe:/a:coturn_project:coturn
PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS+= \
CONFIG_COTURN_ENABLE_MYSQL \
CONFIG_COTURN_ENABLE_REDIS \
CONFIG_COTURN_ENABLE_SQLITE
-PKG_CPE_ID:=cpe:/a:coturn_project:coturn
-
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
--- a/configure
+++ b/configure
-@@ -1047,9 +1047,9 @@ ${ECHO_CMD} "# Generated by configure sc
+@@ -1049,9 +1049,9 @@ ${ECHO_CMD} "# Generated by configure sc
${ECHO_CMD} "#################################" >> Makefile
${ECHO_CMD} "ECHO_CMD = ${ECHO_CMD}" >> Makefile
${ECHO_CMD} "CC = ${CC}" >> Makefile
+++ /dev/null
-https://github.com/coturn/coturn/commit/9af9f6306ab73c3403f9e11086b1936e9148f7de
-https://github.com/coturn/coturn/commit/4ce784a8781ab086c150e2b9f5641b1a37fd9b31
-https://github.com/coturn/coturn/commit/9370bb742d976166a51032760da1ecedefb92267
-https://github.com/coturn/coturn/commit/d72a2a8920b80ce66b36e22b2c22f308ad06c424
-
-From 9af9f6306ab73c3403f9e11086b1936e9148f7de Mon Sep 17 00:00:00 2001
-From: Pavel Punsky <eakraly@users.noreply.github.com>
-Date: Wed, 14 Sep 2022 03:29:26 -0700
-Subject: [PATCH] Fix renegotiation flag for older version of openssl (#978)
-
-`SSL_OP_NO_RENEGOTIATION` is only supported in openssl-1.1.0 and above
-Older versions have `SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS `
-
-Fixes #977 and #952
-
-Test:
-Build in a docker container running running openssl-1.0.2g (ubuntu
-16.04) successfully (without the fix getting the same errors)
---- a/src/apps/relay/dtls_listener.c
-+++ b/src/apps/relay/dtls_listener.c
-@@ -295,8 +295,17 @@ static ioa_socket_handle dtls_server_inp
- SSL_set_accept_state(connecting_ssl);
-
- SSL_set_bio(connecting_ssl, NULL, wbio);
-- SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE | SSL_OP_NO_RENEGOTIATION);
--
-+ SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-+ | SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
-+#endif
-+#else
-+#if defined(SSL_OP_NO_RENEGOTIATION)
-+ | SSL_OP_NO_RENEGOTIATION
-+#endif
-+#endif
-+ );
- SSL_set_max_cert_list(connecting_ssl, 655350);
-
- ioa_socket_handle rc = dtls_accept_client_connection(server, s, connecting_ssl,
-@@ -581,7 +590,17 @@ static int create_new_connected_udp_sock
-
- SSL_set_bio(connecting_ssl, NULL, wbio);
-
-- SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE | SSL_OP_NO_RENEGOTIATION);
-+ SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-+ | SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
-+#endif
-+#else
-+#if defined(SSL_OP_NO_RENEGOTIATION)
-+ | SSL_OP_NO_RENEGOTIATION
-+#endif
-+#endif
-+ );
-
- SSL_set_max_cert_list(connecting_ssl, 655350);
- int rc = ssl_read(ret->fd, connecting_ssl, server->sm.m.sm.nd.nbh,
---- a/src/apps/relay/ns_ioalib_engine_impl.c
-+++ b/src/apps/relay/ns_ioalib_engine_impl.c
-@@ -1428,7 +1428,17 @@ static void set_socket_ssl(ioa_socket_ha
- if(ssl) {
- SSL_set_app_data(ssl,s);
- SSL_set_info_callback(ssl, (ssl_info_callback_t)ssl_info_callback);
-- SSL_set_options(ssl, SSL_OP_NO_RENEGOTIATION);
-+ SSL_set_options(ssl,
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-+ SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
-+#endif
-+#else
-+#if defined(SSL_OP_NO_RENEGOTIATION)
-+ SSL_OP_NO_RENEGOTIATION
-+#endif
-+#endif
-+ );
- }
- }
- }
-@@ -1864,7 +1874,11 @@ int ssl_read(evutil_socket_t fd, SSL* ss
-
- } else if (!if1 && if2) {
-
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+ if(verbose && SSL_get1_peer_certificate(ssl)) {
-+#else
- if(verbose && SSL_get_peer_certificate(ssl)) {
-+#endif
- printf("\n------------------------------------------------------------\n");
- X509_NAME_print_ex_fp(stdout, X509_get_subject_name(SSL_get_peer_certificate(ssl)), 1,
- XN_FLAG_MULTILINE);
---- a/src/apps/uclient/startuclient.c
-+++ b/src/apps/uclient/startuclient.c
-@@ -138,7 +138,11 @@ static SSL* tls_connect(ioa_socket_raw f
- if (rc > 0) {
- TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,"%s: client session connected with cipher %s, method=%s\n",__FUNCTION__,
- SSL_get_cipher(ssl),turn_get_ssl_method(ssl,NULL));
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+ if(clnet_verbose && SSL_get1_peer_certificate(ssl)) {
-+#else
- if(clnet_verbose && SSL_get_peer_certificate(ssl)) {
-+#endif
- TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "------------------------------------------------------------\n");
- X509_NAME_print_ex_fp(stdout, X509_get_subject_name(SSL_get_peer_certificate(ssl)), 1,
- XN_FLAG_MULTILINE);
---- a/src/client/ns_turn_msg.c
-+++ b/src/client/ns_turn_msg.c
-@@ -248,12 +248,22 @@ int stun_produce_integrity_key_str(const
- if (FIPS_mode()) {
- EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- }
--#endif
-+#endif // defined EVP_MD_CTX_FLAG_NON_FIPS_ALLOW && !defined(LIBRESSL_VERSION_NUMBER)
- EVP_DigestInit_ex(&ctx,EVP_md5(), NULL);
- EVP_DigestUpdate(&ctx,str,strl);
- EVP_DigestFinal(&ctx,key,&keylen);
- EVP_MD_CTX_cleanup(&ctx);
--#else
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-+ unsigned int keylen = 0;
-+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-+ if (EVP_default_properties_is_fips_enabled(NULL)) {
-+ EVP_default_properties_enable_fips(NULL, 0);
-+ }
-+ EVP_DigestInit_ex(ctx,EVP_md5(), NULL);
-+ EVP_DigestUpdate(ctx,str,strl);
-+ EVP_DigestFinal(ctx,key,&keylen);
-+ EVP_MD_CTX_free(ctx);
-+#else // OPENSSL_VERSION_NUMBER < 0x10100000L
- unsigned int keylen = 0;
- EVP_MD_CTX *ctx = EVP_MD_CTX_new();
- #if defined EVP_MD_CTX_FLAG_NON_FIPS_ALLOW && ! defined(LIBRESSL_VERSION_NUMBER)
-@@ -265,7 +275,7 @@ int stun_produce_integrity_key_str(const
- EVP_DigestUpdate(ctx,str,strl);
- EVP_DigestFinal(ctx,key,&keylen);
- EVP_MD_CTX_free(ctx);
--#endif
-+#endif // OPENSSL_VERSION_NUMBER < 0X10100000L
- ret = 0;
- }
-
---- a/src/apps/relay/netengine.c
-+++ b/src/apps/relay/netengine.c
-@@ -31,13 +31,7 @@
- #include "mainrelay.h"
-
- //////////// Backward compatibility with OpenSSL 1.0.x //////////////
--#define HAVE_OPENSSL11_API (!(OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER))
--
--#ifndef HAVE_SSL_CTX_UP_REF
--#define HAVE_SSL_CTX_UP_REF HAVE_OPENSSL11_API
--#endif
--
--#if !HAVE_SSL_CTX_UP_REF
-+#if (OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER)
- #define SSL_CTX_up_ref(ctx) CRYPTO_add(&(ctx)->references, 1, CRYPTO_LOCK_SSL_CTX)
- #endif
-
---- a/src/apps/relay/mainrelay.c
-+++ b/src/apps/relay/mainrelay.c
-@@ -1353,7 +1353,6 @@ static void set_option(int c, char *valu
- STRCPY(turn_params.relay_ifname, value);
- break;
- case 'm':
--#if defined(OPENSSL_THREADS)
- if(atoi(value)>MAX_NUMBER_OF_GENERAL_RELAY_SERVERS) {
- TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: max number of relay threads is 128.\n");
- turn_params.general_relay_servers_number = MAX_NUMBER_OF_GENERAL_RELAY_SERVERS;
-@@ -1362,9 +1361,6 @@ static void set_option(int c, char *valu
- } else {
- turn_params.general_relay_servers_number = atoi(value);
- }
--#else
-- TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: OpenSSL version is too old OR does not support threading,\n I am using single thread for relaying.\n");
--#endif
- break;
- case 'd':
- STRCPY(turn_params.listener_ifname, value);
-@@ -2640,9 +2636,8 @@ int main(int argc, char **argv)
-
- ////////// OpenSSL locking ////////////////////////////////////////
-
--#if defined(OPENSSL_THREADS)
--
--static char some_buffer[65536];
-+#if defined(OPENSSL_THREADS)
-+#if OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0
-
- //array larger than anything that OpenSSL may need:
- static pthread_mutex_t mutex_buf[256];
-@@ -2660,76 +2655,52 @@ void coturn_locking_function(int mode, i
- }
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
- void coturn_id_function(CRYPTO_THREADID *ctid);
- void coturn_id_function(CRYPTO_THREADID *ctid)
- {
- UNUSED_ARG(ctid);
- CRYPTO_THREADID_set_numeric(ctid, (unsigned long)pthread_self());
- }
--#else
--unsigned long coturn_id_function(void);
--unsigned long coturn_id_function(void)
--{
-- return (unsigned long)pthread_self();
--}
--#endif
--
--#endif
-
- static int THREAD_setup(void) {
--
--#if defined(OPENSSL_THREADS)
--
-- int i;
--
-- some_buffer[0] = 0;
--
-+ int i;
- for (i = 0; i < CRYPTO_num_locks(); i++) {
- pthread_mutex_init(&(mutex_buf[i]), NULL);
- }
-
- mutex_buf_initialized = 1;
--
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1
- CRYPTO_THREADID_set_callback(coturn_id_function);
--#else
-- CRYPTO_set_id_callback(coturn_id_function);
--#endif
--
- CRYPTO_set_locking_callback(coturn_locking_function);
--#endif
--
- return 1;
- }
-
- int THREAD_cleanup(void);
- int THREAD_cleanup(void) {
-+ int i;
-
--#if defined(OPENSSL_THREADS)
--
-- int i;
-+ if (!mutex_buf_initialized)
-+ return 0;
-
-- if (!mutex_buf_initialized)
-- return 0;
-+ CRYPTO_THREADID_set_callback(NULL);
-+ CRYPTO_set_locking_callback(NULL);
-+ for (i = 0; i < CRYPTO_num_locks(); i++) {
-+ pthread_mutex_destroy(&(mutex_buf[i]));
-+ }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1
-- CRYPTO_THREADID_set_callback(NULL);
-+ mutex_buf_initialized = 0;
-+ return 1;
-+}
- #else
-- CRYPTO_set_id_callback(NULL);
--#endif
--
-- CRYPTO_set_locking_callback(NULL);
-- for (i = 0; i < CRYPTO_num_locks(); i++) {
-- pthread_mutex_destroy(&(mutex_buf[i]));
-- }
--
-- mutex_buf_initialized = 0;
--
--#endif
-+static int THREAD_setup(void) {
-+ return 1;
-+}
-
-- return 1;
-+int THREAD_cleanup(void);
-+int THREAD_cleanup(void){
-+ return 1;
- }
-+#endif /* OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0 */
-+#endif /* defined(OPENSSL_THREADS) */
-
- static void adjust_key_file_name(char *fn, const char* file_title, int critical)
- {
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=686eb06d4a395d94c364efff4b63579af76ebec7
PKG_SOURCE_DATE:=2017-06-29
-PKG_MIRROR_HASH:=005a7d3c69beda7d32c1a671bfe0befa5477ac3c67f21bf086d588f4c760e303
+PKG_MIRROR_HASH:=7b9ae6e5ce983d534f9e02bdc3b8d2e77c8d773e25974f6ad65ac1319fff07a4
include $(INCLUDE_DIR)/package.mk
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_URL:=https://svn.code.sf.net/p/pcapsipdump/code/trunk
+PKG_MIRROR_HASH:=563050f47c7962de377cab17478a86d3ea6726a331a7c77be62cb3f5488e519a
PKG_SOURCE_VERSION:=157
PKG_SOURCE_DATE=2020-03-03
PKG_RELEASE:=1
PKG_SOURCE_DATE=2019-10-02
PKG_SOURCE_VERSION:=aa1f179e09097f467bc4726e3300014c1e35246f
PKG_RELEASE:=4
-PKG_MIRROR_HASH:=7acc5f5bf2d4be23e9a2fad0c4e7576f172191c9f1b37104aee4d05dbdcac8fd
+PKG_MIRROR_HASH:=36ecff6b69b580db5fe7e34e1d6764f111aa26ce81999743cea1f3c80ffa545c
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_SOURCE_VERSION:=1cc00079cd80310f7e8b1a696e9a02b8a2b25e04
PKG_SOURCE_DATE=2019-06-27
PKG_RELEASE:=3
-PKG_MIRROR_HASH:=3480f83a4af2a2972f3aa981343b067fa35ddc74f42c3e459630f31aba8f2d91
+PKG_MIRROR_HASH:=2c90b4e262be7270bcc9a2de975adbe8f67dee5ff0c30b397036f2e69229f515
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=https://github.com/hb9xar/siproxd.git
PKG_SOURCE_DATE:=2022-02-18
PKG_SOURCE_VERSION:=4750bea4ffedb4543a404dafc979c2b16b53e523
-PKG_MIRROR_HASH:=e6c4266b9eba43792908cf7c4ee73c32eee7b3a227ee671a5381cc335295fc05
+PKG_MIRROR_HASH:=9b2fa84b4c05d68f758a35070af970c852ff4cb8beea3d7f93663b10a17e1df8
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
projects / feed / telephony.git / commitdiff