From patchwork Mon Jun 7 02:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianhui zhao X-Patchwork-Id: 1488380 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.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=fkFgK0HA; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FyyNK1FzZz9sPf for ; Mon, 7 Jun 2021 12:43:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6464740341; Mon, 7 Jun 2021 02:43:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mWHIixBlN8qM; Mon, 7 Jun 2021 02:43:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id F372D40342; Mon, 7 Jun 2021 02:43:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1169F1BF370 for ; Mon, 7 Jun 2021 02:42:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F2E428367C for ; Mon, 7 Jun 2021 02:42:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S7bazkR9G-yw for ; Mon, 7 Jun 2021 02:42:51 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0980E834BA for ; Mon, 7 Jun 2021 02:42:50 +0000 (UTC) Received: by mail-pf1-x42d.google.com with SMTP id z26so11990839pfj.5 for ; Sun, 06 Jun 2021 19:42:50 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=IIgil2CreScMGyMXn23T0UNX18QsS6EgFSrn/iQ5Bmc=; b=fkFgK0HAvGtOBBS4XQDZHaiIHVna8bUhP5k1LHP0G5yGSKvVgBsZJNZyvP/f/n6opY Zs1urDv3hifAR+KUAyFTZq4MwtMCU8hA/zKP3quBMLSAX+Z+tNzghBYlYyM82oGyDRi+ Vcy+GjyYl6n/Kzto2/aIjXDGGIZFcPw1W5lMzzA1a+rdUqyiEsb6F5Mt3/3HbihTTPTo VQYc3ExaGl8BVIAFTI6BhYSqaGPpwbfH9nRSCfGmWIQKX6F31k0WxBGB0BvetGUpeDJz Oqo0JrlJCJrvbPJE5ptgUKugev5KnwrpifzaU0o4Fm6OJ199Y6QR1/pnloUr7aFGkwPY hHrw== 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:mime-version:content-transfer-encoding; bh=IIgil2CreScMGyMXn23T0UNX18QsS6EgFSrn/iQ5Bmc=; b=rGYSlL5nO4ocmeh2ugr8YRicHPzJpKwXi8TO7vgpbUruKYbJMZmNfE7FSnU4e0xmXp Fz8X4N7ww31hPSKvde0ePQxzXCdDZ5RXHQFlKvT8MRxSgMnNEhm074Uo/4oobWNrIHoh btq5QHMylWnXEC10M2THLWLc8i67Jb1129yxGonb2idxaac9vji1kDL4jiOwPKFLYiie /Zqd2UCW02cMPiZeGJb3q1lxyJvY8w3vN6BaOK9fnwm1wDYxnlv45Ib8iax5wZlZSAFr 0A9QxoV5uH0gAooYGwZsQ+RZpeJPjG1rSyf2Va8dV7bPyK37xSs2v7XEETbzdI77Hrpm 6IaQ== X-Gm-Message-State: AOAM532yfAfnKUDE4FCLJ88+c6LO9N3JukXX3RFPNedoj3pTBrjOiazk Y2BEgv3OHJOqZBuyHbw65NgQtFBHEQTTF9S+czc= X-Google-Smtp-Source: ABdhPJy7mDIcombg6/Go22PVHvJwMwO8EQ7nc0oNDqzhqk5K4OPKasOvx7kLZkU4niv2k5NYiyfE5A== X-Received: by 2002:a05:6a00:124d:b029:2e9:e07c:f290 with SMTP id u13-20020a056a00124db02902e9e07cf290mr15206125pfi.25.1623033770065; Sun, 06 Jun 2021 19:42:50 -0700 (PDT) Received: from localhost ([103.138.53.42]) by smtp.gmail.com with ESMTPSA id a4sm10015716pjw.46.2021.06.06.19.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 19:42:49 -0700 (PDT) From: Jianhui Zhao To: buildroot@buildroot.org Date: Mon, 7 Jun 2021 10:42:39 +0800 Message-Id: <20210607024239.2657720-2-zhaojh329@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210607024239.2657720-1-zhaojh329@gmail.com> References: <20210607024239.2657720-1-zhaojh329@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.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: Jianhui Zhao Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jianhui Zhao --- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 27 ++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 4b0b5027c6..98bd6e513b 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz +sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 326c78face..782e04a257 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.10.1 +LIBUHTTPD_VERSION = 3.12.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE @@ -13,34 +13,19 @@ LIBUHTTPD_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUHTTPD_DEPENDENCIES += openssl -LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=OFF \ - -DUHTTPD_USE_OPENSSL=ON \ - -DUHTTPD_USE_WOLFSSL=OFF +LIBUHTTPD_CONF_OPTS += -DUSE_OPENSSL=ON else ifeq ($(BR2_PACKAGE_WOLFSSL),y) LIBUHTTPD_DEPENDENCIES += wolfssl -LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=OFF \ - -DUHTTPD_USE_OPENSSL=OFF \ - -DUHTTPD_USE_WOLFSSL=ON +LIBUHTTPD_CONF_OPTS += -DUSE_WOLFSSL=ON else ifeq ($(BR2_PACKAGE_MBEDTLS),y) LIBUHTTPD_DEPENDENCIES += mbedtls -LIBUHTTPD_CONF_OPTS += \ - -DUHTTPD_SSL_SUPPORT=ON \ - -DUHTTPD_USE_MBEDTLS=ON \ - -DUHTTPD_USE_OPENSSL=OFF \ - -DUHTTPD_USE_WOLFSSL=OFF +LIBUHTTPD_CONF_OPTS += -DUSE_MBEDTLS=ON else -LIBUHTTPD_CONF_OPTS += -DUHTTPD_SSL_SUPPORT=OFF +LIBUHTTPD_CONF_OPTS += -DSSL_SUPPORT=OFF endif -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=ON endif $(eval $(cmake-package))