From patchwork Mon Aug 24 21:43:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1350703 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Z4rpQZfn; 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=ox1+S56f; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Bb5KH4Dksz9sR4 for ; Tue, 25 Aug 2020 07:45:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=tsvDtCL/l3Ow7OL4D/lr3YORHJKCZUOPdxXXU/CUu0A=; b=Z4rpQZfnXFdXeIZTj83JmNuVn2 5FIW69ER41gzbpBppsnSgVnhKZKJRli7/VQGxRJVj2zP6FsPplk1gVcT70lv3dgsjAqt9hBAN7Ema HJW5kc/0AbAPOmMVfeeqTdUrmVY7pjK3eJTw4NwI2uSpFqLJRrA7tF04yrmFt/geqRLa2VqzTvUk1 SbwZGxs1u50B31CdmDi8GzmaGowD9e1MAL0oTiRFqRDzqIdss9n/s+qqiykbjfYlBvhQzDTAkl0Cw yRwHRLwFszBV34djLKCmMMk82uA44j0LN8eV47/lXtDqSMNfBRgqqo1zkH9OBCQSyMkJO1wcCtjao 8n3j8Zkg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAKFg-0000lJ-4A; Mon, 24 Aug 2020 21:43:40 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAKFa-0000jk-DD for openwrt-devel@lists.openwrt.org; Mon, 24 Aug 2020 21:43:37 +0000 Received: by mail-pf1-x444.google.com with SMTP id u20so5665129pfn.0 for ; Mon, 24 Aug 2020 14:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=p/JvWPJ4dLC08rW8mH0nzb+cgW0qmVGH/nr2rcIHvvs=; b=ox1+S56f3aA8Htg7IqIve1L+xLP2OCkdXwc8wEQSsZQZg1OP8KaJw5Enxt3MzhX44I oVt1JQpuopOmF1x3KNq7yUvd4FVeWe+8qXNwzLUHWFCMraK50pPQ/4qNTGGio72rBCGF Benfek0Skyor01ZhDt1XwmYwTVnz0lJerBKUSp/eKylZTgIVo/a3bu2llB47OxL/WEKn 4TNaGW3qM1AAt1pTCEWNzDumeN45A6bTnHq3U2K4UtVf750lgaV9pJGJs8J26aZ1P25N 6CD38j8+X+K8rPNKFscx3r51zCC7dcpZlHee67UA821lOwp9zDP906NTKqCLHZKavVzV SNjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=p/JvWPJ4dLC08rW8mH0nzb+cgW0qmVGH/nr2rcIHvvs=; b=DEoaYPGCZgXfTrFZNOJjNikW5RQxSYfY3uZq73CkElUo4Ib7CvhR0Ng5nR686CYsau BYw2dfpUDfZ4aCZrts6ZXYBZGA/4cduwUR3jhlUlHbTXorKuwRogahUaYEjjjxUR/Ykm 4c4uncfC7bDrTe1ITcwBOaMQfqCvTfQLqLndrYi8NE7y64FJQEDsQmbCXfyl9W5ZHRKX iycDVFZBvsdacXX+HC8TSS3V7O2cL/oMpflffOP+Za/Bs3rG8+Jra5oibWVCtzQ5xl67 9kbTPIG8Zms8xxBt0mSQbI2MvGSpmlD+STXKSq3l++4kXpOgFCh5LxPn5dt+3N4F1QXM 822w== X-Gm-Message-State: AOAM531VLUMX6sOLznCIQvcTH3vEgBpTqVAyjMFNQQoBT6ENC6La7Ltl TtCKVDn/B9ThCOgqt6JnuM1sXXMUQHA= X-Google-Smtp-Source: ABdhPJx38MQVYhMprIoWMkiyUVXQ/DykO86AdMbiUBCoFwWyDnsmU+epxWUZyeiCTsDvqdhqbCwPLQ== X-Received: by 2002:a63:2a89:: with SMTP id q131mr4555553pgq.330.1598305411688; Mon, 24 Aug 2020 14:43:31 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id n3sm12646426pfq.131.2020.08.24.14.43.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 14:43:31 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] util-linux: update to 2.36 Date: Mon, 24 Aug 2020 14:43:30 -0700 Message-Id: <20200824214330.763431-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_174334_628400_CC631682 X-CRM114-Status: GOOD ( 17.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org hwclock was fixed to work with musl. Unfortunately, the fix breaks under musl 1.2.x. Backported patch to fix that. Add libblkid DEPENDS to blkdiscard. Seems to be needed now. Signed-off-by: Rosen Penev --- package/utils/util-linux/Makefile | 9 +++--- .../patches/003-fix_pkgconfig_files.patch | 2 +- .../util-linux/patches/200-musl-1.2.x.patch | 28 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 package/utils/util-linux/patches/200-musl-1.2.x.patch diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 3953d83238..185526b97e 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.35.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.36 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.35 -PKG_HASH:=d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36 +PKG_HASH:=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0 @@ -125,6 +125,7 @@ endef define Package/blkdiscard $(call Package/util-linux/Default) TITLE:=discard sectors on a device + DEPENDS+= +libblkid SUBMENU=Disc endef diff --git a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch index c4afdb1b6e..3f97eaf737 100644 --- a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch +++ b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch @@ -10,7 +10,7 @@ endif # BUILD_LIBUUID --- a/configure.ac +++ b/configure.ac -@@ -2496,18 +2496,23 @@ AC_CONFIG_HEADERS([config.h]) +@@ -2586,18 +2586,23 @@ AC_CONFIG_HEADERS([config.h]) # AC_CONFIG_FILES([ Makefile diff --git a/package/utils/util-linux/patches/200-musl-1.2.x.patch b/package/utils/util-linux/patches/200-musl-1.2.x.patch new file mode 100644 index 0000000000..d840f7af3d --- /dev/null +++ b/package/utils/util-linux/patches/200-musl-1.2.x.patch @@ -0,0 +1,28 @@ +From 69e4fbfbfd9c42af508954d9fb985c5c7b657784 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 11 Aug 2020 11:02:31 +0200 +Subject: [PATCH] hwclock: add fallback if SYS_settimeofday does not exist + +It seems Musl-C removes SYS_settimeofday macro at all. + +Addresses: https://github.com/karelzak/util-linux/commit/9c6139a72017cecb9145e46102152cb4f456ada6#commitcomment-41290951 +Signed-off-by: Karel Zak +--- + sys-utils/hwclock.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index ac4f9c753..ac74549d7 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -675,6 +675,10 @@ display_time(struct timeval hwctime) + */ + #define __set_time(_tv) settimeofday(_tv, NULL) + ++#if !defined(SYS_settimeofday) && defined(__NR_settimeofday) ++# define SYS_settimeofday __NR_settimeofday ++#endif ++ + static inline int __set_timezone(const struct timezone *tz) + { + #ifdef SYS_settimeofday