From patchwork Sat Sep 16 13:25:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 7183 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RnsJT2SBJz3wtx for ; Sat, 16 Sep 2023 13:26:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RnsJS0Y7Dzvy; Sat, 16 Sep 2023 13:26:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RnsJR6nb1z2y2X; Sat, 16 Sep 2023 13:25:59 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RnsJQ60sgz2xPL for ; Sat, 16 Sep 2023 13:25:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RnsJQ1mJZz8X; Sat, 16 Sep 2023 13:25:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1694870758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5PSTX+SyfUtpVL3nk8SrZ8OgyhsoikDpiX68dYmvr3Y=; b=7KI8UveUyQQBsPtSa6F/R5suiYBiyAjEGKEnJ/H1MXJVi5cmOtjyTzc60RzbE5Yzr/N8yp oq6/jwwyomwfMYCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1694870758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5PSTX+SyfUtpVL3nk8SrZ8OgyhsoikDpiX68dYmvr3Y=; b=WfrjI2mKm9yQ3KNDi8Yph1HsFUJtSV2c2qc8+c0MvjiF032CESYa7r5/oemjom5haa6UeR nCsDKa+9j7xh5bI6sCVYUyY58qWk7mgPORMeDITkNN7dKs8nrH5qTfb+Rlo6llVXs5fnWz Vria2EG+GW7AKCB+ynVMYD1oKN+/cl3L0WJrncFm1Pn3trS7j9MLVvB3LX3L8NxCyftIFQ p6Orf9gkMvlzynZicAmdqV2shHquuwbKwH/hWHWC345HquGxFd1N/a2lCM/OS04h2VC0lT oI110bghxWGaNUIx8tpftknm55ICq95VqmzztO7y5pa+EQhaIHtBFLUSl40YQA== From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 1/2] Update zlib to version 1.3 Date: Sat, 16 Sep 2023 13:25:47 +0000 Message-Id: <20230916132548.16420-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The workaround is not needed anymore. The files a placed correctly by itself. Signed-off-by: Jonatan Schlag --- zlib/zlib.nm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/zlib/zlib.nm b/zlib/zlib.nm index 476431328..1aea661c8 100644 --- a/zlib/zlib.nm +++ b/zlib/zlib.nm @@ -4,7 +4,7 @@ ############################################################################### name = zlib -version = 1.2.13 +version = 1.3 release = 1 groups = System/Libraries @@ -31,10 +31,6 @@ build make check end - install_cmds - mkdir -pv %{BUILDROOT}%{includedir} %{BUILDROOT}%{libdir} - cp -pfv zconf.h zlib.h %{BUILDROOT}%{includedir} - end end packages From patchwork Sat Sep 16 13:25:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 7184 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RnsJW3Zpwz3wtx for ; Sat, 16 Sep 2023 13:26:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RnsJV0kzMz1cD; Sat, 16 Sep 2023 13:26:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RnsJV0H6mz2yDy; Sat, 16 Sep 2023 13:26:02 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RnsJS6f8Pz2xPL for ; Sat, 16 Sep 2023 13:26:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RnsJS4pnqz1wp; Sat, 16 Sep 2023 13:26:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1694870760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LWMUpanJSYJQDdwyzdE+QN3WNyyl/XA0DsOFoXZvtaQ=; b=5C4zd4QqgSNeuqWF5l5Ai55h3BSZKwP3gcM+Wk+XvTgsv3qXu54E29pM9SZvYUQh08YvKd dmQvvvfcpJBL1lDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1694870760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LWMUpanJSYJQDdwyzdE+QN3WNyyl/XA0DsOFoXZvtaQ=; b=S8o30ws85V09HrncOtwL9wX4CMSaG/5V5cp9mHeF2J3iDPOlP2dq4mo1cmkBJGPRLOEbXl fwtATM8V/dbyQsDwrYwQeirDlaTbizEmklA7Grc+pQwyWZtC5aMDwo6m53OXNoSNEmRH+j hjIx/6mITPg/tbzUIGkk3aFl8B/3gHMGbz0mlIw70ElNmA53QLXKihhWAQM7XDvYi3WB63 HbIPP8/PtdFJbqRrlRIM9mUxc01QyJ5lEhegE62mnle1LY8fyuLc8yRHRW6tpsJsOdWimD rnfTZIoYgeETl3AP2M0eKbkq/1gf39OcmkqWPtaV4t07ySuO7s9w9ohohY6BOQ== From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 2/2] Update linux-firmware Date: Sat, 16 Sep 2023 13:25:48 +0000 Message-Id: <20230916132548.16420-2-jonatan.schlag@ipfire.org> In-Reply-To: <20230916132548.16420-1-jonatan.schlag@ipfire.org> References: <20230916132548.16420-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" When find returns nothing, chmod fails. So we when we get only blank lines, we do execute nothing (-r). Signed-off-by: Jonatan Schlag --- linux-firmware/linux-firmware.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index 53413eacf..5e0eba43e 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -4,7 +4,7 @@ ############################################################################### name = linux-firmware -version = 20221214 +version = 20230804 release = 1 maintainer = Arne Fitzenreiter @@ -34,7 +34,7 @@ build install_cmds # Remove executable bits from any files find %{BUILDROOT}%{firmwaredir} -type f \ - -executable -print | xargs chmod -v a-x + -executable -print | xargs -r chmod -v a-x end end