asterisk: add contact_fqdn option for transports

asterisk-chan-lantiq: add user 'asterisk' to 'vmmc' group

.github/issue_template

@@ -1,20 +1,16 @@
-Please make sure that the issue subject starts with `<package-name>: ` so that it's easily identifiable.
+Please make sure that the issue subject starts with `<package-name>: `
 
-This repo here is ONLY for packages maintained in this repo.  For base packages residing in the same repo as the build system and maintained by core devs, please consider opening tickets there for more timely responses
+Also make sure that the package is maintained in this repository and not in base which should be submitted at https://bugs.openwrt.org or in the LuCI repository which should be submitted at https://github.com/openwrt/luci/issues.
 
- - OpenWrt: https://dev.openwrt.org/newticket
- - LEDE: https://bugs.lede-project.org/
- - Most LuCI packages: https://github.com/openwrt/luci/issues
+Issues related to releases below 18.06 and forks are not supported or maintained and will be closed.
 
-Thanks for your contribution
-Please remove this text (before ---) and fill the following template
--------------------------------
+# Issue template (remove lines from top till here)
 
-Maintainer: @<github-user> (find it by checking history of the package Makefile)
-Environment: (put here arch, model, OpenWRT/LEDE version)
+Maintainer: @\<github-user> (find it by checking history of the package Makefile)
+Environment: (put here arch, model, OpenWrt version)
 
 Description:
 
 ```
-Formating code blocks by wrapping them with pairs of ```
+Format code blocks by wrapping them with pairs of ```
 ```

.github/pull_request_template

@@ -1,16 +1,5 @@
-Please double check that your commits:
-- all start with "<package name>: "
-- all contain signed-off-by
-- are linked to your github account (you see your logo in front of them)
-
-Please also read https://github.com/openwrt/packages/blob/master/CONTRIBUTING.md
-
-Thanks for your contribution
-Please remove this text (before ---) and fill the following template
--------------------------------
-
-Maintainer: me / @<github-user>
-Compile tested: (put here arch, model, OpenWRT/LEDE version)
-Run tested: (put here arch, model, OpenWRT/LEDE version, tests done)
+Maintainer: me / @\<github-user> (find it by checking history of the package Makefile)
+Compile tested: (put here arch, model, OpenWrt version)
+Run tested: (put here arch, model, OpenWrt version, tests done)
 
 Description:

.github/workflows/Dockerfile

@@ -0,0 +1,6 @@
+ARG ARCH=x86-64
+FROM openwrt/rootfs:$ARCH
+
+ADD entrypoint.sh /entrypoint.sh
+
+CMD ["/entrypoint.sh"]

.github/workflows/check-autorelease-deprecation.yml

@@ -0,0 +1,91 @@
+name: Check autorelease deprecation
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, converted_to_draft, ready_for_review, edited]
+
+jobs:
+  build:
+    name: Check autorelease deprecation
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Determine branch name
+        run: |
+          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Determine changed packages
+        run: |
+          RET=0
+
+          # only detect packages with changes
+          PKG_ROOTS=$(find . -name Makefile | \
+            grep -v ".*/src/Makefile" | \
+            sed -e 's@./\(.*\)/Makefile@\1/@')
+          CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
+
+          for ROOT in $PKG_ROOTS; do
+            for CHANGE in $CHANGES; do
+              if [[ "$CHANGE" == "$ROOT"* ]]; then
+                if grep -q '$(AUTORELEASE)' "$ROOT/Makefile"; then
+                  CONTAINS_AUTORELEASE+="$ROOT"
+                fi
+                break
+              fi
+            done
+          done
+
+          if [ -n "$CONTAINS_AUTORELEASE" ]; then
+            RET=1
+            cat > "$GITHUB_WORKSPACE/pr_comment.md" << EOF
+          Please do no longer set *PKG_RELEASE* to *AUTORELEASE* as the
+          feature is deprecated. Please use an integer instead. Below is a
+          list of affected packages including correct *PKG_RELEASE*:
+
+          EOF
+          fi
+
+          for ROOT in $CONTAINS_AUTORELEASE; do
+            echo -n "  - ${ROOT}Makefile: PKG_RELEASE:=" >> "$GITHUB_WORKSPACE/pr_comment.md"
+            last_bump="$(git log --pretty=format:'%h %s' "$ROOT" |
+              grep --max-count=1 -e ': [uU]pdate to ' -e ': [bB]ump to ' |
+              cut -f 1 -d ' ')"
+
+            if [ -n "$last_bump" ]; then
+              echo -n $(($(git rev-list --count "$last_bump..HEAD" "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            else
+              echo -n $(($(git rev-list --count HEAD "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            fi
+            echo >> "$GITHUB_WORKSPACE/pr_comment.md"
+          done
+
+          exit $RET
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        if: ${{ failure() }}
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+
+      - name: Create or update comment
+        uses: peter-evans/create-or-update-comment@v2
+        if: ${{ failure() }}
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-file: 'pr_comment.md'
+          edit-mode: replace

.github/workflows/ci_helpers.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+color_out() {
+	printf "\e[0;$1m$PKG_NAME: %s\e[0;0m\n" "$2"
+}
+
+success() {
+	color_out 32 "$1"
+}
+
+info() {
+	color_out 36 "$1"
+}
+
+err() {
+	color_out 31 "$1"
+}
+
+warn() {
+	color_out 33 "$1"
+}
+
+err_die() {
+	err "$1"
+	exit 1
+}

.github/workflows/entrypoint.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# not enabling `errtrace` and `pipefail` since those are bash specific
+set -o errexit # failing commands causes script to fail
+set -o nounset # undefined variables causes script to fail 
+
+mkdir -p /var/lock/
+
+opkg update
+
+[ -n "${CI_HELPER:=''}" ] || CI_HELPER="/ci/.github/workflows/ci_helpers.sh"
+
+for PKG in /ci/*.ipk; do
+	tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control 
+	# package name including variant
+	PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control)
+	# package version without release
+	PKG_VERSION=$(sed -ne 's#^Version: \(.*\)-[0-9]*$#\1#p' ./control)
+	# package source contianing test.sh script
+	PKG_SOURCE=$(sed -ne 's#^Source: .*/\(.*\)$#\1#p' ./control)
+
+	echo "Testing package $PKG_NAME in version $PKG_VERSION from $PKG_SOURCE"
+
+	opkg install "$PKG"
+
+	export PKG_NAME PKG_VERSION CI_HELPER
+
+	TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/test.sh
+
+	if [ -f "$TEST_SCRIPT" ]; then
+		echo "Use package specific test.sh"
+		if sh "$TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
+			echo "Test successful"
+		else
+			echo "Test failed"
+			exit 1
+		fi
+	else
+		echo "No test.sh script available"
+	fi
+
+	opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove
+done

.github/workflows/formal.yml

@@ -0,0 +1,63 @@
+name: Test Formalities
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Test Formalities
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Determine branch name
+        run: |
+          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Test formalities
+        run: |
+          source .github/workflows/ci_helpers.sh
+
+          RET=0
+          for commit in $(git rev-list HEAD ^origin/$BRANCH); do
+            info "=== Checking commit '$commit'"
+            if git show --format='%P' -s $commit | grep -qF ' '; then
+              err "Pull request should not include merge commits"
+              RET=1
+            fi
+
+            author="$(git show -s --format=%aN $commit)"
+            if echo $author | grep -q '\S\+\s\+\S\+'; then
+              success "Author name ($author) seems ok"
+            else
+              err "Author name ($author) need to be your real name 'firstname lastname'"
+              RET=1
+            fi
+
+            subject="$(git show -s --format=%s $commit)"
+            if echo "$subject" | grep -q -e '^[0-9A-Za-z,+/_-]\+: ' -e '^Revert '; then
+              success "Commit subject line seems ok ($subject)"
+            else
+              err "Commit subject line MUST start with '<package name>: ' ($subject)"
+              RET=1
+            fi
+
+            body="$(git show -s --format=%b $commit)"
+            sob="$(git show -s --format='Signed-off-by: %aN <%aE>' $commit)"
+            if echo "$body" | grep -qF "$sob"; then
+              success "Signed-off-by match author"
+            else
+              err "Signed-off-by is missing or doesn't match author (should be '$sob')"
+              RET=1
+            fi
+          done
+
+          exit $RET

.github/workflows/multi-arch-test-build.yml

@@ -0,0 +1,164 @@
+name: Test Build
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Test ${{ matrix.arch }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: arm_cortex-a9_vfpv3-d16
+            target: mvebu-cortexa9
+            runtime_test: false
+
+          - arch: mips_24kc
+            target: ath79-generic
+            runtime_test: false
+
+          - arch: mipsel_24kc
+            target: mt7621
+            runtime_test: false
+
+          - arch: powerpc_464fp
+            target: apm821xx-nand
+            runtime_test: false
+
+          - arch: powerpc_8548
+            target: mpc85xx-p1010
+            runtime_test: false
+
+          - arch: aarch64_cortex-a53
+            target: mvebu-cortexa53
+            runtime_test: true
+
+          - arch: arm_cortex-a15_neon-vfpv4
+            target: armvirt-32
+            runtime_test: true
+
+          - arch: i386_pentium-mmx
+            target: x86-geode
+            runtime_test: true
+
+          - arch: x86_64
+            target: x86-64
+            runtime_test: true
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Determine branch name
+        run: |
+          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Determine changed packages
+        run: |
+          # only detect packages with changes
+          PKG_ROOTS=$(find . -name Makefile | \
+            grep -v ".*/src/Makefile" | \
+            sed -e 's@./\(.*\)/Makefile@\1/@')
+          CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
+
+          for ROOT in $PKG_ROOTS; do
+            for CHANGE in $CHANGES; do
+              if [[ "$CHANGE" == "$ROOT"* ]]; then
+                PACKAGES+=$(echo "$ROOT" | sed -e 's@.*/\(.*\)/@\1 @')
+                break
+              fi
+            done
+          done
+
+          # fallback to test packages if nothing explicitly changes this is
+          # should run if other mechanics in packages.git changed
+          PACKAGES="${PACKAGES:-vim attendedsysupgrade-common bmon}"
+
+          echo "Building $PACKAGES"
+          echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
+
+      - name: Build
+        uses: openwrt/gh-action-sdk@v5
+        env:
+          ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
+          FEEDNAME: packages_ci
+
+      - name: Move created packages to project dir
+        run: cp bin/packages/${{ matrix.arch }}/packages_ci/*.ipk . || true
+
+      - name: Collect metadata
+        run: |
+          MERGE_ID=$(git rev-parse --short HEAD)
+          echo "MERGE_ID=$MERGE_ID" >> $GITHUB_ENV
+          echo "BASE_ID=$(git rev-parse --short HEAD^1)" >> $GITHUB_ENV
+          echo "HEAD_ID=$(git rev-parse --short HEAD^2)" >> $GITHUB_ENV
+          PRNUMBER=${GITHUB_REF_NAME%/merge}
+          echo "PRNUMBER=$PRNUMBER" >> $GITHUB_ENV
+          echo "ARCHIVE_NAME=${{matrix.arch}}-PR$PRNUMBER-$MERGE_ID" >> $GITHUB_ENV
+
+      - name: Generate metadata
+        run: |
+          cat << _EOF_ > PKG-INFO
+          Metadata-Version: 2.1
+          Name: ${{env.ARCHIVE_NAME}}
+          Version: $BRANCH
+          Author: $GITHUB_ACTOR
+          Home-page: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$PRNUMBER
+          Download-URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
+          Summary: $PACKAGES
+          Platform: ${{ matrix.arch }}
+
+          Packages for OpenWrt $BRANCH running on ${{matrix.arch}}, built from PR $PRNUMBER
+          at commit $HEAD_ID, against $BRANCH at commit $BASE_ID, with merge SHA $MERGE_ID.
+
+          Modified packages:
+          _EOF_
+          for p in $PACKAGES
+          do
+            echo "  "$p >> PKG-INFO
+          done
+          echo >> PKG-INFO
+          echo Full file listing: >> PKG-INFO
+          ls -al *.ipk >> PKG-INFO || true
+          cat PKG-INFO
+
+      - name: Store packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{env.ARCHIVE_NAME}}-packages
+          path: |
+            *.ipk
+            PKG-INFO
+
+      - name: Store logs
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{env.ARCHIVE_NAME}}-logs
+          path: |
+            logs/
+            PKG-INFO
+
+      - name: Remove logs
+        run: sudo rm -rf logs/ || true
+
+      - name: Register QEMU
+        if: ${{ matrix.runtime_test }}
+        run: |
+          sudo docker run --rm --privileged aptman/qus -s -- -p
+
+      - name: Build Docker container
+        if: ${{ matrix.runtime_test }}
+        run: |
+          docker build -t test-container --build-arg ARCH .github/workflows/
+        env:
+          ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
+
+      - name: Test via Docker container
+        if: ${{ matrix.runtime_test }}
+        run: |
+          docker run --rm -v $GITHUB_WORKSPACE:/ci test-container

libs/bcg729/Makefile

@@ -8,18 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcg729
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=3
+PKG_VERSION:=1.1.1
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.linphone.org/releases/sources/bcg729
-PKG_HASH:=1a0fbf1ff91470037e83fa67976f940ebb601e4cc525859c754f4e7ffc24c307
+PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_URL_FILE)
+PKG_SOURCE_URL:=https://github.com/BelledonneCommunications/$(PKG_NAME)/archive
+PKG_HASH:=68599a850535d1b182932b3f86558ac8a76d4b899a548183b062956c5fdc916d
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=LICENSE.txt
 PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
 
 include $(INCLUDE_DIR)/package.mk
@@ -51,11 +52,14 @@ CMAKE_OPTIONS += \
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/bcg729
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/bcg729/*.h $(1)/usr/include/bcg729
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbcg729.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/cmake/Bcg729
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/Bcg729/cmake/*.cmake $(1)/usr/lib/cmake/Bcg729
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/bcg729/*.h \
+		$(1)/usr/include/bcg729
+	$(INSTALL_DIR) $(1)/usr/lib/{cmake/Bcg729,pkgconfig}
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbcg729.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib$(PKG_NAME).pc \
+		$(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/Bcg729/cmake/*.cmake \
+		$(1)/usr/lib/cmake/Bcg729
 endef
 
 define Package/bcg729/install

libs/dahdi-linux/Makefile

@@ -9,25 +9,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=dahdi-linux
-PKG_VERSION:=2.11.1-20180111
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
-#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-#PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
-#PKG_HASH:=f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/asterisk/dahdi-linux.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=26597a5cac2930c191ae540c03c7406745c03e36
-PKG_MIRROR_HASH:=0eaad3c3ed63efa61e6b807bd70e9b5287271f5dd63af9f41c026a5f979b81d3
+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_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Vittorio Gambaletta <openwrt@vittgam.net>
 
-DAHDI_MODULES_EXTRA:=
+# With below variable set, $(PKG_SYMVERS_DIR)/dahdi-linux.symvers gets
+# generated from drivers/dahdi/Module.symvers.
+PKG_EXTMOD_SUBDIRS:=drivers/dahdi
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -95,12 +91,9 @@ define Build/Prepare
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH="$(LINUX_KARCH)" \
-		$(TARGET_CONFIGURE_OPTS) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		KSRC="$(LINUX_DIR)" \
-		MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)"
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(KERNEL_MAKE_FLAGS) \
+		KSRC="$(LINUX_DIR)"
 endef
 
 define Build/InstallDev

libs/dahdi-linux/patches/003-fix-oslec-build.patch

@@ -1,6 +1,6 @@
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -61,9 +61,8 @@ obj-m += $(DAHDI_MODULES_EXTRA)
+@@ -64,9 +64,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:
@@ -10,4 +10,4 @@
 -obj-m += ../staging/echo/echo.o
  endif
  
- CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
+ CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src) -Wno-format-truncation

libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch

@@ -1,19 +1,19 @@
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -13,6 +13,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT
+@@ -12,6 +12,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP)		+= wctc4xxp/
  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/
  
- wcte13xp-objs := wcte13xp-base.o wcxb_spi.o wcxb.o wcxb_flash.o
- CFLAGS_wcte13xp-base.o += -I$(src)/oct612x -I$(src)/oct612x/include -I$(src)/oct612x/octdeviceapi -I$(src)/oct612x/octdeviceapi/oct6100api
+ ifndef HOTPLUG_FIRMWARE
+ ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
 --- a/drivers/dahdi/Kconfig
 +++ b/drivers/dahdi/Kconfig
-@@ -291,4 +291,14 @@ config DAHDI_WCTE11XP
- 
+@@ -235,4 +235,14 @@ config DAHDI_DYNAMIC_LOC
  	  If unsure, say Y.
  
+ 
 +config DAHDI_HFCS
 +	tristate "Support for various HFC-S PCI BRI adapters"
 +	depends on DAHDI && PCI
@@ -1716,7 +1716,7 @@
 +	hfc_proc_dahdi_hfcs_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver);
 +#endif
 +
-+	ret = dahdi_pci_module(&hfc_driver);
++	ret = pci_register_driver(&hfc_driver);
 +	return ret;
 +}
 +

libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch

@@ -0,0 +1,138 @@
+--- a/drivers/dahdi/xpp/xbus-core.c
++++ b/drivers/dahdi/xpp/xbus-core.c
+@@ -25,6 +25,7 @@
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+ #include <linux/mutex.h>
++#include <linux/math64.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/slab.h>
+@@ -1768,11 +1769,13 @@ out:
+ 
+ static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
+ {
++	s32 rem;
++	s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
+ 	seq_printf(sfile,
+-		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
++		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
+ 		q->name, q->steady_state_count, q->count, q->max_count,
+-		q->worst_count, q->overflows, q->worst_lag_usec / 1000,
+-		q->worst_lag_usec % 1000);
++		q->worst_count, q->overflows, lag_sec,
++		rem);
+ 	xframe_queue_clearstats(q);
+ }
+ 
+--- a/drivers/dahdi/xpp/xbus-pcm.c
++++ b/drivers/dahdi/xpp/xbus-pcm.c
+@@ -22,6 +22,7 @@
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/math64.h>
+ #include "xbus-pcm.h"
+ #include "xbus-core.h"
+ #include "xpp_dahdi.h"
+@@ -129,7 +130,7 @@ static int xpp_ticker_step(struct xpp_ti
+ 		usec = ktime_us_delta(ticker->last_sample,
+ 					ticker->first_sample);
+ 		ticker->first_sample = ticker->last_sample;
+-		ticker->tick_period = usec / ticker->cycle;
++		ticker->tick_period = div_s64(usec, ticker->cycle);
+ 		cycled = 1;
+ 	}
+ 	ticker->count++;
+@@ -497,7 +498,7 @@ static void send_drift(xbus_t *xbus, int
+ 	XBUS_DBG(SYNC, xbus,
+ 		 "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
+ 		 (disable_pll_sync) ? "Fake " : "", msg, drift,
+-		 msec_delta / MSEC_PER_SEC);
++		 div_s64(msec_delta, MSEC_PER_SEC));
+ 	if (!disable_pll_sync)
+ 		CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
+ 			   drift);
+--- a/drivers/dahdi/xpp/xbus-sysfs.c
++++ b/drivers/dahdi/xpp/xbus-sysfs.c
+@@ -23,6 +23,7 @@
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/errno.h>
++#include <linux/math64.h>
+ #include <linux/proc_fs.h>
+ #ifdef	PROTOCOL_DEBUG
+ #include <linux/ctype.h>
+@@ -249,11 +250,9 @@ static DEVICE_ATTR_READER(driftinfo_show
+ 	/*
+ 	 * Calculate lost ticks time
+ 	 */
+-	seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000;
+-	minutes = seconds / 60;
+-	seconds = seconds % 60;
+-	hours = minutes / 60;
+-	minutes = minutes % 60;
++	seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000);
++	minutes = div_s64_rem(seconds, 60, &seconds);
++	hours = div_s64_rem(minutes, 60, &minutes);
+ 	len += snprintf(buf + len, PAGE_SIZE - len,
+ 		"%-15s: %8d (was %d:%02d:%02d ago)\n", "lost_ticks",
+ 		di->lost_ticks, hours, minutes, seconds);
+--- a/drivers/dahdi/xpp/xframe_queue.c
++++ b/drivers/dahdi/xpp/xframe_queue.c
+@@ -1,3 +1,4 @@
++#include <linux/math64.h>
+ #include "xframe_queue.h"
+ #include "xbus-core.h"
+ #include "dahdi_debug.h"
+@@ -40,10 +41,11 @@ static void __xframe_dump_queue(struct x
+ 	       THIS_MODULE->name, q->name);
+ 	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
+ 		xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
+-		s64 usec = ktime_us_delta(now, xframe->kt_queued);
++		s32 rem;
++		s64 sec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &rem);
+ 
+-		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03lld msec",
+-			 i++, usec / 1000, usec % 1000);
++		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03ld msec",
++			 i++, sec, rem);
+ 		dump_packet(prefix, pack, 1);
+ 	}
+ }
+@@ -60,11 +62,13 @@ static bool __xframe_enqueue(struct xfra
+ 	if (q->count >= q->max_count) {
+ 		q->overflows++;
+ 		if ((overflow_cnt++ % 1000) < 5) {
+-			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
++			s32 rem;
++			s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
++			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
+ 			     q->name, q->steady_state_count, q->count,
+ 			     q->max_count, q->worst_count, q->overflows,
+-			     q->worst_lag_usec / 1000,
+-			     q->worst_lag_usec % 1000);
++			     lag_sec,
++			     rem);
+ 			__xframe_dump_queue(q);
+ 		}
+ 		ret = 0;
+--- a/drivers/dahdi/xpp/xpp_usb.c
++++ b/drivers/dahdi/xpp/xpp_usb.c
+@@ -27,6 +27,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>	/* for udelay */
+ #include <linux/seq_file.h>
++#include <linux/math64.h>
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ #include <asm/uaccess.h>
+ #else
+@@ -891,7 +892,7 @@ static void xpp_send_callback(struct urb
+ 		usec = 0; /* System clock jumped */
+ 	if (usec > xusb->max_tx_delay)
+ 		xusb->max_tx_delay = usec;
+-	i = usec / USEC_BUCKET;
++	i = div_s64(usec, USEC_BUCKET);
+ 	if (i >= NUM_BUCKETS)
+ 		i = NUM_BUCKETS - 1;
+ 	xusb->usb_tx_delay[i]++;

libs/dahdi-linux/patches/200-dahdi-use-fallthrough-where-needed.patch

@@ -0,0 +1,131 @@
+From f9bc391e1cd830c830b3b4fb5fd46a59b41de373 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Fri, 12 May 2023 20:18:13 +0200
+Subject: [PATCH 1/6] dahdi: use fallthrough where needed
+
+Use fallthrough instead of comment to fix compilation warning.
+
+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(-)
+
+--- 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
+ 		break;
+ 	   case DAHDI_SIG_FXSKS:  /* FXS Kewlstart */
+ 	   case DAHDI_SIG_FXSGS:  /* FXS Groundstart */
+-		/* Fall through */
++		fallthrough;
+ 	   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 */

libs/dahdi-linux/patches/201-dahdi-fix-always-true-compilation-warning.patch

@@ -0,0 +1,60 @@
+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);

libs/dahdi-linux/patches/202-dahdi-sysfs-chan-fix-bug-if-clause-does-not-guard.patch

@@ -0,0 +1,28 @@
+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);
++		}
+ 	}
+ }
+ 

