Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libosip2: bump to 5.1.0

Browse source 
Version bump.

- add ABI_VERSION as per OpenWrt package policies [1]
- don't package version-less symlink also as per [1]
- add --disable-silent-rules to keep build verbose
- remove leftover whitespace
- drop patch now included in tarball

[1] https://openwrt.org/docs/guide-developer/package-policies

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2019-10-05 17:04:13 +02:00
parent f6f18cf61c
commit 4ff6d20fdf
2 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/libosip2/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libosip2 PKG_NAME:=libosip2
PKG_VERSION:=5.0.0 PKG_VERSION:=5.1.0
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/osip PKG_SOURCE_URL:=@GNU/osip
PKG_HASH:=18a13c954f7297978e7bf1a0cdadde7c531e519d61a045dae304e054f3b2df03 PKG_HASH:=40573a997a656f967b2b5ebafbd36d7f1d4a4634abcf312643854057d061f145
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -30,6 +30,7 @@ define Package/libosip2
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=GNU oSIP library TITLE:=GNU oSIP library
URL:=http://www.gnu.org/software/osip/ URL:=http://www.gnu.org/software/osip/
ABI_VERSION:=12
DEPENDS:=+librt DEPENDS:=+librt
endef endef
@ -44,6 +45,7 @@ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-debug \ --disable-debug \
--disable-silent-rules \
--disable-trace \ --disable-trace \
--disable-mpatrol \ --disable-mpatrol \
--disable-gprof \ --disable-gprof \
@ -68,7 +70,7 @@ endef
define Package/libosip2/install define Package/libosip2/install
$(INSTALL_DIR) $(1)/usr/lib $(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 endef
$(eval $(call BuildPackage,libosip2)) $(eval $(call BuildPackage,libosip2))

31
libs/libosip2/patches/01-CVE-2017-7853.patch
View file

@ -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