From patchwork Fri Jul 28 16:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 7031 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 4RCCWj6dqNz3wk0 for ; Fri, 28 Jul 2023 16:19:29 +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 4RCCWh6MTMz1gx; Fri, 28 Jul 2023 16:19:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RCCWh5wJPz2yV9; Fri, 28 Jul 2023 16:19:28 +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 4RCCWg48XVz2xHK for ; Fri, 28 Jul 2023 16:19:27 +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 4RCCWf1bLxz1ch; Fri, 28 Jul 2023 16:19:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1690561166; 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=wveNkNDBQH1FLHaaElBAZsIFDeNqzzl2FKdlEcoataw=; b=GJarbpHnl7tQPADAL2XjEujEcZcTCn9g/yXdsdXZOxDr11qMssgxGBD0er5F4EcdRoYhDi EitBzWFn1RY3U3BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1690561166; 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=wveNkNDBQH1FLHaaElBAZsIFDeNqzzl2FKdlEcoataw=; b=aA1JBlMV8TIBMY5IFTFXuIMJ3AezHC+a5ORo8oUfHPLWXqlf7jIxPyhFBSO/DiEiTT8a0N tj3iM5AE4PVXnkRwYcFAa9/xhgIx+gHS/Lu6+oMTyDy0L1rMHXkfQS2IYxKYA/dWPSzi3h gJK1lfZcz7qJ3rqZaxzxSfBaaAEclpvfU6OuJXImMjGf4BCY0e2urAA8PQlVYvYSKwTpw0 qPce0AnH+Z2to6KU8GgrBlHNw2mZmYRN8YTXeYhAk2us+yTR8egz9Y4fLWPf4x2RcU+Bsn yUsxfG0pfAYxkW8KDArF1zZO5NkLGv4tRfHiKXarxmPHi4z7QaEQ/W9hGuHUmw== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] core177: remove rngd if the addon was not installed via pakfire Date: Fri, 28 Jul 2023 18:19:16 +0200 Message-Id: <20230728161916.9839-1-arne_f@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: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" the old version is linked against the old openssl and will fail. fixes: #13197 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/177/update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/rootfiles/core/177/update.sh b/config/rootfiles/core/177/update.sh index 818079940..2347afbdb 100644 --- a/config/rootfiles/core/177/update.sh +++ b/config/rootfiles/core/177/update.sh @@ -97,6 +97,15 @@ rm -f \ /opt/pakfire/db/meta/meta-squidclamav \ /opt/pakfire/db/rootfiles/squidclamav +# remove old rngd if the addon is not installed +if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then + rm -rf /usr/bin/randstat \ + /usr/bin/rngtest \ + /usr/sbin/rngd \ + /etc/rc.d/init.d/rngd \ + /etc/rc.d/rc?.d/*rmgd +fi + # Extract files extract_files @@ -168,3 +177,4 @@ sync # Don't report the exitcode last command exit 0 +