libs/dahdi-linux/patches/204-dahdi-skip-checking-on-releasing.patch

@@ -0,0 +1,38 @@
+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");

libs/dahdi-linux/patches/205-dahdi-xpp-fix-wrong-printf-to-d.patch

@@ -0,0 +1,44 @@
+From 14a9e676d635b1c2be1bab4114cc76c1793892d0 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Fri, 12 May 2023 20:22:31 +0200
+Subject: [PATCH 6/6] dahdi: xpp: fix wrong printf to %d
+
+Fix wrong printf that should be %d with int variables.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ drivers/dahdi/xpp/xbus-core.c    | 2 +-
+ drivers/dahdi/xpp/xframe_queue.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- 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
+ 	s32 rem;
+ 	s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
+ 	seq_printf(sfile,
+-		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
++		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
+ 		q->name, q->steady_state_count, q->count, q->max_count,
+ 		q->worst_count, q->overflows, lag_sec,
+ 		rem);
+--- a/drivers/dahdi/xpp/xframe_queue.c
++++ b/drivers/dahdi/xpp/xframe_queue.c
+@@ -44,7 +44,7 @@ static void __xframe_dump_queue(struct x
+ 		s32 rem;
+ 		s64 sec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &rem);
+ 
+-		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03ld msec",
++		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03d msec",
+ 			 i++, sec, rem);
+ 		dump_packet(prefix, pack, 1);
+ 	}
+@@ -64,7 +64,7 @@ static bool __xframe_enqueue(struct xfra
+ 		if ((overflow_cnt++ % 1000) < 5) {
+ 			s32 rem;
+ 			s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
+-			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%ld ms\n",
++			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
+ 			     q->name, q->steady_state_count, q->count,
+ 			     q->max_count, q->worst_count, q->overflows,
+ 			     lag_sec,

libs/dahdi-tools/Makefile

@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2014 - 2018 OpenWrt.org
+# Copyright (C) 2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dahdi-tools
-PKG_VERSION:=2.11.1
+PKG_VERSION:=3.1.0
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
-PKG_HASH:=53ffeb333f3e44b0c88e5b17475cdbf87d3f652eb81a6422de76250c061e2909
+PKG_HASH:=ea852ebd274ee1cc90ff5e4ac84261b0b787b1a74e8b76ad659bc9ec4f77e67e
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Vittorio Gambaletta <openwrt@vittgam.net>
 
+PKG_BUILD_PARALLEL:=1
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dahdi-cfg/Default
@@ -46,41 +52,44 @@ define Package/dahdi-tools-libtonezone
   TITLE:=DAHDI tonezone library
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		HOSTCC="$(HOSTCC)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune
-endef
+CONFIGURE_ARGS += \
+	--disable-silent-rules \
+	--with-perllib="" \
+	--without-libusb \
+	--without-libusbx \
+	--without-newt \
+	--without-pcap \
+	--without-ppp \
+	--without-selinux \
+	--without-usb
+
+# https://issues.asterisk.org/jira/browse/DAHTOOL-85
+TARGET_CFLAGS+=-fcommon
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/*.so* $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(1)/usr/lib/
-
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.{a,so*} \
+		$(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/include/dahdi
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dahdi/tonezone.h \
+		$(1)/usr/include/dahdi/
 endef
 
 define Package/dahdi-cfg/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{dahdi_cfg,dahdi_scan,fxotune} \
+		$(1)/usr/sbin/
 endef
 
 define Package/dahdi-monitor/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_monitor $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_speed $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{dahdi_monitor,dahdi_speed,dahdi_test} \
+		$(1)/usr/sbin/
 endef
 
 define Package/dahdi-tools-libtonezone/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,dahdi-cfg))

libs/dahdi-tools/patches/020-fix-undefined-reference-to-get_ver.patch

@@ -0,0 +1,11 @@
+--- a/xpp/echo_loader.c
++++ b/xpp/echo_loader.c
+@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPO
+ 	return cOCT6100_ERR_OK;
+ }
+ 
+-inline int get_ver(struct astribank *astribank)
++static inline int get_ver(struct astribank *astribank)
+ {
+ 	return spi_send(astribank, 0, 0, 1, 1);
+ }

libs/dahdi-tools/patches/030-cdefs.patch

@@ -0,0 +1,10 @@
+--- a/xpp/hexfile.h
++++ b/xpp/hexfile.h
+@@ -26,6 +26,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdint.h>
++#include <sys/cdefs.h>
+ #include <sys/param.h>
+ #include <syslog.h>
+ #define	PACKED	__attribute__((packed))

libs/freetdm/Config.in

@@ -0,0 +1,12 @@
+menu "Configuration"
+	depends on PACKAGE_freetdm
+
+config FREETDM_WITH_DEBUG
+	bool "Compile with debug information"
+	default n
+	help
+	  Enable extra debug codepaths, like asserts and extra output. If you
+	  want to get meaningful backtraces see
+	  https://wiki.openwrt.org/doc/devel/debugging for starting points.
+
+endmenu

libs/freetdm/Makefile

@@ -0,0 +1,154 @@
+#
+# Copyright (C) 2021 Sebastian Kemper <sebastian_ml@gmx.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freetdm
+PKG_RELEASE:=2
+PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/freeswitch/freetdm.git
+PKG_SOURCE_DATE:=2021-08-30
+PKG_SOURCE_VERSION:=8918ee1c3637cad0f9d41a402d26d3aa076fc202
+PKG_MIRROR_HASH:=c910ff0fb62c8a174f6e0bbd749783da1ecd71634d4dcde48b118909f4981943
+
+PKG_FIXUP:=autoreconf
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_LICENSE:= \
+	BSD-2-Clause \
+	BSD-3-Clause \
+	BSD-4-Clause \
+	GPL-2.0+ \
+	MIT/X11 (BSD like) \
+	MPL-1.1
+
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=freeswitch
+
+FS_EXAMPLES_DIR:=/usr/share/freeswitch/examples
+FS_LIB_DIR:=/usr/lib
+FS_MOD_DIR:=$(FS_LIB_DIR)/freeswitch/mod
+FS_PKGCONFIG_DIR:=$(FS_LIB_DIR)/pkgconfig
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_FREETDM_WITH_DEBUG \
+	CONFIG_LIBC \
+	CONFIG_PACKAGE_libfreetdm-ftmod-libpri \
+	CONFIG_PACKAGE_libfreetdm-ftmod-pritap \
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libfreetdm/install/ftmod
+	$(INSTALL_DIR) $(1)$(FS_MOD_DIR)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(FS_MOD_DIR)/ftmod_$(2).so \
+						$(1)$(FS_MOD_DIR)
+endef
+
+define Package/freetdm/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/libfreetdm/Default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=Telephony
+  URL:=https://www.freeswitch.org
+endef
+
+define Package/libfreetdm
+$(call Package/libfreetdm/Default)
+  DEPENDS:=
+  TITLE:=TDM signaling and media API
+  MENU:=1
+endef
+
+define Package/libfreetdm/description
+Provides a unified interface to hardware TDM cards and SS7 stacks.
+endef
+
+define Package/libfreetdm/install
+	$(INSTALL_DIR) $(1)$(FS_LIB_DIR)
+	$(CP) $(PKG_INSTALL_DIR)$(FS_LIB_DIR)/libfreetdm.so.* \
+					$(1)$(FS_LIB_DIR)
+endef
+
+define Package/freeswitch-mod-freetdm
+$(call Package/libfreetdm/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Telephony
+  DEPENDS:=freeswitch +libfreetdm
+  TITLE:=FreeTDM endpoint module
+endef
+
+define Package/freeswitch-mod-freetdm/description
+This module is the glue between FreeSWITCH and FreeTDM.
+endef
+
+define Package/freeswitch-mod-freetdm/install
+	$(INSTALL_DIR) $(1)$(FS_MOD_DIR)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(FS_MOD_DIR)/mod_freetdm.so \
+							$(1)$(FS_MOD_DIR)
+ifeq ($(CONFIG_FS_WITH_MODCONF),y)
+	$(INSTALL_DIR) \
+		$(1)$(FS_EXAMPLES_DIR)/mod_freetdm/freeswitch/autoload_configs
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/*.conf \
+		$(1)$(FS_EXAMPLES_DIR)/mod_freetdm
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/freetdm.conf.xml \
+		$(1)$(FS_EXAMPLES_DIR)/mod_freetdm/freeswitch/autoload_configs
+endif
+endef
+
+define Package/libfreetdm/FTModule
+define Package/libfreetdm-ftmod-$(subst _,-,$(1))
+$(call Package/libfreetdm/Default)
+  DEPENDS:=libfreetdm \
+	  $(patsubst +%,+PACKAGE_libfreetdm-ftmod-$(subst _,-,$(1)):%,$(4))
+  TITLE:=$(2) FreeTDM module
+endef
+define Package/libfreetdm-ftmod-$(subst _,-,$(1))/description
+$(subst \n,$(newline),$(3))
+endef
+define Package/libfreetdm-ftmod-$(subst _,-,$(1))/install
+$(call Package/libfreetdm/install/ftmod,$$(1),$(1))
+endef
+$$(eval $$(call BuildPackage,libfreetdm-ftmod-$(subst _,-,$(1))))
+endef
+
+CONFIGURE_ARGS+= \
+	--srcdir=$(PKG_BUILD_DIR) \
+	--disable-dependency-tracking \
+	--disable-static \
+	--with-modinstdir=$(FS_MOD_DIR) \
+	$(call autoconf_bool,CONFIG_FREETDM_WITH_DEBUG,debug) \
+	$(if $(CONFIG_PACKAGE_libfreetdm-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \
+	$(if $(CONFIG_PACKAGE_libfreetdm-ftmod-pritap),--with-pritap,--without-pritap)
+
+$(eval $(call BuildPackage,libfreetdm))
+$(eval $(call BuildPackage,freeswitch-mod-freetdm))
+
+################################
+# FreeTDM modules
+# Params:
+# 1 - Package subname
+# 2 - Package title
+# 3 - Module description
+# 4 - Module dependencies
+################################
+
+$(eval $(call Package/libfreetdm/FTModule,analog,Analog,Offers generic FXO/FXS support for any type of card supported by FreeTDM.,))
+$(eval $(call Package/libfreetdm/FTModule,analog_em,Analog EM,Offers generic E&M signaling for any type of card supported by FreeTDM.,))
+$(eval $(call Package/libfreetdm/FTModule,libpri,LibPRI,Offers support for PRI lines using the open source libpri stack for any\ntype of card supported by FreeTDM. Supports both PRI and BRI signalling.,+libpri @!aarch64))
+$(eval $(call Package/libfreetdm/FTModule,pritap,PRI tapping,This module is used to tap PRI lines.,+libfreetdm-ftmod-libpri))
+$(eval $(call Package/libfreetdm/FTModule,skel,Skeleton,ftmod_skel is an example module.,))
+$(eval $(call Package/libfreetdm/FTModule,zt,DAHDI I/O,This module supports the DAHDI interface. The DAHDI interface is used by\nseveral hardware vendors.,))

libs/freetdm/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch

@@ -1,5 +1,5 @@
---- a/libs/freetdm/configure.ac
-+++ b/libs/freetdm/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -88,7 +88,7 @@ AC_ARG_ENABLE([enable_64],
  
  case "${ax_cv_c_compiler_vendor}" in

libs/freetdm/patches/290-fix-mod_freetdm-copts.patch

@@ -1,5 +1,5 @@
---- a/libs/freetdm/mod_freetdm/Makefile.in
-+++ b/libs/freetdm/mod_freetdm/Makefile.in
+--- a/mod_freetdm/Makefile.in
++++ b/mod_freetdm/Makefile.in
 @@ -1,4 +1,4 @@
 -FT_CFLAGS=@CFLAGS@ @COMP_VENDOR_CFLAGS@ @DEFS@
 +FT_CFLAGS=@COMP_VENDOR_CFLAGS@ @DEFS@

libs/freetdm/patches/300-install-missing_dir.patch

@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -284,6 +284,7 @@ dox doxygen:
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(prefix)
+ 	$(mkinstalldirs) $(DESTDIR)@confdir@
++	$(mkinstalldirs) $(DESTDIR)@fsconfdir@/autoload_configs
+ 	@[ -f "$(DESTDIR)@confdir@/freetdm.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
+ 	@[ -f "$(DESTDIR)@fsconfdir@/autoload_configs/freetdm.conf.xml" ] || ( cp -f conf/freetdm.conf.xml $(DESTDIR)@fsconfdir@/autoload_configs)
+ 	@echo FreeTDM Installed

libs/gsmlib/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gsmlib
 PKG_VERSION:=1.10-20140304
-PKG_RELEASE:=2
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/vbouchaud/gsmlib.git
@@ -31,7 +31,6 @@ PKG_LICENSE:=LGPL-2.1+
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)/Default
@@ -44,7 +43,7 @@ $(call Package/$(PKG_NAME)/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GSM mobile phone access lib
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/gsm-utils
@@ -63,6 +62,10 @@ define Package/gsm-utils/description
 Some simple command line programs to access GSM mobile phones via GSM modems.
 endef
 
+CONFIGURE_ARGS += --disable-nls
+
+TARGET_CXXFLAGS += -std=c++11
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)
 	$(INSTALL_DATA) \

libs/gsmlib/patches/01-update-autotools.patch

@@ -19,6 +19,15 @@ Description: Update autotools-related stuff.
  dnl comment out this line to get extensive debugging output and asserts
  dnl CXXFLAGS="-DNDEBUG $CXXFLAGS"
  
+@@ -108,7 +111,7 @@ AC_SUBST(GSM_VERSION)
+ dnl national language support (NLS)
+ LINGUAS="de"
+ ALL_LINGUAS=$LINGUAS
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ dnl AM_GLIB_GNU_GETTEXT
+ 
+ dnl set locale dir (FIXME there must be a better way)
 --- /dev/null
 +++ b/po/Makevars
 @@ -0,0 +1,5 @@
@@ -29,7 +38,7 @@ Description: Update autotools-related stuff.
 +
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -11,6 +11,8 @@
+@@ -11,14 +11,12 @@
  # * Created: 21.5.1999
  # *************************************************************************
  
@@ -38,3 +47,11 @@ Description: Update autotools-related stuff.
  SUBDIRS_ =	po gsmlib apps tests doc scripts win32 ext
  
  EXTRA_DIST =	gsmlib.spec
+ 
+-if COMPILE_INTL
+-SUBDIRS =	intl $(SUBDIRS_) # po - make automake happy
+-else
+ SUBDIRS =	$(SUBDIRS_) # po intl - make automake happy
+-endif
+ 
+ all:

libs/libctb/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libctb
 PKG_VERSION:=0.16
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://iftools.com/download/ctb/$(PKG_VERSION)
@@ -23,7 +23,6 @@ PKG_LICENSE:=LGPL
 PKG_LICENSE_FILES:=build/COPYING
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -32,7 +31,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Libraries
   TITLE:=Communications toolbox - ctb
   URL:=https://iftools.com/opensource/ctb.en.php
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/$(PKG_NAME)/description

libs/libks/Makefile

@@ -0,0 +1,66 @@
+# 
+# Copyright (C) 2019 Sebastian Kemper <sebastian_ml@gmx.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libks
+
+PKG_VERSION:=2.0.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=libks-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/signalwire/libks/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63
+
+PKG_BUILD_PARALLEL:=1
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:= \
+	BSD-1-Clause \
+	BSD-3-Clause \
+	ISC \
+	MIT \
+	PUBLICDOMAIN \
+	twofish
+PKG_LICENSE_FILES:=copyright
+
+PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libks
+  SUBMENU:=Telephony
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Foundational support for SignalWire C products
+  URL:=https://github.com/signalwire/libks
+  ABI_VERSION:=2
+  DEPENDS:=+libatomic +libopenssl +libuuid
+endef
+
+# Otherwise OpenWrt's CPPFLAGS are ignored
+TARGET_CFLAGS += $(TARGET_CPPFLAGS)
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libks2/libks/cmake
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/*.h \
+		$(1)/usr/include/libks2/libks
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libks2/libks/cmake/* \
+		$(1)/usr/include/libks2/libks/cmake
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libks2.pc \
+		$(1)/usr/lib/pkgconfig
+endef
+
+define Package/libks/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libks2.so.$(ABI_VERSION)* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libks))

libs/libks/patches/01-find-libm.patch

@@ -0,0 +1,15 @@
+--- a/cmake/FindLibM.cmake
++++ b/cmake/FindLibM.cmake
+@@ -8,11 +8,7 @@
+ # A user may set ``LIBM_ROOT`` to a math library installation root to tell this
+ # module where to look.
+ 
+-find_path(LIBM_INCLUDE_DIRS
+-  NAMES math.h
+-  PATHS /usr/include /usr/local/include /usr/local/bic/include
+-  NO_DEFAULT_PATH
+-)
++find_path(LIBM_INCLUDE_DIRS math.h)
+ find_library(LIBM_LIBRARIES m)
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(LibM DEFAULT_MSG LIBM_LIBRARIES LIBM_INCLUDE_DIRS)

libs/libks/patches/02-correct-signal_h-include.patch

@@ -0,0 +1,11 @@
+--- a/src/include/libks/ks_platform.h
++++ b/src/include/libks/ks_platform.h
+@@ -93,7 +93,7 @@ KS_BEGIN_EXTERN_C
+ #include <sys/time.h>
+ #include <sys/select.h>
+ #include <netinet/tcp.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <unistd.h>
+ #include <strings.h>
+ #include <stdint.h>

libs/libks/patches/03-fix-flags.patch

@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,10 @@ option(WITH_LIBBACKTRACE "Enables linkin
+ # Must include cotire before anything else for auto pch setup
+ #include(cmake/cotire.cmake)
+ 
++# Declare our project, libks2
++project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
++message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
++
+ # Load our common utility api and setup the platfomrm and build
+ include(cmake/ksutil.cmake)
+ ksutil_setup_platform()
+@@ -39,10 +43,6 @@ if (KS_PLAT_WIN OR WITH_KS_TEST)
+ 	endif()
+ endif()
+ 
+-# Declare our project, libks2
+-project(LibKS2 VERSION 2.0.2 LANGUAGES C CXX)
+-message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+-
+ # Set package version
+ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})

libs/libks/patches/04-don_t-override-optimization.patch

@@ -0,0 +1,10 @@
+--- a/cmake/ksutil.cmake
++++ b/cmake/ksutil.cmake
+@@ -135,7 +135,6 @@ macro(ksutil_setup_platform)
+ 		set(KS_PLAT_LIN 1 CACHE INTERNAL "Platform definition" FORCE)
+ 		set(CMAKE_POSITION_INDEPENDENT_CODE YES)
+ 
+-		add_compile_options("$<$<CONFIG:Release>:-O2>")
+ 		add_compile_options("$<$<CONFIG:Release>:-g>")
+ 
+ 		add_compile_options("$<$<CONFIG:Debug>:-O0>")

libs/libosip2/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
-PKG_VERSION:=5.0.0
-PKG_RELEASE:=3
+PKG_VERSION:=5.3.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
-PKG_HASH:=18a13c954f7297978e7bf1a0cdadde7c531e519d61a045dae304e054f3b2df03
+PKG_HASH:=f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -30,6 +30,7 @@ define Package/libosip2
   CATEGORY:=Libraries
   TITLE:=GNU oSIP library
   URL:=http://www.gnu.org/software/osip/
+  ABI_VERSION:=15
   DEPENDS:=+librt
 endef
 
@@ -43,14 +44,13 @@ TARGET_CFLAGS += $(if $(CONFIG_arc),-U__arc__)
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
-	--disable-debug \
+	--disable-silent-rules \
 	--disable-trace \
 	--disable-mpatrol \
 	--disable-gprof \
 	--disable-mt \
 	--enable-pthread \
 	--enable-semaphore \
-	--disable-sysv \
 	--disable-gperf \
 	--disable-test \
 	--disable-minisize
@@ -68,7 +68,7 @@ endef
 
 define Package/libosip2/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.$(ABI_VERSION)* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libosip2))

libs/libosip2/patches/01-CVE-2017-7853.patch

@@ -1,31 +0,0 @@
-From 1ae06daf3b2375c34af23083394a6f010be24a45 Mon Sep 17 00:00:00 2001
-From: Aymeric Moizard <amoizard@gmail.com>
-Date: Tue, 21 Feb 2017 17:16:26 +0100
-Subject:  * fix bug report: sr #109265: SIP message body length underflow in
- libosip2-4.1.0    https://savannah.gnu.org/support/?109265    also applicable
- to current latest version
-
----
- src/osipparser2/osip_message_parse.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/osipparser2/osip_message_parse.c b/src/osipparser2/osip_message_parse.c
-index 1628c60..aa35446 100644
---- a/src/osipparser2/osip_message_parse.c
-+++ b/src/osipparser2/osip_message_parse.c
-@@ -784,6 +784,12 @@ msg_osip_body_parse (osip_message_t * sip, const char *start_of_buf, const char
-     if ('\n' == start_of_body[0] || '\r' == start_of_body[0])
-       start_of_body++;
- 
-+    /* if message body is empty or contains a single CR/LF */
-+    if (end_of_body <= start_of_body) {
-+      osip_free (sep_boundary);
-+      return OSIP_SYNTAXERROR;
-+    }
-+
-     body_len = end_of_body - start_of_body;
- 
-     /* Skip CR before end boundary. */
--- 
-cgit v1.0-41-gc330
-

libs/libpri/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpri
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/libpri/releases
@@ -35,6 +35,10 @@ define Package/libpri/description
 	Lucent 5E Custom protocols on switches from Nortel and Lucent.
 endef
 
+MAKE_FLAGS += \
+	OSARCH=Linux \
+	LDCONFIG=ldconfig
+
 define Build/Configure
 endef
 

libs/libpri/patches/001-fix-include-signal-h-warning.patch

@@ -1,7 +1,5 @@
-Index: libpri-1.4.15/pritest.c
-===================================================================
---- libpri-1.4.15.orig/pritest.c
-+++ libpri-1.4.15/pritest.c
+--- a/pritest.c
++++ b/pritest.c
 @@ -41,7 +41,7 @@
  #include <sys/ioctl.h>
  #include <stdlib.h>
@@ -11,10 +9,8 @@ Index: libpri-1.4.15/pritest.c
  #include <sys/select.h>
  #include <sys/wait.h>
  #include <sys/resource.h>
-Index: libpri-1.4.15/testprilib.c
-===================================================================
---- libpri-1.4.15.orig/testprilib.c
-+++ libpri-1.4.15/testprilib.c
+--- a/testprilib.c
++++ b/testprilib.c
 @@ -41,7 +41,7 @@
  #include <sys/ioctl.h>
  #include <stdlib.h>

libs/libpri/patches/010-no-werror.patch

@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -68,7 +68,7 @@ DYNAMIC_OBJS= \
+ 	$(STATIC_OBJS)
+ CFLAGS ?= -g
+ CFLAGS += $(CPPFLAGS)
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr

libs/libpri/patches/100_add-an-ability-to-build-libpri-on-MacOS-for-Linux-ta.patch

@@ -0,0 +1,39 @@
+Upstream issue: https://issues.asterisk.org/jira/browse/PRI-188
+
+From ec1d6589c6e4eb6550cb92d5e0f214f7b31e8d5f Mon Sep 17 00:00:00 2001
+From: "Sergey V. Lobanov" <sergey@lobanov.in>
+Date: Sun, 30 Jan 2022 13:25:17 +0300
+Subject: [PATCH] Add an ability to build libpri on MacOS for Linux target
+
+This patch allows to rededine ar and ranlib tool using AR and
+RANLIB make flags.
+
+Fixes: PRI-188
+
+Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -27,6 +27,8 @@
+ CC=gcc
+ GREP=grep
+ AWK=awk
++AR=ar
++RANLIB=ranlib
+ 
+ OSARCH=$(shell uname -s)
+ PROC?=$(shell uname -m)
+@@ -193,8 +195,8 @@ MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$
+ 	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
+ 
+ $(STATIC_LIBRARY): $(STATIC_OBJS)
+-	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
+-	ranlib $(STATIC_LIBRARY)
++	$(AR) rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
++	$(RANLIB) $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+ 	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)

libs/libsrtp/Makefile

@@ -1,7 +1,6 @@
 #
-# Copyright (C) 2006-2018 OpenWrt.org
-# Copyright (C) 2011 Victor Seva <linuxmaniac@torreviejawireless.org>
-# Copyright (C) 2017 - 2018 Jiri Slachta <jiri@slachta.eu>
+# Copyright (C) 2017 OpenWrt.org
+# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,17 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsrtp
-PKG_VERSION:=1.6.0
+PKG_VERSION:=2.4.2
 PKG_RELEASE:=2
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2b091a4fb21c9b06fc5d4b5763bdaec97542fcd7
-PKG_MIRROR_HASH:=7ac6c3113fd7a966c9a9108c185d9425e75a8fdc600e4ccef158e68ee1988c89
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+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_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -27,45 +21,42 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS += \
-	--disable-stdout \
-	--enable-syslog
+CONFIGURE_ARGS+=--enable-openssl
 
-define Package/libsrtp
+define Package/libsrtp2
   SUBMENU:=Telephony
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Secure Real-time Transport Protocol (SRTP) library
-  DEPENDS:=+libpcap
-  URL:=http://sourceforge.net/projects/srtp
+  TITLE:=Secure RTP (SRTP) library, v$(PKG_VERSION)
+  URL:=https://github.com/cisco/libsrtp
+  DEPENDS:=+libopenssl
+  ABI_VERSION:=1
 endef
 
-define Package/libsrtp/description
+define Package/libsrtp2/description
 Open-source implementation of the Secure Real-time Transport
 Protocol (SRTP) originally authored by Cisco Systems, Inc.
 It is available under a BSD-style license.
 endef
 
 define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) uninstall
