From patchwork Sat Aug 31 10:23:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1156150 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46LC9K6mB1z9s5b for ; Sat, 31 Aug 2019 20:23:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1145285E47; Sat, 31 Aug 2019 10:23:15 +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 KbXKMjw3B-r9; Sat, 31 Aug 2019 10:23:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4EB9286FFF; Sat, 31 Aug 2019 10:23:14 +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 8E3761BF42E for ; Sat, 31 Aug 2019 10:23:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8897E86FFF for ; Sat, 31 Aug 2019 10:23:13 +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 XSvEnhS8pqsb for ; Sat, 31 Aug 2019 10:23:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F339385E47 for ; Sat, 31 Aug 2019 10:23:11 +0000 (UTC) Received: from fwd19.aul.t-online.de (fwd19.aul.t-online.de [172.20.27.65]) by mailout02.t-online.de (Postfix) with SMTP id A66564184466; Sat, 31 Aug 2019 12:23:09 +0200 (CEST) Received: from fli4l.lan.fli4l (rATcm4ZT8hkU9ZhyL2hMUa+0n3IQ3Zgmzef9ImijZNOr4qi40KHkS7Bl+5AgExnw24@[84.161.180.71]) by fwd19.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1i40X8-0oneBU0; Sat, 31 Aug 2019 12:23:02 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54612) by fli4l.lan.fli4l with esmtp (Exim 4.92.1) (envelope-from ) id 1i40X7-00060r-LF; Sat, 31 Aug 2019 12:23:02 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 31 Aug 2019 12:23:00 +0200 Message-Id: <20190831102300.15528-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: rATcm4ZT8hkU9ZhyL2hMUa+0n3IQ3Zgmzef9ImijZNOr4qi40KHkS7Bl+5AgExnw24 X-TOI-MSGID: 86869bdf-5959-4e45-b4c7-b3c50d7cb17c Subject: [Buildroot] [PATCH/next 1/1] package/libcgi: bump version to 1.3.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: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed patches applied upstream: https://github.com/rafaelsteil/libcgi/commit/d7cf836905ab8a46034295023a1a5677dd4c7ce5 https://github.com/rafaelsteil/libcgi/commit/58edd5089011f7d9846e9336670f90d135d1c580 Added upstream-provided md5 hash. Upstream moved and renamed license file COPYING and added MIT license file: https://github.com/rafaelsteil/libcgi/commit/86e88b4b050fa5db1a5062e74429170e49dbde5a Signed-off-by: Bernd Kuhls Acked-by: Alexander Dahl --- .../0001-CMakeLists.txt-libcgi-is-in-C.patch | 32 -------------- ...on-t-force-the-build-of-a-shared-lib.patch | 44 ------------------- package/libcgi/libcgi.hash | 9 ++-- package/libcgi/libcgi.mk | 6 +-- 4 files changed, 9 insertions(+), 82 deletions(-) delete mode 100644 package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch delete mode 100644 package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch diff --git a/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch b/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch deleted file mode 100644 index 682bfe5d52..0000000000 --- a/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 043f7a470e32c036f0fe933ec5cd2003087d6b2e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 2 Sep 2017 23:50:42 +0200 -Subject: [PATCH] CMakeLists.txt: libcgi is in C - -By default, CMake checks that both C and C++ compilers are -available. However, since libcgi is only C, there's no need for a C++ -compiler check. Therefore, this commit adjusts the project() variable -definition to only require C language support. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/38 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f98a99d..c599ca9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - cmake_minimum_required(VERSION 2.8.8) - --project(cgi) -+project(cgi C) - string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) - string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LC) - set(LIBPREFIX ${PROJECT_NAME}) --- -2.13.5 - diff --git a/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch deleted file mode 100644 index ebf91b0a62..0000000000 --- a/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9bb9d67da0e4faf4bb3a47786dee127e66a49ed0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 3 Sep 2017 15:22:30 +0200 -Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library - -Building a shared library doesn't work on all platforms, so instead, -let CMake rely on the standard BUILD_SHARED_LIBS variable to decide -whether a static or shared library should be built. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/39 ---- - src/CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f32d22e..3bde408 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,17 +23,18 @@ set(CGI_SRC - ) - - # create binary --add_library(${PROJECT_NAME}-shared SHARED ${CGI_SRC}) --set_target_properties(${PROJECT_NAME}-shared PROPERTIES -+add_library(${PROJECT_NAME} ${CGI_SRC}) -+set_target_properties(${PROJECT_NAME} PROPERTIES - OUTPUT_NAME ${PROJECT_NAME} - SOVERSION ${PROJECT_VERSION_MAJOR} - VERSION ${PROJECT_VERSION} - ) - - # install binary --install(TARGETS ${PROJECT_NAME}-shared -+install(TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}-targets - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) - - # install cmake targets --- -2.13.5 - diff --git a/package/libcgi/libcgi.hash b/package/libcgi/libcgi.hash index f071cc0aea..8760f91cf5 100644 --- a/package/libcgi/libcgi.hash +++ b/package/libcgi/libcgi.hash @@ -1,5 +1,8 @@ -# From https://github.com/rafaelsteil/libcgi/releases/download/v1.1/libcgi-1.1.tar.gz.sha256sum -sha256 128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6 libcgi-1.1.tar.gz +# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.md5 +md5 6efdc968bdf986832b7e220d1b914e57 libcgi-1.3.0.tar.gz +# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.sha256 +sha256 d932f380b1a5dbfbddffaa76fac71bf505a9585d441c9ae86bfbf76033d9d8df libcgi-1.3.0.tar.gz # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1.txt +sha256 f32c31e26ec840753a8cd47cd2681e48be4cee853212d16a4b1d85ac4d677669 LICENSES/MIT.txt diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index d1e403fdf1..22163310d3 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBCGI_VERSION = 1.1 +LIBCGI_VERSION = 1.3.0 LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION) LIBCGI_INSTALL_STAGING = YES -LIBCGI_LICENSE = LGPL-2.1+ -LIBCGI_LICENSE_FILES = COPYING +LIBCGI_LICENSE = LGPL-2.1+, MIT (base64.c) +LIBCGI_LICENSE_FILES = LICENSES/LGPL-2.1.txt LICENSES/MIT.txt $(eval $(cmake-package))