From patchwork Mon Aug 15 17:17:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5870 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 4M61FX4q0mz3wfP for ; Mon, 15 Aug 2022 17:18:08 +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 4M61FQ4tYbz5Xr; Mon, 15 Aug 2022 17:18:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M61FQ099Pz330Q; Mon, 15 Aug 2022 17:18: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 4M61FN4K07z2yyB for ; Mon, 15 Aug 2022 17:18: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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M61FM2GQ3z5XD; Mon, 15 Aug 2022 17:17:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660583879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/z4GoRKri87P9R1KEv4+SSB6APZomZaTVOh14nEd5ps=; b=Uhfn57fniel4hn08lS5MQ9tzuQC59tqVZ0daChR0H3Dm4rrKGcpfErqCB2l3P0PjQzc65M OohlkPa5OR4yYoDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660583879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/z4GoRKri87P9R1KEv4+SSB6APZomZaTVOh14nEd5ps=; b=RavkVxk/lTkKje/X7Zx71AAMIyvIWZP6NynGMlBWtpiFYbp2oeKjjPS8utKqkLCs+M85gj KGb17fSEdQxrepU7VfJBJBIBKjdXqrkrX6TK61t0SLh8oiTKReou5IsU9gqwFYKgoMk4mp X7RVMb+KaQeRIKbg0nAsiEfqtYsdtfe0eAAegtdM+8/af07EXIo5q2ls8HEa7/ufuIntpi lddDzSJNKF7oWqTEBbPtxGdIX/hCumJc5Q39Iy6pJCeng4kpZGfJ2Bpm3hwPPPmd5n4kP/ oygG9s4LJ9oIBVF3GwgZJ2Ymw8Z+3chtf4d1JZ+c4hQD0feEtRQ0273pj4T/Gg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/15] samba: Fix build with glibc 2.36 Date: Mon, 15 Aug 2022 17:17:47 +0000 Message-Id: <20220815171753.1858688-9-michael.tremer@ipfire.org> In-Reply-To: <20220815171753.1858688-1-michael.tremer@ipfire.org> References: <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/samba | 1 + src/patches/samba-4.16.4-glibc-headers.patch | 62 ++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 src/patches/samba-4.16.4-glibc-headers.patch diff --git a/lfs/samba b/lfs/samba index 87d192492..d64d0e2d4 100644 --- a/lfs/samba +++ b/lfs/samba @@ -80,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba-4.16.4-glibc-headers.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --libdir=/usr/lib/ \ diff --git a/src/patches/samba-4.16.4-glibc-headers.patch b/src/patches/samba-4.16.4-glibc-headers.patch new file mode 100644 index 000000000..8c75a4172 --- /dev/null +++ b/src/patches/samba-4.16.4-glibc-headers.patch @@ -0,0 +1,62 @@ +From 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Tue, 2 Aug 2022 07:55:46 +0200 +Subject: [PATCH] lib:replace: Only include on non-Linux systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Details at: +https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 + +Signed-off-by: Andreas Schneider +Reviewed-by: Ralph Boehme + +Autobuild-User(master): Ralph Böhme +Autobuild-Date(master): Tue Aug 2 11:05:14 UTC 2022 on sn-devel-184 +--- + lib/replace/system/filesys.h | 4 +++- + lib/replace/wscript | 3 +++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h +index 034e5d5886c..bb9482c69af 100644 +--- a/lib/replace/system/filesys.h ++++ b/lib/replace/system/filesys.h +@@ -36,7 +36,8 @@ + #include + #endif + +-#ifdef HAVE_SYS_MOUNT_H ++/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */ ++#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H) + #include + #endif + +@@ -44,6 +45,7 @@ + #include + #endif + ++/* This include is required on Linux for statfs() */ + #ifdef HAVE_SYS_VFS_H + #include + #endif +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 4c774d9f0c3..dd9b19219a1 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -31,6 +31,9 @@ def configure(conf): + + conf.env.standalone_replace = conf.IN_LAUNCH_DIR() + ++ if sys.platform.rfind('linux') > -1: ++ conf.DEFINE('LINUX', '1') ++ + conf.DEFINE('BOOL_DEFINED', 1) + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) +-- +2.30.2 +