-	$(call Build/Install/Default)
+	$(call Build/Install/Default,all shared_library install)
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/srtp2 $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp2.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp2.pc $(1)/usr/lib/pkgconfig/
 endef
 
-
-define Package/libsrtp/install
+define Package/libsrtp2/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsrtp.so* \
+		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so.$(ABI_VERSION)* \
 		$(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,libsrtp))
+$(eval $(call BuildPackage,libsrtp2))

libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch

@@ -1,54 +0,0 @@
---- a/test/srtp_driver.c
-+++ b/test/srtp_driver.c
-@@ -341,7 +341,7 @@ main (int argc, char *argv[]) {
-   if (do_codec_timing) {
-     srtp_policy_t policy;
-     int ignore;
--    double mips = mips_estimate(1000000000, &ignore);
-+    double mips_est = mips_estimate(1000000000, &ignore);
- 
-     crypto_policy_set_rtp_default(&policy.rtp);
-     crypto_policy_set_rtcp_default(&policy.rtcp);
-@@ -353,33 +353,33 @@ main (int argc, char *argv[]) {
-     policy.allow_repeat_tx = 0;
-     policy.next = NULL;
- 
--    printf("mips estimate: %e\n", mips);
-+    printf("mips estimate: %e\n", mips_est);
- 
-     printf("testing srtp processing time for voice codecs:\n");
-     printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n");
-     printf("G.711\t\t%d\t\t\t%e\n", 80, 
--           (double) mips * (80 * 8) / 
-+           (double) mips_est * (80 * 8) / 
- 	   srtp_bits_per_second(80, &policy) / .01 );
-     printf("G.711\t\t%d\t\t\t%e\n", 160, 
--           (double) mips * (160 * 8) / 
-+           (double) mips_est * (160 * 8) / 
- 	   srtp_bits_per_second(160, &policy) / .02);
-     printf("G.726-32\t%d\t\t\t%e\n", 40, 
--           (double) mips * (40 * 8) / 
-+           (double) mips_est * (40 * 8) / 
- 	   srtp_bits_per_second(40, &policy) / .01 );
-     printf("G.726-32\t%d\t\t\t%e\n", 80, 
--           (double) mips * (80 * 8) / 
-+           (double) mips_est * (80 * 8) / 
- 	   srtp_bits_per_second(80, &policy) / .02);
-     printf("G.729\t\t%d\t\t\t%e\n", 10, 
--           (double) mips * (10 * 8) / 
-+           (double) mips_est * (10 * 8) / 
- 	   srtp_bits_per_second(10, &policy) / .01 );
-     printf("G.729\t\t%d\t\t\t%e\n", 20, 
--           (double) mips * (20 * 8) /
-+           (double) mips_est * (20 * 8) /
- 	   srtp_bits_per_second(20, &policy) / .02 );
-     printf("Wideband\t%d\t\t\t%e\n", 320, 
--           (double) mips * (320 * 8) /
-+           (double) mips_est * (320 * 8) /
- 	   srtp_bits_per_second(320, &policy) / .01 );
-     printf("Wideband\t%d\t\t\t%e\n", 640, 
--           (double) mips * (640 * 8) /
-+           (double) mips_est * (640 * 8) /
- 	   srtp_bits_per_second(640, &policy) / .02 );
-   }
- 

libs/libsrtp/patches/1005_fix_data_alignment.patch

@@ -1,27 +0,0 @@
---- a/test/srtp_driver.c
-+++ b/test/srtp_driver.c
-@@ -1198,7 +1198,6 @@ mips_estimate(int num_trials, int *ignor
-  * These packets were made with the default SRTP policy.
-  */
- 
--
- err_status_t
- srtp_validate() {
-   uint8_t srtp_plaintext_ref[28] = {
-@@ -1207,14 +1206,14 @@ srtp_validate() {
-     0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 
-     0xab, 0xab, 0xab, 0xab
-   };
--  uint8_t srtp_plaintext[38] = {
-+  uint8_t srtp_plaintext[38] __attribute__((aligned(4))) = {
-     0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, 
-     0xca, 0xfe, 0xba, 0xbe, 0xab, 0xab, 0xab, 0xab,
-     0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 
-     0xab, 0xab, 0xab, 0xab, 0x00, 0x00, 0x00, 0x00, 
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-   };
--  uint8_t srtp_ciphertext[38] = {
-+  uint8_t srtp_ciphertext[38] __attribute__((aligned(4))) = {
-     0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, 
-     0xca, 0xfe, 0xba, 0xbe, 0x4e, 0x55, 0xdc, 0x4c,
-     0xe7, 0x99, 0x78, 0xd8, 0x8c, 0xa4, 0xd2, 0x15, 

libs/libsrtp/patches/1007_update_Doxyfile.patch

@@ -1,94 +0,0 @@
-Description: Update Doxyfile and header template
-Author: Jonas Smedegaard <dr@jones.dk>
-Last-Update: 2010-02-28
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -25,6 +25,7 @@ libsrtpdoc: 
- 		echo "*** Sorry, can't build doc outside source dir"; exit 1; \
- 	fi
- 	sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex
-+	doxygen -u
- 	doxygen
- 	sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp
- 	mv latex/index.tmp latex/index.tex
-@@ -38,7 +39,7 @@ cryptodoc: clean
- 	cp latex/refman.pdf crypto.pdf
- 
- clean:
--	rm -rf latex/ header.tex
-+	rm -rf latex/ header.tex Doxyfile.bak
- 	for a in * ; do			                \
-               if [ -f "$$a~" ] ; then rm -f $$a~; fi;	\
-         done;
---- a/doc/header.template
-+++ b/doc/header.template
-@@ -6,28 +6,40 @@
- % 
- \documentclass[letterpaper]{book}
- \usepackage{makeidx}
--\usepackage{fancyhdr}
- \usepackage{graphicx}
- \usepackage{multicol}
- \usepackage{float}
-+\usepackage{listings}
-+\usepackage{color}
-+\usepackage{ifthen}
-+\usepackage[table]{xcolor}
- \usepackage{textcomp}
- \usepackage{alltt}
--\usepackage{times}
--\usepackage{graphicx}
--\ifx\pdfoutput\undefined
--\usepackage[ps2pdf,
-+\usepackage{ifpdf}
-+\ifpdf
-+\usepackage[pdftex,
-             pagebackref=true,
-             colorlinks=true,
--            linkcolor=blue
-+            linkcolor=blue,
-+            unicode
-            ]{hyperref}
- \else
--\usepackage[pdftex,
-+\usepackage[ps2pdf,
-             pagebackref=true,
-             colorlinks=true,
--            linkcolor=blue
-+            linkcolor=blue,
-+            unicode
-            ]{hyperref}
-+\usepackage{pspicture}
- \fi
-+\usepackage[utf8]{inputenc}
-+\usepackage{mathptmx}
-+\usepackage[scaled=.90]{helvet}
-+\usepackage{courier}
-+\usepackage{sectsty}
-+\usepackage[titles]{tocloft}
- \usepackage{doxygen}
-+\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=3,numbers=left }
- \makeindex
- \setcounter{tocdepth}{1}
- \renewcommand{\footrulewidth}{0.4pt}
-@@ -59,7 +71,9 @@
- \selectfont
- 
- 
-+\renewcommand{\familydefault}{\sfdefault}
- \begin{document}
-+\hypersetup{pageanchor=false}
- \begin{titlepage}
- \vspace*{4cm}
- %\begin{center}
-@@ -107,9 +121,6 @@ This reference material in this documena
- \clearemptydoublepage
- \pagenumbering{roman}
- \tableofcontents
--%\clearemptydoublepage
--
- \clearemptydoublepage
- \pagenumbering{arabic}
--
--
-+\hypersetup{pageanchor=true}

libs/libsrtp/patches/1008_shared-lib.patch

@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -20,7 +20,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
- 
- .PHONY: all shared_library test build_table_apps
- 
--all: test 
-+all: shared_library test
- 
- runtest: build_table_apps test
- 	@echo "running libsrtp test applications..."

libs/libsrtp2/Makefile

@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2017 OpenWrt.org
-# Copyright (C) 2017 Jiri Slachta <jiri@slachta.eu>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libsrtp2
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cisco/libsrtp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=93aba3e767502343c255fad8962dbf0ff29c4ca6
-PKG_MIRROR_HASH:=e060592d99e0dff53ee6fbc5e8a9cb0f7fb8b1b874d4687292fb8c8e5f612a6b
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libsrtp2
-  SUBMENU:=Telephony
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Secure RTP (SRTP) library, v$(PKG_VERSION)
-  URL:=http://sourceforge.net/projects/srtp
-  DEPENDS:=+libpcap
-endef
-
-define Package/libsrtp2/description
-Open-source implementation of the Secure Real-time Transport
-Protocol (SRTP) originally authored by Cisco Systems, Inc.
-It is available under a BSD-style license.
-endef
-
-define Build/Install
-	$(call Build/Install/Default,all shared_library install)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/srtp2 $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp2.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsrtp2.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libsrtp2/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsrtp2.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libsrtp2))

libs/pjproject/Makefile

@@ -10,14 +10,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjproject
-PKG_VERSION:=2.7.2
+PKG_VERSION:=2.13.1
 PKG_RELEASE:=2
+PKG_CPE_ID:=cpe:/a:pjsip:pjsip
 
-PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)
-PKG_HASH:=9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772
+# download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz"
+PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_URL_FILE)
+PKG_SOURCE_URL:=https://github.com/pjsip/$(PKG_NAME)/archive/refs/tags
+PKG_HASH:=32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d
 PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
@@ -27,15 +29,14 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:=CONFIG_SOFT_FLOAT
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pjproject/Default
   SECTION:=lib
   CATEGORY:=Libraries
   SUBMENU:=Telephony
-  URL:=http://www.pjsip.org
-  DEPENDS:=$(CXX_DEPENDS) +libopenssl +libuuid +libpthread
+  URL:=https://www.pjsip.org
+  DEPENDS:=+libstdcpp +libopenssl +libuuid +libpthread
 endef
 
 define Package/pjproject/install/lib
@@ -59,7 +60,9 @@ endef
 
 CONFIGURE_ARGS+= \
 	$(if $(CONFIG_SOFT_FLOAT),--disable-floating-point) \
+	--disable-android-mediacodec \
 	--disable-bcg729 \
+	--disable-darwin-ssl \
 	--disable-ext-sound \
 	--disable-ffmpeg \
 	--disable-g711-codec \
@@ -69,22 +72,22 @@ CONFIGURE_ARGS+= \
 	--disable-ilbc-codec \
 	--disable-ipp \
 	--disable-l16-codec \
+	--disable-libsrtp \
 	--disable-libwebrtc \
 	--disable-libyuv \
 	--disable-opencore-amr \
 	--disable-openh264 \
 	--disable-opus \
-	--disable-oss \
 	--disable-resample \
 	--disable-sdl \
 	--disable-silk \
 	--disable-sound \
 	--disable-speex-aec \
 	--disable-speex-codec \
+	--disable-upnp \
 	--disable-v4l2 \
 	--disable-video \
 	--enable-shared \
-	--with-external-srtp="$(STAGING_DIR)/usr" \
 	--with-ssl="$(STAGING_DIR)/usr" \
 	--without-external-gsm \
 	--without-external-pa \
@@ -93,7 +96,8 @@ CONFIGURE_ARGS+= \
 TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) EXCLUDE_APP=1 dep
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) EXCLUDE_APP=1
 endef
 
 PJPROJECT_LIBS:= \
@@ -108,16 +112,16 @@ define Build/InstallDev
 	$(foreach m,$(PJPROJECT_LIBS),$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(m)* $(1)/usr/lib;)
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(SED) 's|$(TARGET_CFLAGS)||g' $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc \
+		$(1)/usr/lib/pkgconfig
 endef
 
 $(eval $(call PJSIPpackage,libpj,libpj,+librt))
 $(eval $(call PJSIPpackage,libpjlib-util,libpjlib-util,+libpj +librt))
-$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +librt +libsrtp2))
+$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +librt))
 $(eval $(call PJSIPpackage,libpjnath,libpjnath,+libpj +libpjlib-util +librt))
 $(eval $(call PJSIPpackage,libpjsip-simple,libpjsip-simple,+libpj +libpjlib-util +libpjsip +librt))
 $(eval $(call PJSIPpackage,libpjsip-ua,libpjsip-ua,+libpj +libpjlib-util +libpjmedia +libpjsip-simple +libpjsip +librt))
