libpri: update to version 1.6.1

Allows to drop backport patch which is now part of the new release.

Change Log for Release libpri-1.6.1
========================================

Links:
----------------------------------------

 - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/libpri/releases/ChangeLog-1.6.1.md)
 - [GitHub Diff](https://github.com/asterisk/libpri/compare/1.6.0...1.6.1)
 - [Tarball](https://downloads.asterisk.org/pub/telephony/libpri/libpri-1.6.1.tar.gz)
 - [Downloads](https://downloads.asterisk.org/pub/telephony/libpri)

Summary:
----------------------------------------

- .github: Add Releaser workflow
- Link README to README.md
- Makefile: Fix modern compiler errors.
- Makefile: Add the ability to build libpri on MacOS for Linux target.
- q931.c: Fix subaddress finding octet 4.

User Notes:
----------------------------------------

Upgrade Notes:
----------------------------------------

Closed Issues:
----------------------------------------

None

Commits By Author:
----------------------------------------

- ### George Joseph (2):
  - Link README to README.md
  - .github: Add Releaser workflow

- ### Sean Bright (1):
  - Makefile: Fix modern compiler errors.

- ### Sergey V. Lobanov (1):
  - Makefile: Add the ability to build libpri on MacOS for Linux target.

- ### bbabic (1):
  - q931.c: Fix subaddress finding octet 4.

Detail:
----------------------------------------

- ### .github: Add Releaser workflow
  Author: George Joseph
  Date:   2023-08-16

- ### Link README to README.md
  Author: George Joseph
  Date:   2023-08-15

- ### Makefile: Fix modern compiler errors.
  Author: Sean Bright
  Date:   2023-03-10

  Disable GCC's zero-length-bounds and stringop-overflow errors.

  PRI-189 #close

- ### Makefile: Add the ability to build libpri on MacOS for Linux target.
  Author: Sergey V. Lobanov
  Date:   2022-02-19

  This patch allows to redefine ar and ranlib tool using AR and
  RANLIB make flags.

  PRI-188 #close

- ### q931.c: Fix subaddress finding octet 4.
  Author: bbabic
  Date:   2017-10-23

  Some switches have extended subaddress ie octet 3 encoding to be
  multi-octet.

  * Update dump and receive helper functions to search for the end of octet
  3 encoding to determine where octet 4 starts.

  ASTERISK-27342

Signed-off-by: Daniel Golle <[email protected]>

diff --git a/libs/libpri/Makefile b/libs/libpri/Makefile
index a52221ec9b8e4101c4bf77ec1d9dd368e58ebf32..d6ff23dc3cad0719931817c20ce8f1c59d7c5656 100644 (file)
--- a/libs/libpri/Makefile
+++ b/libs/libpri/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpri
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=4
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/libpri/releases
-PKG_HASH:=7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6
+PKG_HASH:=d4d1a62766695455f1b616f5f7603458e6d23df787ebabc31ffda1c6298d0509
 PKG_MAINTAINER:=Daniel Golle <[email protected]>
 
 PKG_INSTALL:=1

diff --git a/libs/libpri/patches/010-no-werror.patch b/libs/libpri/patches/010-no-werror.patch
index e66f4286670eab118598fe0b5f05da0f0fa78908..6891b934039994b100218a6d50999714db764428 100644 (file)
--- a/libs/libpri/patches/010-no-werror.patch
+++ b/libs/libpri/patches/010-no-werror.patch
@@ -1,11 +1,11 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -68,7 +68,7 @@ DYNAMIC_OBJS= \
+@@ -70,7 +70,7 @@ DYNAMIC_OBJS= \
        $(STATIC_OBJS)
  CFLAGS ?= -g
  CFLAGS += $(CPPFLAGS)
--CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow
  CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr

diff --git a/libs/libpri/patches/100_add-an-ability-to-build-libpri-on-MacOS-for-Linux-ta.patch b/libs/libpri/patches/100_add-an-ability-to-build-libpri-on-MacOS-for-Linux-ta.patch
deleted file mode 100644 (file)
index dd6d843..0000000
--- a/libs/libpri/patches/100_add-an-ability-to-build-libpri-on-MacOS-for-Linux-ta.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream issue: https://issues.asterisk.org/jira/browse/PRI-188
-
-From ec1d6589c6e4eb6550cb92d5e0f214f7b31e8d5f Mon Sep 17 00:00:00 2001
-From: "Sergey V. Lobanov" <[email protected]>
-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 <[email protected]>
----
- 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)