From patchwork Sat Feb 22 16:35:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Talis X-Patchwork-Id: 1242540 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bjhr8XnI; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Pv8T1HpWz9sPk for ; Sun, 23 Feb 2020 03:35:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BE5AD85CCF; Sat, 22 Feb 2020 16:35:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U9EcESnCLgwH; Sat, 22 Feb 2020 16:35:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F67A863D5; Sat, 22 Feb 2020 16:35:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8C7911BF5A7 for ; Sat, 22 Feb 2020 16:35:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 88B5C863D5 for ; Sat, 22 Feb 2020 16:35:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v0cuQjXBkk5R for ; Sat, 22 Feb 2020 16:35:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7BB9C85CCF for ; Sat, 22 Feb 2020 16:35:42 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id g3so5439632wrs.12 for ; Sat, 22 Feb 2020 08:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aaCEYC9l+TBHX3iqyh15YN4pt+kLWNP2unkmkYo+95s=; b=bjhr8XnI39vh1hhqW3fyxpOtmjYpPXOx4uRwNiO5nDvYwT/n3kXysWGtjsPAsKuZdD Sp8Pbe81XLmboZJ05At+ngtbI72C9EpkJ1Yxtnam8iOcFhp1TYKjfm1vXW2afPrdY96e SzixFWcaM7jnJ54LuFTnuAd7ytJ/24da+NhsJlJNd9SBn0raBu07zKOIxz1kBhrk2H4s D2sGrgak2vhszJtoUU/mdSQ/a7m8M1lOmuQ+AotkVRxImOv6BVYVO/C3RAl8uIqWeksL VE0hJydSVhZ+LcOOVv33OfAy55j1D5JPUD1rBrYaJalmK0zxCpwjcg80+T6eJ6kUFkV7 EjdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aaCEYC9l+TBHX3iqyh15YN4pt+kLWNP2unkmkYo+95s=; b=V5qjjYJgPUE+En4iqbdtip9LZOdcVS4L9ty/M+UJylGzgkI2zSxInrl7b2XL7/YeWk iz3MjmyFqJZc6azdnlb3jHuOChhOy2PuFK/NR88KVqsoN7vBJmXXxOAKUIOupRIt/OWt v/r1JDLIHecvZEouKgEWp7RRdVgyCoAiC5fKxcMSRjgC/R+3yiK84MQ+1ofw/soArP5R aKBiY2k6q3flcxFCld8fypPyexPwEXWz+jUSGcdmAAZwzQVHfkSW/GLpFjBn1GgZ9NNd 8tH/mu3zvzQ2avvp4Ari7AoMiEI+x6G3/HRO+d2NnftsX5NaKXPltmALf3tIwooiFdT3 Cv7g== X-Gm-Message-State: APjAAAXbRSeCUFKYSrhju3jqQcMYtr/Z7Dl16DKJHpl7xqQuC0/IPOvz tkK+p3k6cpY/hYilaxbcA4UBCu91 X-Google-Smtp-Source: APXvYqykYcaUVKmK9WwVRuwnpd0ZEuLM7N5ejEeVVAMmvLvg+xW+7GSfGISxXmBYA7vWz7tl7Rq6rQ== X-Received: by 2002:adf:9c8c:: with SMTP id d12mr54487677wre.404.1582389340569; Sat, 22 Feb 2020 08:35:40 -0800 (PST) Received: from gilles-Gazelle-Professional.home ([2a01:cb1d:9f:1100:893f:4b8a:e160:259f]) by smtp.gmail.com with ESMTPSA id i16sm9004179wrr.71.2020.02.22.08.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Feb 2020 08:35:39 -0800 (PST) From: Gilles Talis To: buildroot@buildroot.org Date: Sat, 22 Feb 2020 17:35:29 +0100 Message-Id: <20200222163530.17015-2-gilles.talis@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200222163530.17015-1-gilles.talis@gmail.com> References: <20200222163530.17015-1-gilles.talis@gmail.com> Subject: [Buildroot] [PATCH 2/3] package/libeXosip2: bump to version 5.1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gilles Talis MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Removed patch that was applied upstream - Removed AUTORECONF request that came with patch - Updated library's download name Signed-off-by: Gilles Talis --- ...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" - ---- -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__"