-$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +librt +libsrtp2))
+$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +librt))
 $(eval $(call PJSIPpackage,libpjsua,libpjsua,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt))
 $(eval $(call PJSIPpackage,libpjsua2,libpjsua2,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt +libpjsua))

libs/pjproject/patches/0004-config_site.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/pjlib/include/pj/config_site.h
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,91 @@
 +/*
 + * Asterisk config_site.h
 + */
@@ -8,37 +8,16 @@
 +#include <sys/select.h>
 +
 +/*
-+ * Since both pjproject and asterisk source files will include config_site.h,
-+ * we need to make sure that only pjproject source files include asterisk_malloc_debug.h.
-+ */
-+
-+/* #if defined(MALLOC_DEBUG) && !defined(_ASTERISK_ASTMM_H)
-+ * #include "asterisk_malloc_debug.h"
-+ * #endif
-+ */
-+
-+/*
 + * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use srtp.
 + * It only disables the pjmedia srtp transport which Asterisk doesn't use.
 + * The reason for the disable is that while Asterisk works fine with older libsrtp
 + * versions, newer versions of pjproject won't compile with them.
 + */
-+
-+/*
-+ * This doesn't disable SRTP completely, so we have to keep using the external
-+ * libsrtp, otherwise pjsip would just build the internal one.
-+ */
-+
 +#define PJMEDIA_HAS_SRTP 0
 +
