From patchwork Mon Oct 14 08:40:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Morgado X-Patchwork-Id: 1176077 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=aleksander.es Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aleksander-es.20150623.gappssmtp.com header.i=@aleksander-es.20150623.gappssmtp.com header.b="RJgs63RS"; 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 46sBxj5kjyz9sPc for ; Mon, 14 Oct 2019 19:46:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AED64869E6; Mon, 14 Oct 2019 08:46:43 +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 cxhYwsSc3pgP; Mon, 14 Oct 2019 08:46:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 70E078671B; Mon, 14 Oct 2019 08:46:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 811A81BF20F for ; Mon, 14 Oct 2019 08:46:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7DFB885F74 for ; Mon, 14 Oct 2019 08:46:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IxkkMnqywR6w for ; Mon, 14 Oct 2019 08:46:36 +0000 (UTC) X-Greylist: delayed 00:05:37 by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1EC5885F72 for ; Mon, 14 Oct 2019 08:46:36 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id p7so16308557wmp.4 for ; Mon, 14 Oct 2019 01:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aleksander-es.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LtTDJjXwv39snLVU40iPOFJIHFmvKmOMLsPXorGgnC8=; b=RJgs63RSfh4sxKpBlAbDOGWOSy7OydMbuV2o4iN6aADoymgr1q8zWibzM6yWEcBuT7 QVHkBUWzzYQ2TFSUbR1MMPBmlFE/54KqPrRJeGByrtMS6m+4WPDHEAIc0h+D8Cn1xa2Q 9GNXJaF7LPc/tVM4QFiykL62aqx0wf1nJjkydQ5udKdRhXhzWmSWxc8hnoONLcHWZ/rz LH4wtjTtfvaXsDrvxGg4ajzWDfNr7KLbRAsRgTIhFO5GGbyRKz5hJms8d+7rD6p/uze6 i/PLqq/nESTIdKHqdhxJEvpwx9nB965L827vSaXpHwTsv+jFE/DAmnwz9dmHiSi+oZx2 WMFw== 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:mime-version :content-transfer-encoding; bh=LtTDJjXwv39snLVU40iPOFJIHFmvKmOMLsPXorGgnC8=; b=hCDI2z1tXCBQbyXtC08U6kadvPcQiHq3SCY3OVzx9hMhTFGxN3SEhuSKmlQ4KDxfyk ycIXdfbFLWXlMOYkPT+0qa9fCoHgw544hqhtc0bhNejWUWO0W2pC1XcNvcSUaz+BaLGA vQg32z4XxIgJgzpCUW//72QddkWkFwhrTJZ4c1j0JIhBU9RixbdpfUTybW/XhCg4rAFb qPQ/j7QWO0IAqHn7gmYy+HqbmC9HkMdPvR5hMFDMmuKPZpd3/mzf7f+zuPWSkc0b5F0t W0EhxCtK/TIxAW8EmJwwTDbOONog5qTufgvDvPJydU/E6s56nRQPslNpDvQYz0El2pfa eVfA== X-Gm-Message-State: APjAAAXHzQgLRcQi4BRCDItNZCbBVSQDKhJ4sFQs1tD3uByvRx4ooUTv Uyxa4xydyIj78sb4G8OYGE6ciDHFcSc= X-Google-Smtp-Source: APXvYqw5NAF3PkSQwQF2H5mgAvBeAaPpR/0+g7P1r/6nYmhrNj9itvMEJ6F3nYaP5k8iDvW8EghdcA== X-Received: by 2002:a1c:f305:: with SMTP id q5mr14057707wmq.137.1571042457136; Mon, 14 Oct 2019 01:40:57 -0700 (PDT) Received: from ares.lan (135.red-83-58-181.dynamicip.rima-tde.net. [83.58.181.135]) by smtp.gmail.com with ESMTPSA id c4sm18448338wru.31.2019.10.14.01.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 01:40:56 -0700 (PDT) From: Aleksander Morgado To: buildroot@buildroot.org Date: Mon, 14 Oct 2019 10:40:52 +0200 Message-Id: <20191014084052.467808-1-aleksander@aleksander.es> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/libqmi: bump to version 1.24.0 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: Aleksander Morgado Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also drop the musl compat patch as it was already included upstream. Signed-off-by: Aleksander Morgado --- ...1-musl-compat-canonicalize_file_name.patch | 61 ------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 4 +- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 package/libqmi/0001-musl-compat-canonicalize_file_name.patch diff --git a/package/libqmi/0001-musl-compat-canonicalize_file_name.patch b/package/libqmi/0001-musl-compat-canonicalize_file_name.patch deleted file mode 100644 index 3ae1c2eb47..0000000000 --- a/package/libqmi/0001-musl-compat-canonicalize_file_name.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8f6181b6f8dd82aa1ab1288cc7f2fd05d4a2519f Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 1 May 2017 19:55:07 -0500 -Subject: [PATCH] musl compat canonicalize_file_name() - -Adds an equivalent of canonicalize_file_name -using realpath(). - -Bug report (origin of this patch): -https://bugs.freedesktop.org/show_bug.cgi?id=99944 - -Bug report has been updated with suggestion to not use inline. - -Signed-off-by: Matthew Weber ---- - configure.ac | 2 ++ - src/libqmi-glib/qmi-utils.c | 15 +++++++++++++++ - 2 files changed, 17 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c56fa3e..d835db4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,6 +80,8 @@ AC_SUBST(GLIB_LIBS) - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - AC_SUBST(GLIB_MKENUMS) - -+AC_CHECK_FUNCS([canonicalize_file_name]) -+ - dnl qmi-firmware-update is optional, enabled by default - AC_ARG_ENABLE([firmware-update], - AS_HELP_STRING([--enable-firmware-update], -diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c -index 29e5f22..26aff9e 100644 ---- a/src/libqmi-glib/qmi-utils.c -+++ b/src/libqmi-glib/qmi-utils.c -@@ -34,6 +34,21 @@ - #include "qmi-utils.h" - #include "qmi-error-types.h" - -+#ifndef HAVE_CANONICALIZE_FILE_NAME -+#include -+static char * canonicalize_file_name(const char *path) -+{ -+ char buf[PATH_MAX] = { }; -+ -+ snprintf(buf, sizeof(buf) - 1, "%s", path); -+ -+ if (!realpath(path, buf)) -+ return NULL; -+ -+ return strdup(buf); -+} -+#endif -+ - /** - * SECTION:qmi-utils - * @title: Common utilities --- -1.9.1 - diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index ca3c747739..b0a703f3bd 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 755bbea2a330ac16d56678fbcdd09201ddb14779059ecc895edfac388551d5de libqmi-1.22.6.tar.xz +sha256 aeb69f90c273467cce246176cba0967c6413f1995a976992770a597c4fe28c79 libqmi-1.24.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 78e7b4bea9..62aa176e4f 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBQMI_VERSION = 1.22.6 +LIBQMI_VERSION = 1.24.0 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB LIBQMI_INSTALL_STAGING = YES -# 0001-musl-compat-canonicalize_file_name.patch -LIBQMI_AUTORECONF = YES LIBQMI_DEPENDENCIES = libglib2