[Buildroot] [PATCH 1/3] package/libosip2: bump to version 5.1.1

[Buildroot] [PATCH 1/3] package/libosip2: bump to version 5.1.1

[Gilles Talis]

Removed patch that was applied upstream

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 ...r-109133-Heap-buffer-overflow-in-uti.patch | 30 -------------------
 package/libosip2/libosip2.hash                |  2 +-
 package/libosip2/libosip2.mk                  |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch

diff --git a/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch b/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
deleted file mode 100644
index 7f2c2d46d2..0000000000
--- a/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001
-From: Aymeric Moizard <amoizard@gmail.com>
-Date: Mon, 5 Sep 2016 15:01:53 +0200
-Subject: [PATCH]  * fix bug report: sr #109133: Heap buffer overflow in
- utility function *osip_clrncpy*    https://savannah.gnu.org/support/?109133
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/osipparser2/osip_port.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c
-index 0e64147..d8941b0 100644
---- a/src/osipparser2/osip_port.c
-+++ b/src/osipparser2/osip_port.c
-@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len)
- 	char *p;
- 	size_t spaceless_length;
- 
--	if (src == NULL)
-+	if (src == NULL || len == 0) {
-+		*dst = '\0';
- 		return NULL;
-+	}
- 
- 	/* find the start of relevant text */
-	pbeg = src;
--- 
-2.11.0
-
diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash
index c6df5f2362..76bc29d5fe 100644
--- a/package/libosip2/libosip2.hash
+++ b/package/libosip2/libosip2.hash
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd	libosip2-3.6.0.tar.gz
+sha256	61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d	libosip2-5.1.1.tar.gz
 
 # Hash for license file:
 sha256	8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de	COPYING
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 9302b9912e..e608f671c8 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBOSIP2_VERSION = 3.6.0
+LIBOSIP2_VERSION = 5.1.1
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
 LIBOSIP2_LICENSE = LGPL-2.1+
-- 
2.17.1

[Buildroot] [PATCH 2/3] package/libeXosip2: bump to version 5.1.1

[Gilles Talis]

- Removed patch that was applied upstream
- Removed AUTORECONF request that came with patch
- Updated library's download name

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 ...001-use-pkg-config-to-detect-openssl.patch | 62 -------------------
 package/libeXosip2/libeXosip2.hash            |  2 +-
 package/libeXosip2/libeXosip2.mk              |  7 +--
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch

diff --git a/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch b/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
deleted file mode 100644
index 69e349f205..0000000000
--- a/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-configure: use pkg-config to find openssl
-
-The current check is broken for static linking, since the openssl
-libs need to be linked against libz, which is missing in the link
-command when doing a static build:
-    http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log
-
-Instead of trying convoluted tests to decide what additional libs
-are required, just delegate this job to pkg-config.
-
-At the same time, fix a few legacy, deprecated constructs in favour
-of their new counterparts.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
-Upstream status: submitted, but no public mailing list (sent to the
-mail documented in: http://www.antisip.com/doc/exosip2/index.html )
-
-diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in
---- libeXosip2-3.6.0.orig/configure.in	2014-06-22 23:58:26.549487427 +0200
-+++ libeXosip2-3.6.0/configure.in	2014-06-22 23:59:12.822008499 +0200
-@@ -44,7 +44,7 @@
- AC_CONFIG_AUX_DIR(scripts)
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
--AM_ACLOCAL_INCLUDE(scripts)
-+AC_CONFIG_MACRO_DIR([scripts])
- 
- AC_CANONICAL_HOST
- 
-@@ -371,13 +371,15 @@
- 
- AC_ARG_ENABLE(openssl,
- 	[  --enable-openssl        enable support for openssl],
--	enable_openssl=$enableval,enable_openssl="yes")
-+	enable_openssl=$enableval,enable_openssl="auto")
- 
--if test "$enable_openssl" = "yes" ; then
--	AC_CHECK_HEADERS(openssl/ssl.h)
--	AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
--	AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"])
--fi
-+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"],
-+      [PKG_CHECK_MODULES([SSL], [openssl],
-+                         [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"],
-+                         [AS_IF([test "$enable_openssl" = "yes"],
-+                                [AC_MSG_ERROR([can not find openssl])])
-+                         ])
-+      ])
- 
- AC_ARG_ENABLE(srvrec,
- 	[  --enable-srvrec         enable support for SRV records DNS queries (yes) ],
-diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am
---- libeXosip2-3.6.0.orig/Makefile.am	2014-06-23 00:14:25.328226745 +0200
-+++ libeXosip2-3.6.0/Makefile.am	2014-06-23 00:14:38.296371236 +0200
-@@ -1,4 +1,4 @@
--
-+ACLOCAL_AMFLAGS = -I scripts
- EXTRA_DIST = README autogen.sh
- 
- SUBDIRS = scripts platform src include tools help
diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash
index 86335a3c47..a7d3c56d00 100644
--- a/package/libeXosip2/libeXosip2.hash
+++ b/package/libeXosip2/libeXosip2.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz
+sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz
 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 04f8672c40..4bd8922b41 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -4,7 +4,9 @@
 #
 ################################################################################
 
-LIBEXOSIP2_VERSION = 3.6.0
+LIBEXOSIP2_VERSION = 5.1.1
+# Since version 5.0, letter 'X' in library's name is in lower case
+LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
 LIBEXOSIP2_INSTALL_STAGING = YES
 LIBEXOSIP2_LICENSE = GPL-2.0+
@@ -12,9 +14,6 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
-# We are touching configure.in and Makefile.am with one of our patches
-LIBEXOSIP2_AUTORECONF = YES
-
 ifeq ($(BR2_arc),y)
 # toolchain __arc__ define conflicts with libeXosip2 source
 LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
-- 
2.17.1

[Buildroot] [PATCH 3/3] DEVELOPERS: add Gilles Talis for libosip2 and libeXosip2

[Gilles Talis]

Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
---
 DEVELOPERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DEVELOPERS b/DEVELOPERS
index e4a3bcb24a..91716ed27e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -998,7 +998,9 @@ F:	package/fdk-aac/
 F:	package/httping/
 F:	package/iozone/
 F:	package/leptonica/
+F:	package/libeXosip2/
 F:	package/libolm/
+F:	package/libosip2/
 F:	package/ocrad/
 F:	package/restclient-cpp/
 F:	package/tesseract-ocr/
-- 
2.17.1

[Buildroot] [PATCH 3/3] DEVELOPERS: add Gilles Talis for libosip2 and libeXosip2

[Yann E. MORIN]

Gilles, All,

On 2020-02-22 17:35 +0100, Gilles Talis spake thusly:
> Signed-off-by: Gilles Talis <gilles.talis@gmail.com>

This DEVELOPERS patch applied to master, thanks.

I'll apply the version bumps to the next branch shortly.

Regards,
Yann E. MORIN.

> ---
>  DEVELOPERS | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index e4a3bcb24a..91716ed27e 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -998,7 +998,9 @@ F:	package/fdk-aac/
>  F:	package/httping/
>  F:	package/iozone/
>  F:	package/leptonica/
> +F:	package/libeXosip2/
>  F:	package/libolm/
> +F:	package/libosip2/
>  F:	package/ocrad/
>  F:	package/restclient-cpp/
>  F:	package/tesseract-ocr/
> -- 
> 2.17.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'