diff options
| author | Jiri Slachta <jiri@slachta.eu> | 2019-10-16 15:47:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 15:47:06 +0200 |
| commit | ec7d9d339f9835c4bf9bb6b14abaef0808780342 (patch) | |
| tree | 0332cc12bac4ae2a2abd61ace4dd3d46ee4dedab /libs | |
| parent | 2cf7ee50a7e6431cf7ee4d05b179c823082529ce (diff) | |
| parent | 4ff6d20fdfe60ba3dacbeddb8d7e1c06c8bd9bc2 (diff) | |
Merge pull request #466 from micmac1/libosip2-up-abi
libosip2: bump to 5.1.0
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/libosip2/Makefile | 12 | ||||
| -rw-r--r-- | libs/libosip2/patches/01-CVE-2017-7853.patch | 31 |
2 files changed, 7 insertions, 36 deletions
diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index 1c17f44..6d57408 100644 --- a/libs/libosip2/Makefile +++ b/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.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/osip -PKG_HASH:=18a13c954f7297978e7bf1a0cdadde7c531e519d61a045dae304e054f3b2df03 +PKG_HASH:=40573a997a656f967b2b5ebafbd36d7f1d4a4634abcf312643854057d061f145 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:=12 DEPENDS:=+librt endef @@ -44,6 +45,7 @@ CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-debug \ + --disable-silent-rules \ --disable-trace \ --disable-mpatrol \ --disable-gprof \ @@ -53,7 +55,7 @@ CONFIGURE_ARGS += \ --disable-sysv \ --disable-gperf \ --disable-test \ - --disable-minisize + --disable-minisize define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -68,7 +70,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)) diff --git a/libs/libosip2/patches/01-CVE-2017-7853.patch b/libs/libosip2/patches/01-CVE-2017-7853.patch deleted file mode 100644 index 673f43c..0000000 --- a/libs/libosip2/patches/01-CVE-2017-7853.patch +++ /dev/null @@ -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 - |