diff --git a/libs/libpri/Makefile b/libs/libpri/Makefile index a52221e..d6ff23d 100644 --- 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 PKG_INSTALL:=1 diff --git a/libs/libpri/patches/010-no-werror.patch b/libs/libpri/patches/010-no-werror.patch index e66f428..6891b93 100644 --- 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 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" -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 ---- - 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)