-+/*
-+ * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use
-+ * webrtc.  It only disables the pjmedia webrtc transport which Asterisk doesn't use.
-+ */
-+#define PJMEDIA_HAS_WEBRTC_AEC 0
-+
 +#define PJ_HAS_IPV6 1
 +#define NDEBUG 1
++
 +#define PJ_MAX_HOSTNAME (256)
 +#define PJSIP_MAX_URL_SIZE (512)
 +#ifdef PJ_HAS_LINUX_EPOLL
@@ -79,17 +58,37 @@
 +  Enabling it will result in SEGFAULTS when URIs containing escape sequences are encountered.
 +*/
 +#undef PJSIP_UNESCAPE_IN_PLACE
-+#define PJSIP_MAX_PKT_LEN			6000
++#define PJSIP_MAX_PKT_LEN			65535
 +
 +#undef PJ_TODO
 +#define PJ_TODO(x)
 +
 +/* Defaults too low for WebRTC */
-+#define PJ_ICE_MAX_CAND 32
++#define PJ_ICE_MAX_CAND 64
 +#define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND)
 +
 +/* Increase limits to allow more formats */
 +#define	PJMEDIA_MAX_SDP_FMT   64
 +#define	PJMEDIA_MAX_SDP_BANDW   4
-+#define	PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*2 + 4)
++#define	PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*3 + 4)
 +#define	PJMEDIA_MAX_SDP_MEDIA   16
++
++/*
++ * Turn off the periodic sending of CRLNCRLN.  Default is on (90 seconds),
++ * which conflicts with the global section's keep_alive_interval option in
++ * pjsip.conf.
++ */
++#define PJSIP_TCP_KEEP_ALIVE_INTERVAL	0
++#define PJSIP_TLS_KEEP_ALIVE_INTERVAL	0
++
++#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0
++#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0
++#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1
++
++/*
++ * The default is 32 with 8 being used by pjproject itself.
++ * Since this value is used in invites, dialogs, transports
++ * and subscriptions as well as the global pjproject endpoint,
++ * we don't want to increase it too much.
++ */
++#define PJSIP_MAX_MODULE 38

libs/pjproject/patches/0006-fix-pkg_config-file.patch

@@ -0,0 +1,24 @@
+--- a/libpjproject.pc.in
++++ b/libpjproject.pc.in
+@@ -2,8 +2,8 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=@LIBDIR@
+-includedir=@INCLUDEDIR@
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: libpjproject
+ Description: Multimedia communication library
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -352,6 +352,6 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FIL
+ export PJ_INSTALL_DIR := @prefix@
+ export PJ_INSTALL_INC_DIR := @includedir@
+ export PJ_INSTALL_LIB_DIR := @libdir@
+-export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
++export PJ_INSTALL_CFLAGS := -DPJ_AUTOCONF=1 @ac_cflags@
+ export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
+-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
++export PJ_INSTALL_LDFLAGS := $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))

libs/pjproject/patches/0010-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new-129fb323a66dd1fd16880fe5ba5e6a57.patch

