From patchwork Mon Aug 15 17:17:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5864 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M61FP2RH1z3wfK for ; Mon, 15 Aug 2022 17:18: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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M61FL3xt6z5XF; Mon, 15 Aug 2022 17:17:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M61FL2kQmz2yyR; Mon, 15 Aug 2022 17:17:58 +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 4M61FK6nTyz2xGX for ; Mon, 15 Aug 2022 17:17:57 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M61FK3Sr8z2Dj; Mon, 15 Aug 2022 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660583877; 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=GIVeyUpms5bWty0rF3oDYnFqAIWDV1NSJcNg+p9rJzU=; b=bS42zAnKgS69tYr6SFPguFpnBy8JKBTFEJ6TQpLB51iDwXXtjRBt2uTL5+Pwc9URncuNsB hwSPeJu+16T/W5EbzzbX6EjVN9cWlLG09C8qu6bfkHFY4h3vLl/q4oWmgq7PXcYZgyEM8/ r/TfQXQWt8bjbrs1Mk8NNnf/Oy5WvDQAXXGQVwn3AQ+1BVsLoWlt3ovBLAQ/wm5SDOFW08 cQuedD/Ru28ZrjYHS2Mq66AByU3eBYPwWkASnWeYdy4zZMo7ohhqPyALDIB/GNCG8VoYLH aQPOrkY1SJ9JmK59yE8cm/mkvqGRnQsK6G+TySmvp9PEUExwDcaqEKz6NAjA0g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660583877; 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=GIVeyUpms5bWty0rF3oDYnFqAIWDV1NSJcNg+p9rJzU=; b=mZyVZnGTRXs2YgvNu1D57nIQ5ZNfAwKZ9zf7Ytv34+/nJk/e1QAwLJpQ630sYIvUzR5oRL JbAKaQf9Rz9vcEDg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Date: Mon, 15 Aug 2022 17:17:39 +0000 Message-Id: <20220815171753.1858688-1-michael.tremer@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: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/sysvinit | 1 + src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch diff --git a/lfs/sysvinit b/lfs/sysvinit index 0126b283e..ec0a5c292 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Newer C libraries omit this include from sys/types.h. # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include \n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile diff --git a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch new file mode 100644 index 000000000..ee6f621b5 --- /dev/null +++ b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch @@ -0,0 +1,10 @@ +--- sysvinit-3.00/src/sulogin.c~ 2022-08-09 09:43:41.993484098 +0000 ++++ sysvinit-3.00/src/sulogin.c 2022-08-09 09:45:04.897252500 +0000 +@@ -51,7 +51,6 @@ + #ifdef __linux__ + # include + # include +-# include + # include + # include + # ifndef TMPFS_MAGIC