@@ -0,0 +1,27 @@
+From ac685b30c17be461b2bf5b46a772ed9742b8e985 Mon Sep 17 00:00:00 2001
+From: Riza Sulistyo <trengginas@users.noreply.github.com>
+Date: Thu, 9 Feb 2023 13:19:23 +0700
+Subject: [PATCH] Make sure that NOTIFY tdata is set before sending it.
+
+---
+ pjsip/src/pjsip-simple/evsub.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/pjsip/src/pjsip-simple/evsub.c
++++ b/pjsip/src/pjsip-simple/evsub.c
+@@ -2224,9 +2224,12 @@ static void on_tsx_state_uas( pjsip_evsu
+         /* Send the pending NOTIFY sent by app from inside
+          * on_rx_refresh() callback.
+          */
+-        pj_assert(sub->pending_notify);
+-        status = pjsip_evsub_send_request(sub, sub->pending_notify);
+-        sub->pending_notify = NULL;
++        //pj_assert(sub->pending_notify);
++        /* Make sure that pending_notify is set. */
++        if (sub->pending_notify) {
++            status = pjsip_evsub_send_request(sub, sub->pending_notify);
++            sub->pending_notify = NULL;
++        }
+ 
+     } else if (pjsip_method_cmp(&tsx->method, &pjsip_notify_method)==0) {
+ 

libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch

@@ -0,0 +1,26 @@
+--- a/pjsip/src/pjsip/sip_transport.c
++++ b/pjsip/src/pjsip/sip_transport.c
+@@ -2088,15 +2088,17 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_p
+              * which were sent to keep NAT bindings.
+              */
+             if (tmp.slen) {
+-                PJ_LOG(1, (THIS_FILE, 
+-                      "Error processing %d bytes packet from %s %s:%d %.*s:\n"
+-                      "%.*s\n"
+-                      "-- end of packet.",
++                PJ_LOG(2, (THIS_FILE,
++                      "Dropping %d bytes packet from %s %s:%d %.*s\n",
+                       msg_fragment_size,
+                       rdata->tp_info.transport->type_name,
+-                      rdata->pkt_info.src_name, 
++                      rdata->pkt_info.src_name,
+                       rdata->pkt_info.src_port,
+-                      (int)tmp.slen, tmp.ptr,
++                      (int)tmp.slen, tmp.ptr));
++                PJ_LOG(4, (THIS_FILE,
++                      "Dropped packet:"
++                      "%.*s\n"
++                      "-- end of packet.",
+                       (int)msg_fragment_size,
+                       rdata->msg_info.msg_buf));
+             }

libs/pjproject/patches/100-uclibc-linker-unrecognized-options.patch

@@ -1,11 +0,0 @@
---- a/build/rules.mak
-+++ b/build/rules.mak
-@@ -13,7 +13,7 @@ SHLIB = $($(APP)_SHLIB)
- SONAME = $($(APP)_SONAME)
- 
- ifeq ($(SHLIB_SUFFIX),so)
--SHLIB_OPT := -shared -Wl,-soname,$(SHLIB)
-+SHLIB_OPT := -shared
- else ifeq ($(SHLIB_SUFFIX),dylib)
- SHLIB_OPT := -dynamiclib -undefined dynamic_lookup -flat_namespace
- else ifeq ($(SHLIB_SUFFIX),dll)

libs/pjproject/patches/120-non-gnu-pthreads.patch

@@ -1,20 +0,0 @@
---- pjproject-2.6/pjlib/src/pj/os_core_unix.c	2016-04-13 08:24:48.000000000 +0200
-+++ pjproject-new/pjlib/src/pj/os_core_unix.c	2017-05-08 09:51:49.980905420 +0200
-@@ -1123,7 +1123,7 @@ static pj_status_t init_mutex(pj_mutex_t
- 	return PJ_RETURN_OS_ERROR(rc);
- 
-     if (type == PJ_MUTEX_SIMPLE) {
--#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
-+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \
-     defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
- #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
-@@ -1133,7 +1133,7 @@ static pj_status_t init_mutex(pj_mutex_t
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
- #endif
-     } else {
--#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
-+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || \
-      defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \

libs/pjproject/patches/160-remove-hardcoded-lstdc++.patch

@@ -1,22 +0,0 @@
---- a/build.mak.in
-+++ b/build.mak.in
-@@ -293,7 +293,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB)
- 	$(PJLIB_LDLIB) \
- 	@LIBS@
- export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
--	-lstdc++ \
- 	$(APP_LDLIBS)
- 
- # Here are the variabels to use if application is using the library
---- a/pjsip/build/Makefile
-+++ b/pjsip/build/Makefile
-@@ -152,8 +152,7 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB
- 			     $(PJNATH_LDLIB) \
- 			     $(PJLIB_UTIL_LDLIB) \
- 			     $(PJLIB_LDLIB) \
--			     $(_LDFLAGS) \
--			     -lstdc++
-+			     $(_LDFLAGS)
- 
- 
- ###############################################################################

libs/re/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2018 OpenWrt.org
+# Copyright (C) 2010-2017 OpenWrt.org
 # Copyright (C) 2010 Alfred E. Heggestad
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,17 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re
-PKG_VERSION:=0.5.8
+PKG_VERSION:=2.0.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_HASH:=190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70
+PKG_SOURCE_URL:=https://codeload.github.com/baresip/re/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -30,7 +31,8 @@ define Package/libre
   CATEGORY:=Libraries
   DEPENDS:=+libopenssl +zlib
   TITLE:=Generic library for real-time communications with async IO support
-  URL:=http://www.creytiv.com
+  URL:=https://github.com/baresip/re
+  ABI_VERSION:=1
 endef
 
 # re.mk is used for this and all related packages (rem, restund and baresip).
@@ -67,12 +69,12 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so} $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib
 endef
 
 define Package/libre/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,libre))

libs/re/patches/001-extend-ninit-nclose-check.patch

@@ -1,6 +1,6 @@
 --- a/src/dns/res.c
 +++ b/src/dns/res.c
-@@ -25,7 +25,7 @@ int get_resolv_dns(char *domain, size_t
+@@ -26,7 +26,7 @@ int get_resolv_dns(char *domain, size_t
  	uint32_t i;
  	int ret, err;
  
@@ -9,7 +9,7 @@
  	ret = res_init();
  	state = _res;
  #else
-@@ -56,7 +56,7 @@ int get_resolv_dns(char *domain, size_t
+@@ -76,7 +76,7 @@ int get_resolv_dns(char *domain, size_t
  	*n = i;
  
   out:

libs/re/patches/004-prevent-optimization-meddling.patch

@@ -1,10 +1,10 @@
 --- a/mk/re.mk
 +++ b/mk/re.mk
-@@ -43,7 +43,6 @@
+@@ -47,7 +47,6 @@
  
  ifneq ($(RELEASE),)
  CFLAGS  += -DRELEASE
 -OPT_SPEED=1
  endif
  
- 
+ ifneq ($(TRACE_ERR),)

libs/re/patches/005-fix-builds-for-mipsel-targets.patch

@@ -1,6 +1,6 @@
 --- a/mk/re.mk
 +++ b/mk/re.mk
-@@ -438,11 +438,6 @@ endif
+@@ -412,11 +412,6 @@ endif
  
  CFLAGS	+= -DARCH=\"$(ARCH)\"
  

libs/rem/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2018 OpenWrt.org
+# Copyright (C) 2010-2017 OpenWrt.org
 # Copyright (C) 2010 Alfred E. Heggestad
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,17 +9,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rem
-PKG_VERSION:=0.5.3
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_HASH:=9f98a79947d4709282a5791ac30f0eda03d5d34086f36df74bff4f8aac0e8050
+PKG_SOURCE_URL:=https://codeload.github.com/baresip/rem/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -30,7 +31,7 @@ define Package/librem
   CATEGORY:=Libraries
   DEPENDS:=+libre
   TITLE:=Audio and video processing media library
-  URL:=http://www.creytiv.com
+  URL:=https://github.com/baresip/rem
 endef
 
 MAKE_FLAGS+= \

libs/signalwire-client-c/Makefile

@@ -0,0 +1,69 @@
+# 
+# Copyright (C) 2019 Sebastian Kemper <sebastian_ml@gmx.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=signalwire-client-c
+
+PKG_VERSION:=2.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=signalwire-c-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/signalwire/signalwire-c/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=7916ad76b2c2c75ff616d19bf044894771b3f8602b80a6f74d8ba26206faef79
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/signalwire-c-$(PKG_VERSION)
+
+PKG_BUILD_PARALLEL:=1
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=copyright
+
+PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/signalwire-client-c
+  SUBMENU:=Telephony
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=SignalWire C client library
+  URL:=https://github.com/signalwire/signalwire-c
+  ABI_VERSION:=2
+  DEPENDS:=+libatomic +libks +libopenssl
+endef
+
+# Otherwise OpenWrt's CPPFLAGS are ignored
+TARGET_CFLAGS += $(TARGET_CPPFLAGS)
+
+define Package/signalwire-client-c/install/headers
+	$(INSTALL_DIR) $(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)/*.h \
+				$(1)/usr/include/signalwire-client-c2/signalwire-client-c/$(2)
+endef
+
+define Build/InstallDev
+	$(foreach s,./ JSON blade signalwire transport,$(call Package/signalwire-client-c/install/headers,$(1),$(s));)
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig \
+		$(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/signalwire-client-c2/signalwire-client-c/cmake/* \
+		$(1)/usr/include/signalwire-client-c2/signalwire-client-c/cmake
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so* $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/signalwire_client2.pc \
+		$(1)/usr/lib/pkgconfig
+endef
+
+define Package/signalwire-client-c/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsignalwire_client2.so.$(ABI_VERSION)* \
+								$(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,signalwire-client-c))

libs/sofia-sip/Makefile

@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2020 Sebastian Kemper <sebastian_ml@gmx.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sofia-sip
+
+PKG_VERSION:=1.13.17
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/freeswitch/$(PKG_NAME)/tar.gz/v${PKG_VERSION}?
+PKG_HASH:=daca3d961b6aa2974ad5d3be69ed011726c3e4d511b2a0d4cb6d878821a2de7a
+
+# sofia-sip adds a version to include path
+# need to update this when the version changes
+VERSION_EQUIVALENT:=1.13
+
+PKG_BUILD_PARALLEL:=1
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/sofia-sip/Default
+  SUBMENU:=Telephony
+  URL:=http://sofia-sip.sourceforge.net/index.html
+endef
+
+define Package/sofia-sip
+$(call Package/sofia-sip/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Sofia-SIP open-source SIP User-Agent library
+  ABI_VERSION:=0
+  DEPENDS:= \
+	  +libopenssl \
+	  +zlib
+endef
+
+define Package/sofia-sip/description
+Sofia-SIP is an open-source SIP User-Agent library, compliant with the
+IETF RFC3261 specification (see the feature table). It can be used as a
+building block for SIP client software for uses such as VoIP, IM, and
+many other real-time and person-to-person communication services. The
+primary target platform for Sofia-SIP is GNU/Linux. Sofia-SIP is based
+on a SIP stack developed at the Nokia Research Center. Sofia-SIP is
+licensed under the LGPL.
+endef
+
+CONFIGURE_ARGS+= \
+	--disable-stun \
+	--without-doxygen \
+	--without-glib
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/sofia-sip-$(VERSION_EQUIVALENT)/sofia-{sip,resolv} \
+		$(1)/usr/share/sofia-sip
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/sofia-sip-$(VERSION_EQUIVALENT)/sofia-sip/*.h{,.in} \
+		$(1)/usr/include/sofia-sip-$(VERSION_EQUIVALENT)/sofia-sip
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/sofia-sip-$(VERSION_EQUIVALENT)/sofia-resolv/*.h \
+		$(1)/usr/include/sofia-sip-$(VERSION_EQUIVALENT)/sofia-resolv
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsofia-sip-ua.{a,so*} $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sofia-sip-ua.pc \
+		$(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/sofia-sip/{msg_parser,tag_dll}.awk \
+		$(1)/usr/share/sofia-sip
+endef
+
+define Package/sofia-sip/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsofia-sip-ua.so.$(ABI_VERSION)* \
+		$(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,sofia-sip))

libs/sofia-sip/patches/01-disable-libcheck.patch

@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -247,7 +247,7 @@ SAC_OPENSSL
+ SAC_TPORT
+ 
+ dnl Check is used for testing
+-PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no")
++PKG_CHECK_MODULES(CHECK, we_do_not_want_check >= 0.9.4, have_check="yes", have_check="no")
+ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+ if test x"$have_check" = "xyes"; then
+    AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available])

libs/spandsp3/Makefile

@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2020 Sebastian Kemper <sebastian_ml@gmx.net>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=spandsp3
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git
+PKG_SOURCE_DATE=2023-06-16
+PKG_SOURCE_VERSION:=0d2e6ac65e0e8f53d652665a743015a88bf048d4
+PKG_RELEASE:=1
+PKG_MIRROR_HASH:=2d25c0f73f15aab37af7f09cf84f379b3fafb7c4d4e867ed1643dd3b3f594920
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+
+PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:= \
+	Jiri Slachta <jiri@slachta.eu> \
+	Sebastian Kemper <sebastian_ml@gmx.net>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libspandsp3
+  SUBMENU:=Telephony
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=spandsp3 library
+  DEPENDS:=+libjpeg-turbo +libtiff
+  URL:=https://github.com/freeswitch/spandsp
+  ABI_VERSION:=3
+endef
+
+# Use fixed point math when soft float support is enabled for target devices.
+ifeq ($(CONFIG_SOFT_FLOAT),y)
+CONFIGURE_ARGS+= \
+	--enable-fixed-point
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) \
+		$(1)/usr/lib/spandsp3/{include/spandsp/private,lib}
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp* \
+		$(1)/usr/lib/spandsp3/lib
+
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp.h \
+		$(1)/usr/lib/spandsp3/include
+
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp/*.h \
+		$(1)/usr/lib/spandsp3/include/spandsp
+
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/spandsp/private/*.h \
+		$(1)/usr/lib/spandsp3/include/spandsp/private
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/spandsp.pc \
+		$(1)/usr/lib/pkgconfig/spandsp3.pc
+endef
+
+define Package/libspandsp3/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp.so.$(ABI_VERSION)* \
+		$(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libspandsp3))

libs/spandsp3/patches/01-spandsp3-pkg-config.patch

@@ -0,0 +1,18 @@
+--- a/spandsp.pc.in
++++ b/spandsp.pc.in
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${exec_prefix}/lib/spandsp3/lib
++includedir=${prefix}/lib/spandsp3/include
+ 
+ Name: spandsp
+ Description: A DSP library for telephony.
+ Requires:
+ Version: @VERSION@
+-Libs: -L${libdir} -lspandsp
++Libs: -L${libdir} -l:libspandsp.so.3
+ Libs.private: -ltiff -lm
+ Cflags: -I${includedir}

libs/spandsp3/patches/02-do-not-check-for-libxml2.patch

@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,6 +231,9 @@ then
+     AC_CHECK_HEADERS([X11/X.h])
+ fi
+ 
++# Note: the libxml2 checks below introduce host include paths into the
++# build, so we turn them off.
++if test -n "$enable_tests" ; then # OpenWrt doesn't build the tests
+ # Determine XML2 include path
+ AC_MSG_CHECKING(for libxml/xmlmemory.h)
+ 
+@@ -259,6 +262,7 @@ fi
+ AC_CHECK_HEADERS([libxml/xmlmemory.h])
+ AC_CHECK_HEADERS([libxml/parser.h])
+ AC_CHECK_HEADERS([libxml/xinclude.h])
++fi # OpenWrt doesn't build the tests
+ 
+ AC_LANG([C++])
+ AC_CHECK_HEADERS([FL/Fl.H])

net/asterisk-13.x-chan-lantiq/Makefile

@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2018 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:=asterisk13-chan-lantiq
-PKG_VERSION:=20180215
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f0d7ca7df8e5df802c5bcb79643e3bdc3956c190
-PKG_MIRROR_HASH:=aaf5ce87a2e23b801318add79eaaa1b7c4a8aa497ca8e2a71ef5d452a7595a73
-PKG_SOURCE_PROTO:=git
-
-PKG_LICENSE:=GPL-2.0
-
-PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
-
-PKG_FLAGS:=nonshared
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SUBMENU:=Telephony Lantiq
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Lantiq channel driver
-  URL:=https://github.com/kochstefan/asterisk_channel_lantiq
-  DEPENDS:=+asterisk13 +kmod-ltq-vmmc
-endef
-
-define Package/$(PKG_NAME)/description
-An implementation of a Lantiq TAPI channel driver for Asterisk 13.
-endef
-
-define Package/$(PKG_NAME)/conffiles
-/etc/asterisk/lantiq.conf
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(INSTALL_DATA) ./files/default.exports \
-		$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
-endef
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR)/src/channels && \
-	$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
-		-MF .chan_lantiq.o.d -MP -pthread \
-		$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
-		-I$(STAGING_DIR)/usr/include/asterisk-13/include \
-		$(TARGET_CPPFLAGS) \
-		-Wall -Wstrict-prototypes -Wmissing-prototypes \
-		-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
-	$(TARGET_CC) -o chan_lantiq.so -pthread $(TARGET_LDFLAGS) -shared \
-		-Wl,--version-script,chan_lantiq.exports,--warn-common \
-		chan_lantiq.o
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
-		$(1)/etc/asterisk/lantiq.conf
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) \
-		$(PKG_BUILD_DIR)/src/channels/chan_lantiq.so \
-		$(1)/usr/lib/asterisk/modules
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

net/asterisk-13.x-chan-lantiq/files/default.exports

@@ -1,8 +0,0 @@
-{
-	global:
-		/* See main/asterisk.exports.in for an explanation why this is
-		 * needed. */
-		_IO_stdin_used;
-	local:
-		*;
-};

net/asterisk-13.x/Config.in

@@ -1,11 +0,0 @@
-menu "Advanced configuration"
-	depends on PACKAGE_asterisk13
-
-config ASTERISK13_LOW_MEMORY
-	bool "Optimize Asterisk 13 for low memory usage"
-	default n
-	help
-	  Warning: this feature is known to cause problems with some modules.
-	  Disable it if you experience problems like segmentation faults.
-
-endmenu

net/asterisk-13.x/files/asterisk.default

@@ -1,4 +0,0 @@
-## startup options for /etc/init.d/asterisk
-
-ENABLE_ASTERISK="yes"
-OPTIONS=""

net/asterisk-13.x/files/asterisk.init

@@ -1,33 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=99
-APP=asterisk
-OPTIONS=
-DEST=
-DEFAULT=$DEST/etc/default/$APP
-BIN_FILE=$DEST/usr/sbin/$APP
-PID_FILE=$DEST/var/run/$APP/$APP.pid
-
-start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk
-       [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
-       [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk
-       [ -d $DEST/var/lib/asterisk ] || mkdir -p $DEST/var/lib/asterisk
-       [ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys
-       [ -d $DEST/var/log/asterisk/cdr-csv ] || mkdir -p $DEST/var/log/asterisk/cdr-csv
-
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_start $BIN_FILE $OPTIONS
-}
-
-stop() {
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_stop $BIN_FILE
-}
-
-reload() {
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_reload $BIN_FILE
-}

net/asterisk-13.x/patches/001-disable-semaphores-check.patch

@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -953,19 +953,6 @@ AC_LINK_IFELSE(
-   ]
- )
- 
--# Some platforms define sem_init(), but only support sem_open(). joyous.
--AC_MSG_CHECKING(for working unnamed semaphores)
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([#include <semaphore.h>],
--		[sem_t sem; return sem_init(&sem, 0, 0);])],
--	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
--	AC_MSG_RESULT(no),
--	AC_MSG_RESULT(cross-compile)
--	AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
--	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
--)
--
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
- if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then

net/asterisk-13.x/patches/002-undef-res-ninit.patch

@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1287,7 +1287,6 @@ AC_LINK_IFELSE(
- 			#include <resolv.h>],
- 			[int foo = res_ninit(NULL);])],
- 	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
- 	AC_SEARCH_LIBS(res_9_ndestroy, resolv)
- 	AC_MSG_CHECKING(for res_ndestroy)
- 	AC_LINK_IFELSE(

net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch

@@ -1,101 +0,0 @@
---- a/include/asterisk/lock.h
-+++ b/include/asterisk/lock.h
-@@ -51,9 +51,11 @@
- #include <pthread.h>
- #include <time.h>
- #include <sys/param.h>
-+#ifndef __UCLIBC__
- #ifdef HAVE_BKTR
- #include <execinfo.h>
- #endif
-+#endif
- 
- #ifndef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
- #include "asterisk/time.h"
-@@ -86,11 +88,15 @@
- #define __AST_RWLOCK_INIT_VALUE		{0}
- #endif /* HAVE_PTHREAD_RWLOCK_INITIALIZER */
- 
-+#ifndef __UCLIBC__
- #ifdef HAVE_BKTR
- #define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, {{{ 0 }}}, PTHREAD_MUTEX_INIT_VALUE }
- #else
- #define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
- #endif
-+#else
-+#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
-+#endif
- 
- #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 1 }
- #define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, 0 }
-@@ -114,9 +120,11 @@ struct ast_lock_track {
- 	int reentrancy;
- 	const char *func[AST_MAX_REENTRANCY];
- 	pthread_t thread_id[AST_MAX_REENTRANCY];
-+#ifndef __UCLIBC__
- #ifdef HAVE_BKTR
- 	struct ast_bt backtrace[AST_MAX_REENTRANCY];
- #endif
-+#endif
- 	pthread_mutex_t reentr_mutex;
- };
- 
-@@ -241,6 +249,7 @@ enum ast_lock_type {
-  * on the lock.  ast_mark_lock_acquired() will mark it as held by this thread.
-  */
- #if !defined(LOW_MEMORY)
-+#ifndef HAVE_BKTR
- #ifdef HAVE_BKTR
- void ast_store_lock_info(enum ast_lock_type type, const char *filename,
- 	int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt);
-@@ -248,14 +257,22 @@ void ast_store_lock_info(enum ast_lock_t
- void ast_store_lock_info(enum ast_lock_type type, const char *filename,
- 	int line_num, const char *func, const char *lock_name, void *lock_addr);
- #endif /* HAVE_BKTR */
-+#else
-+void ast_store_lock_info(enum ast_lock_type type, const char *filename,
-+        int line_num, const char *func, const char *lock_name, void *lock_addr);
-+#endif 
- 
- #else
- 
-+#ifndef __UCLIBC__
- #ifdef HAVE_BKTR
- #define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS,BUD)
- #else
- #define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
- #endif /* HAVE_BKTR */
-+#else
-+#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
-+#endif
- #endif /* !defined(LOW_MEMORY) */
- 
- /*!
-@@ -283,19 +300,27 @@ void ast_mark_lock_failed(void *lock_add
-  * be removed from the current thread's lock info struct.
-  */
- #if !defined(LOW_MEMORY)
-+#ifndef __UCLIBC__
- #ifdef HAVE_BKTR
- void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt);
- #else
- void ast_remove_lock_info(void *lock_addr);
- #endif /* HAVE_BKTR */
-+#else
-+void ast_remove_lock_info(void *lock_addr);
-+#endif 
- void ast_suspend_lock_info(void *lock_addr);
- void ast_restore_lock_info(void *lock_addr);
- #else
-+#ifndef __UCLIBC
- #ifdef HAVE_BKTR
- #define ast_remove_lock_info(ignore,me)
- #else
- #define ast_remove_lock_info(ignore)
- #endif /* HAVE_BKTR */
-+#else
-+#define ast_remove_lock_info(ignore)
-+#endif
- #define ast_suspend_lock_info(ignore);
- #define ast_restore_lock_info(ignore);
- #endif /* !defined(LOW_MEMORY) */

net/asterisk-13.x/patches/050-musl-glob-compat.patch

@@ -1,31 +0,0 @@
---- a/res/ael/ael.flex
-+++ b/res/ael/ael.flex
-@@ -79,6 +79,12 @@
- #if !defined(GLOB_ABORTED)
- #define GLOB_ABORTED GLOB_ABEND
- #endif
-+#if !defined(GLOB_BRACE)
-+#define GLOB_BRACE 0
-+#endif
-+#if !defined(GLOB_NOMAGIC)
-+#define GLOB_NOMAGIC 0
-+#endif
- 
- #include "asterisk/logger.h"
- #include "asterisk/utils.h"
-Only in asterisk-11.7.0: res/ael/ael.tab.o
---- a/res/ael/ael_lex.c
-+++ b/res/ael/ael_lex.c
-@@ -838,6 +838,12 @@
- #if !defined(GLOB_ABORTED)
- #define GLOB_ABORTED GLOB_ABEND
- #endif
-+#if !defined(GLOB_BRACE)
-+#define GLOB_BRACE 0
-+#endif
-+#if !defined(GLOB_NOMAGIC)
-+#define GLOB_NOMAGIC 0
-+#endif
- 
- #include "asterisk/logger.h"
- #include "asterisk/utils.h"

net/asterisk-13.x/patches/052-musl-libcap.patch

@@ -1,37 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -170,6 +170,9 @@ case "${host_os}" in
-      linux-gnu*)
-      OSARCH=linux-gnu
-      ;;
-+     linux-musl*)
-+     OSARCH=linux-musl
-+     ;;
-      kfreebsd*-gnu)
-      OSARCH=kfreebsd-gnu
-      ;;
-@@ -1411,9 +1414,11 @@ if test "${PBX_BFD}" = "0"; then
-   AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz])
- fi
- 
--if test "x${OSARCH}" = "xlinux-gnu" ; then
-+case "${OSARCH}" in
-+linux*)
-   AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
--fi
-+  ;;
-+esac
- 
- AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
- AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -47,7 +47,7 @@ AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
- AST_LIBS+=$(RT_LIB)
- AST_LIBS+=$(SYSTEMD_LIB)
- 
--ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
-+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
-   AST_LIBS+=-ldl
-   ifneq (x$(CAP_LIB),x)
-     AST_LIBS+=$(CAP_LIB)

net/asterisk-13.x/patches/053-musl-mutex-init.patch

@@ -1,11 +0,0 @@
---- a/include/asterisk/lock.h
-+++ b/include/asterisk/lock.h
-@@ -68,7 +68,7 @@
- #define AST_PTHREADT_NULL (pthread_t) -1
- #define AST_PTHREADT_STOP (pthread_t) -2
- 
--#if (defined(SOLARIS) || defined(BSD))
-+#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
- #define AST_MUTEX_INIT_W_CONSTRUCTORS
- #endif /* SOLARIS || BSD */
- 

net/asterisk-13.x/patches/056-fix-check_expr2-build.patch

@@ -1,10 +0,0 @@
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -179,7 +179,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
- 	$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm
- 	$(ECHO_PREFIX) echo "   [RM] ast_expr2fz.o ast_expr2z.o"
- 	rm ast_expr2z.o ast_expr2fz.o
--	./check_expr2 expr2.testinput
- 
- smsq: smsq.o strcompat.o
- smsq: LIBS+=$(POPT_LIB)

net/asterisk-13.x/patches/100-build-reproducibly.patch

@@ -1,28 +0,0 @@
---- a/build_tools/make_build_h
-+++ b/build_tools/make_build_h
-@@ -5,6 +5,14 @@ MACHINE=`uname -m  | sed 's/\\\\/\\\\\\\
- OS=`uname -s`
- USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'`
- DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
-+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-+	# building reproducibly, faking some data
-+	HOSTNAME='buildd.debian.org'
-+	KERNEL='unknown'
-+	MACHINE='unknown'
-+	USER='nobody'
-+	DATE=`date -u "+%Y-%m-%d %H:%M:%S" -d @${SOURCE_DATE_EPOCH}`
-+fi
- cat << END
- /*
-  * build.h
---- a/Makefile
-+++ b/Makefile
-@@ -480,7 +480,7 @@ doc/core-en_US.xml: makeopts .lastclean
- 	@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
- 	@for x in $(MOD_SUBDIRS); do \
- 		printf "$$x " ; \
--		for i in `find $$x -name '*.c'`; do \
-+		for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \
- 			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
- 		done ; \
- 	done

net/asterisk-15.x-chan-lantiq/files/default.exports

@@ -1,8 +0,0 @@
-{
-	global:
-		/* See main/asterisk.exports.in for an explanation why this is
-		 * needed. */
-		_IO_stdin_used;
-	local:
-		*;
-};

net/asterisk-15.x/Config.in

@@ -1,11 +0,0 @@
-menu "Advanced configuration"
-	depends on PACKAGE_asterisk15
-
-config ASTERISK15_LOW_MEMORY
-	bool "Optimize Asterisk 15 for low memory usage"
-	default n
-	help
-	  Warning: this feature is known to cause problems with some modules.
-	  Disable it if you experience problems like segmentation faults.
-
-endmenu

net/asterisk-15.x/files/asterisk.default

@@ -1,4 +0,0 @@
-## startup options for /etc/init.d/asterisk
-
-ENABLE_ASTERISK="yes"
-OPTIONS=""

net/asterisk-15.x/files/asterisk.init

@@ -1,33 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-START=99
-APP=asterisk
-OPTIONS=
-DEST=
-DEFAULT=$DEST/etc/default/$APP
-BIN_FILE=$DEST/usr/sbin/$APP
-PID_FILE=$DEST/var/run/$APP/$APP.pid
-
-start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk
-       [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
-       [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk
-       [ -d $DEST/var/lib/asterisk ] || mkdir -p $DEST/var/lib/asterisk
-       [ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys
-       [ -d $DEST/var/log/asterisk/cdr-csv ] || mkdir -p $DEST/var/log/asterisk/cdr-csv
-
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_start $BIN_FILE $OPTIONS
-}
-
-stop() {
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_stop $BIN_FILE
-}
-
-reload() {
-       SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
-       service_reload $BIN_FILE
-}

net/asterisk-15.x/patches/001-disable-semaphores-check.patch

@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -985,19 +985,6 @@ AC_LINK_IFELSE(
-   ]
- )
- 
--# Some platforms define sem_init(), but only support sem_open(). joyous.
--AC_MSG_CHECKING(for working unnamed semaphores)
--AC_RUN_IFELSE(
--	[AC_LANG_PROGRAM([#include <semaphore.h>],
--		[sem_t sem; return sem_init(&sem, 0, 0);])],
--	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
--	AC_MSG_RESULT(no),
--	AC_MSG_RESULT(cross-compile)
--	AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
--	AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
--)
--
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
- if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then

net/asterisk-15.x/patches/002-undef-res-ninit.patch

@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1319,7 +1319,6 @@ AC_LINK_IFELSE(
- 			#include <resolv.h>],
- 			[int foo = res_ninit(NULL);])],
- 	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
- 	AC_SEARCH_LIBS(res_9_ndestroy, resolv)
- 	AC_MSG_CHECKING(for res_ndestroy)
- 	AC_LINK_IFELSE(

net/asterisk-15.x/patches/004-disable-check-for-hrirs.patch

@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2709,7 +2709,7 @@ else
- fi
- 
- # conf_bridge (binaural rendering): check if HRIRs are available
--AC_CHECK_FILES([bridges/bridge_softmix/include/hrirs.h])
-+# AC_CHECK_FILES([bridges/bridge_softmix/include/hrirs.h])
- 
- AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
- AST_CHECK_MANDATORY

net/asterisk-15.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch

@@ -1,22 +0,0 @@
---- a/res/ael/ael.flex
-+++ b/res/ael/ael.flex
-@@ -601,7 +601,7 @@ includes	{ STORE_POS; return KW_INCLUDES
- 		   snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
- 		   ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
- 		}
--#ifdef SOLARIS
-+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
- 			glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
- #else
- 			glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
---- a/res/ael/ael_lex.c
-+++ b/res/ael/ael_lex.c
-@@ -1982,7 +1982,7 @@ YY_RULE_SETUP
- 		   snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
- 		   ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
- 		}
--#ifdef SOLARIS
-+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
- 			glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
- #else
- 			glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);

net/asterisk-15.x/patches/056-fix-check_expr2-build.patch

@@ -1,10 +0,0 @@
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -182,7 +182,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
- 	$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm
- 	$(ECHO_PREFIX) echo "   [RM] ast_expr2fz.o ast_expr2z.o"
- 	rm ast_expr2z.o ast_expr2fz.o
--	./check_expr2 expr2.testinput
- 
- smsq: smsq.o strcompat.o
- smsq: LIBS+=$(POPT_LIB)

net/asterisk-15.x/patches/100-build-reproducibly.patch

@@ -1,28 +0,0 @@
---- a/build_tools/make_build_h
-+++ b/build_tools/make_build_h
-@@ -5,6 +5,14 @@ MACHINE=`uname -m  | sed 's/\\\\/\\\\\\\
- OS=`uname -s`
- USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'`
- DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
-+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-+	# building reproducibly, faking some data
-+	HOSTNAME='buildd.debian.org'
-+	KERNEL='unknown'
-+	MACHINE='unknown'
-+	USER='nobody'
-+	DATE=`date -u "+%Y-%m-%d %H:%M:%S" -d @${SOURCE_DATE_EPOCH}`
-+fi
- cat << END
- /*
-  * build.h
---- a/Makefile
-+++ b/Makefile
-@@ -479,7 +479,7 @@ doc/core-en_US.xml: makeopts .lastclean
- 	@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
- 	@for x in $(MOD_SUBDIRS); do \
- 		printf "$$x " ; \
--		for i in `find $$x -name '*.c'`; do \
-+		for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \
- 			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
- 		done ; \
- 	done

net/asterisk-chan-dongle/Makefile

@@ -8,15 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk-chan-dongle
-PKG_VERSION:=1.1-20180312
-PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3e2b3ca6fd4d0a996404dfdc724973e92f2683eb
-PKG_MIRROR_HASH:=655d1b6a78fb92f5a41410747d2ad633493e5eb2c5a2a0fdf8057dde4011213e
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
+PKG_SOURCE_VERSION:=503dba87d726854b74b49e70679e64e6e86d5812
+PKG_SOURCE_DATE=2022-11-04
+PKG_RELEASE:=1
+PKG_MIRROR_HASH:=0d585c108ec18d136ce03704b96d0a6769e617c820fc74f735e3e192ad282611
 
 PKG_FIXUP:=autoreconf
 
@@ -24,87 +22,76 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYRIGHT.txt LICENSE.txt
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 MODULES_DIR:=/usr/lib/asterisk/modules
 
 include $(INCLUDE_DIR)/package.mk
+# asterisk-chan-dongle needs iconv
+include $(INCLUDE_DIR)/nls.mk
 
-define Package/asterisk-chan-dongle/Default
+define Package/asterisk-chan-dongle
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   URL:=https://github.com/wdoekes/asterisk-chan-dongle
-  DEPENDS:=+USE_UCLIBC:libiconv-full +kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch
+  DEPENDS:=asterisk $(ICONV_DEPENDS) +libsqlite3
   TITLE:=Huawei UMTS 3G dongle support
 endef
 
-define Package/asterisk13-chan-dongle
-$(call Package/asterisk-chan-dongle/Default)
-  DEPENDS+=asterisk13
-  VARIANT:=asterisk13
-endef
-
-define Package/asterisk15-chan-dongle
-$(call Package/asterisk-chan-dongle/Default)
-  DEPENDS+=asterisk15
-  VARIANT:=asterisk15
-endef
-
-define Package/description/Default
+define Package/asterisk-chan-dongle/description
  Asterisk channel driver for Huawei UMTS 3G dongle.
 endef
 
-Package/asterisk13-chan-dongle/description = $(Package/description/Default)
-Package/asterisk15-chan-dongle/description = $(Package/description/Default)
-
-ifeq ($(BUILD_VARIANT),asterisk13)
-  CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-13/include
 CONFIGURE_ARGS+= \
-	  --with-astversion=13
+	--with-asterisk=$(STAGING_DIR)/usr/include \
+	--with-astversion=18
+
+ifeq ($(CONFIG_BUILD_NLS),y)
+CONFIGURE_ARGS+=--with-iconv=$(ICONV_PREFIX)/include
+else
+CONFIGURE_ARGS+=--with-iconv=$(TOOLCHAIN_DIR)/include
 endif
 
-ifeq ($(BUILD_VARIANT),asterisk15)
-  CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-15/include
-  CONFIGURE_ARGS+= \
-	  --with-astversion=15
-endif
-
-CONFIGURE_ARGS+= \
-	--with-asterisk=$(CHAN_DONGLE_AST_HEADERS)
-
-TARGET_CFLAGS+= \
-	-I$(CHAN_DONGLE_AST_HEADERS)
-
 MAKE_FLAGS+=LD="$(TARGET_CC)"
 
-# musl and glibc include their own iconv, but uclibc does not
-TARGET_CPPFLAGS+=$(if $(CONFIG_USE_UCLIBC),-I$(STAGING_DIR)/usr/lib/libiconv-full/include)
-TARGET_LDFLAGS+=$(if $(CONFIG_USE_UCLIBC),-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv)
-
-# $CHAN_DONGLE_ICONV_INC used by 200-fix-iconv-detection.patch
 CONFIGURE_VARS += \
-	CHAN_DONGLE_ICONV_INC="$(TOOLCHAIN_DIR)/include $(STAGING_DIR)/usr/lib/libiconv-full/include" \
 	DESTDIR="$(MODULES_DIR)" \
 	ac_cv_type_size_t=yes \
 	ac_cv_type_ssize_t=yes
 
-define Package/conffiles/Default
+define Package/asterisk-chan-dongle/conffiles
 /etc/asterisk/dongle.conf
 endef
 
-Package/asterisk13-chan-dongle/conffiles = $(Package/conffiles/Default)
-Package/asterisk15-chan-dongle/conffiles = $(Package/conffiles/Default)
-
-define Package/Install/Default
+define Package/asterisk-chan-dongle/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/dongle.conf $(1)/etc/asterisk
 	$(INSTALL_DIR) $(1)$(MODULES_DIR)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/chan_dongle.so $(1)$(MODULES_DIR)
 endef
 
-Package/asterisk13-chan-dongle/install = $(Package/Install/Default)
-Package/asterisk15-chan-dongle/install = $(Package/Install/Default)
+define Package/asterisk-chan-dongle/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+  echo
+  echo "o-------------------------------------------------------------------o"
+  echo "| asterisk-chan-dongle note                                         |"
+  echo "o-------------------------------------------------------------------o"
+  echo "| Adding the \"asterisk\" user to the \"dialout\" group might be        |"
+  echo "| required for asterisk to be able to access the dongle.            |"
+  echo "o-------------------------------------------------------------=^_^=-o"
+  echo
+fi
+exit 0
+endef
 
-$(eval $(call BuildPackage,asterisk13-chan-dongle))
-$(eval $(call BuildPackage,asterisk15-chan-dongle))
+define Build/Prepare
+	$(call Build/Prepare/Default)
+ifeq ($(QUILT),)
+ifeq ($(CONFIG_BUILD_NLS),y)
+	$(SED) 's/\[iconv\], \[c iconv\]/[libiconv], [iconv]/' \
+		"$(PKG_BUILD_DIR)/configure.ac"
+endif
+endif
+endef
+
+$(eval $(call BuildPackage,asterisk-chan-dongle))

net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch

@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,7 +102,7 @@ AC_DEFUN([AC_HEADER_FIND], [
- )
- 
- AC_HEADER_FIND([asterisk.h], $with_asterisk)
--AC_HEADER_FIND([iconv.h], /usr/include /usr/local/include /opt/local/include)
-+AC_HEADER_FIND([iconv.h], ${CHAN_DONGLE_ICONV_INC})
- 
- AC_DEFINE([ICONV_CONST],[], [Define to const if you has iconv() const declaration of input buffer])
- AC_MSG_CHECKING([for iconv use const inbuf])

net/asterisk-chan-dongle/patches/300-use-openwrt-flags.patch

@@ -1,8 +1,8 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -216,8 +216,6 @@ dnl Apply options to defines
+@@ -247,8 +247,6 @@ dnl Apply options to defines
  if test "x$enable_debug" = "xyes" ; then
-   CFLAGS="$CFLAGS -O0 -g"
+   CFLAGS="$CFLAGS -O0 -g3"
    AC_DEFINE([__DEBUG__], [1], [Build with debugging])
 -else
 -  CFLAGS="$CFLAGS -O6"

net/asterisk-chan-dongle/patches/400-time_t.patch

@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,11 +165,13 @@ dnl AC_CHECK_TYPE(uint64_t, unsigned lon
+ 
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(long int)
++AC_CHECK_SIZEOF(long long int)
+ AC_CHECK_SIZEOF(time_t)
+ case "$ac_cv_sizeof_time_t" in
+ ''|0) AC_MSG_ERROR([Could not find time_t type]);;
+ $ac_cv_sizeof_int) AC_DEFINE([PRI_time_t], ["d"], [printf format for time_t]);;
+ $ac_cv_sizeof_long_int) AC_DEFINE([PRI_time_t], ["ld"], [printf format for time_t]);;
++$ac_cv_sizeof_long_long_int) AC_DEFINE([PRI_time_t], ["lld"], [printf format for time_t]);;
+ *) AC_MSG_ERROR([Could not find match size of time_t to printf format])
+ esac
+ 

net/asterisk-chan-lantiq/Makefile

@@ -7,15 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=asterisk15-chan-lantiq
-PKG_VERSION:=20180215
-PKG_RELEASE:=2
+PKG_NAME:=asterisk-chan-lantiq
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c9d68dd06fcd46ac7985df45f8c2b8833e658f8e
-PKG_MIRROR_HASH:=8666c18b24adf9da3ddf12306fcf0a8b4f56860c256b172bd0ba5c2a7a3ab25e
+PKG_SOURCE_VERSION:=2f029ec8778420538c8151c6aceba0f7b44b07c9
+PKG_SOURCE_DATE:=2021-09-11
+PKG_MIRROR_HASH:=0c57aeb33dc7efb0078e77907e0bc616f1714251e64d647a59faffe5af8bac73
 PKG_SOURCE_PROTO:=git
 
 PKG_LICENSE:=GPL-2.0
@@ -32,29 +30,23 @@ define Package/$(PKG_NAME)
   CATEGORY:=Network
   TITLE:=Lantiq channel driver
   URL:=https://github.com/kochstefan/asterisk_channel_lantiq
-  DEPENDS:=+asterisk15 +kmod-ltq-vmmc
+  DEPENDS:=+asterisk +kmod-ltq-vmmc
+  USERID:=asterisk=385::vmmc=386
 endef
 
 define Package/$(PKG_NAME)/description
-An implementation of a Lantiq TAPI channel driver for Asterisk 15.
+An implementation of a Lantiq TAPI channel driver for Asterisk.
 endef
 
 define Package/$(PKG_NAME)/conffiles
 /etc/asterisk/lantiq.conf
 endef
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(INSTALL_DATA) ./files/default.exports \
-		$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
-endef
-
 define Build/Compile
 	cd $(PKG_BUILD_DIR)/src/channels && \
 	$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
 		-MF .chan_lantiq.o.d -MP -pthread \
 		$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
-		-I$(STAGING_DIR)/usr/include/asterisk-15/include \
 		$(TARGET_CPPFLAGS) \
 		-Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
@@ -65,7 +57,7 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) \
+	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
 		$(1)/etc/asterisk/lantiq.conf
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules

net/asterisk-chan-sccp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 - 2018 OpenWrt.org
+# Copyright (C) 2016 OpenWrt.org
 # Copyright (C) 2016 Cesnet, z.s.p.o.
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,15 +8,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=chan-sccp
-PKG_VERSION:=v4.3.0-20180322
-PKG_RELEASE:=1
+PKG_NAME:=asterisk-chan-sccp
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+# Updated to v4.3.3 release
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=69fdf95837727c104f2394644bd21f83c2e4a4a3
-PKG_MIRROR_HASH:=fa755b5d8186b3baac99c93dc13e493b67c5054d114fcbef0ee93d18df5b6fcd
+PKG_SOURCE_VERSION:=968caa458920965c5dd15c31bcd50d21a891ab20
+PKG_SOURCE_DATE:=2020-12-19
+PKG_MIRROR_HASH:=627e9057a70b01d1fd69c80c0f6a138c79aace10082d76016af23a6bafd2a3d7
 PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
@@ -27,81 +26,50 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_INSTALL:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+# need iconv.m4, otherwise error during autoreconf
+PKG_BUILD_DEPENDS:=gettext-full
 
 include $(INCLUDE_DIR)/package.mk
+# chan-sccp needs iconv
+include $(INCLUDE_DIR)/nls.mk
 
-# musl and glibc include their own iconv, but uclibc does not
-ifneq ($(CONFIG_USE_UCLIBC),)
-TARGET_CPPFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libiconv-full/include
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
-endif
-
-define Package/chan-sccp/Default
+define Package/asterisk-chan-sccp
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   TITLE:=SCCP channel support
   URL:=https://github.com/chan-sccp/chan-sccp
-  DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
-  PKG_BUILD_DEPENDS:=libiconv
+  DEPENDS:=asterisk $(ICONV_DEPENDS) +libltdl \
+	  +asterisk-bridge-holding \
+	  +asterisk-bridge-native-rtp \
+	  +asterisk-bridge-simple \
+	  +asterisk-bridge-softmix \
+	  +asterisk-res-stasis-device-state
+  CONFLICTS:=asterisk-chan-skinny
 endef
 
-define Package/asterisk13-chan-sccp
-$(call Package/chan-sccp/Default)
-  DEPENDS+=asterisk13
-  VARIANT:=asterisk13
-  CONFLICTS:=asterisk13-chan-skinny
-endef
-
-define Package/asterisk15-chan-sccp
-$(call Package/chan-sccp/Default)
-  DEPENDS+=asterisk15
-  VARIANT:=asterisk15
-  CONFLICTS:=asterisk15-chan-skinny
-endef
-
-define Package/description/Default
+define Package/asterisk-chan-sccp/description
 Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
 Extended features include shared lines, presence / BLF, customizable
 feature buttons and custom device state.
 endef
 
-Package/asterisk13-chan-sccp/description = $(Package/description/Default)
-Package/asterisk15-chan-sccp/description = $(Package/description/Default)
-
 CONFIGURE_ARGS += \
 	--disable-debug \
 	--enable-advanced-functions \
 	--enable-conference \
-	--enable-video
+	--enable-video \
+	--with-asterisk=$(STAGING_DIR)/usr
 
-ifeq ($(BUILD_VARIANT),asterisk13)
-  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
-endif
-
-ifeq ($(BUILD_VARIANT),asterisk15)
-  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-15
-endif
-
-define Package/conffiles/Default
+define Package/asterisk-chan-sccp/conffiles
 /etc/asterisk/sccp.conf
 endef
 
-Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
-Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
-
-define Package/Install/Default
+define Package/asterisk-chan-sccp/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/sccp.conf $(1)/etc/asterisk
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
 endef
 
-Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
-Package/asterisk15-chan-sccp/install = $(Package/Install/Default)
-
-$(eval $(call BuildPackage,asterisk13-chan-sccp))
-$(eval $(call BuildPackage,asterisk15-chan-sccp))
+$(eval $(call BuildPackage,asterisk-chan-sccp))

net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch

@@ -1,6 +1,6 @@
 --- a/autoconf/extra.m4
 +++ b/autoconf/extra.m4
-@@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+@@ -516,17 +516,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
  			], SUPPORTED_CFLAGS)
  		])
  		AC_SUBST([strip_binaries])

net/asterisk-chan-sccp/patches/02-autoconf-2.70.patch

@@ -0,0 +1,11 @@
+--- a/autoconf/acinclude.m4
++++ b/autoconf/acinclude.m4
+@@ -497,7 +497,7 @@ AC_DEFUN([CS_GET_VERSION], [
+   SCCP_REVISION="unknown"
+ 
+   CURRENT=`pwd`
+-  BASE=`dirname $ac_dir`
++  BASE=`dirname $ac_aux_dir`
+   cd $BASE >/dev/null
+   . ./tools/versioncheck silent
+   cd $CURRENT >/dev/null

net/asterisk-chan-sccp/patches/100-reproducible-builds.patch

@@ -1,8 +1,6 @@
-Index: chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-===================================================================
---- chan-sccp-v4.3.0-20171123.orig/src/chan_sccp.c
-+++ chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-@@ -186,7 +186,7 @@ boolean_t sccp_postPBX_load(void)
+--- a/src/chan_sccp.c
++++ b/src/chan_sccp.c
+@@ -198,7 +198,7 @@ boolean_t sccp_postPBX_load(void)
  #else
  	snprintf(SCCP_REVISIONSTR, sizeof(SCCP_REVISIONSTR), "%s", SCCP_REVISION);
  #endif