From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YEQfN1wFaV+HIwAA0tVLHw (envelope-from ) for ; Mon, 21 Sep 2020 19:56:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mJQ2M1wFaV96BQAAbx9fmQ (envelope-from ) for ; Mon, 21 Sep 2020 19:56:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3EC729402AD for ; Mon, 21 Sep 2020 19:56:12 +0000 (UTC) Received: from localhost ([::1]:43502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKRv0-0000bl-Qh for larch@yhetil.org; Mon, 21 Sep 2020 15:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKRkF-0003QW-6q for guix-patches@gnu.org; Mon, 21 Sep 2020 15:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kKRkD-0000Dk-Ts for guix-patches@gnu.org; Mon, 21 Sep 2020 15:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kKRkD-0002VL-NN for guix-patches@gnu.org; Mon, 21 Sep 2020 15:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43554] [PATCH] gnu: samba: Fix fcntl hint detection in configure script. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Sep 2020 19:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43554@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16007174969600 (code B ref -1); Mon, 21 Sep 2020 19:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Sep 2020 19:44:56 +0000 Received: from localhost ([127.0.0.1]:56392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKRk4-0002Ui-SP for submit@debbugs.gnu.org; Mon, 21 Sep 2020 15:44:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:54484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKRjz-0002UW-FW for submit@debbugs.gnu.org; Mon, 21 Sep 2020 15:44:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKRjz-0003Jl-38 for guix-patches@gnu.org; Mon, 21 Sep 2020 15:44:47 -0400 Received: from mout.gmx.net ([212.227.15.19]:53889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKRjt-0000BC-SV for guix-patches@gnu.org; Mon, 21 Sep 2020 15:44:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600717479; bh=5V8NdsAOj/bto8vtt6TJjKS8iFi3KGzMQyqSHqzyNDQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=MLlc87AeICLmBKJlAmBtPAFtLslAZ+Ee0m1tOc1+sqLZ6IAlUs8ua85snRW6tpVxY KdMvFV8Mx3iH6tJjRhRBeZxETQPdN21hT9ZI7fjxSAVgUOjurc1uzpaCkXs2h13Ab+ m9VyvP9A9R+Ca2qkO+b2zTYdXrM1RVosA5Rh9k5E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1Mr9Bk-1kr5KD2iTG-00oHZ5 for ; Mon, 21 Sep 2020 21:44:39 +0200 User-agent: mu4e 1.4.13; emacs 27.1 From: Pierre Langlois Date: Mon, 21 Sep 2020 20:44:38 +0100 Message-ID: <87k0wmvrrt.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:ZBlNkXdLKySNlel3Tc4SIvDz8q9kr+HZUZRVGysauXwdhJFertf At/O+GppDbhz595r1ON70KEeFllRGS5PFRnxsQHb/tWW/DZiTqQKjdpvIAvKeqbVAnTylbN f0htDLq6hDuYRc896wX5nbuN6DxBRbsmM79VQLZpldW7aJQJ6QflxBut/BB8sun2XrdCihl E53Mh17q7mf5vApwvUt/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:RKn9ChXRX9s=:tQFm4+Ejtd+kJTWhJL2HU5 fVumDBtLP7uUK8poy+zR8Cd3vTuGhhjmIaAAHrP/zdgUF8Tc890p0dTNuhfa82rAapfcWXUqp LO887hlllbNp4DQG9H4D2dZavnPAkbqwP744aot22sENkroa9IFz7Qdd4WD8nj71TJaeS7CFz vQpZeNOxQzoHtI3RvDuuoixdefOjywM2HEhAzICnnD5TJrnXUhSi8qtk78SO2WWW2tSouQMMO pHiDNb7accXsegc4+lhk60d2yN1xICVstVRFLjACzJiJJRg1n+CJ0grB4idx2hgfoQADIDgGA dXGzqMagKRDyDwk4O2a2/e1I/9TMzYYoOYeweDVeqePziWCIRikw8sCIqyDFT+kmc5Nk4b9Lm jjABPojGEUuo4O0TWiZclE7a02hsL6d7toN6PLEviVwqFpSWKhL6LUe9xA/bLp1SY35l9Q+ju BjqnXnyDh9guOxiD/omX0q8wLaR0pzaqhOmWcnWr7xZuio9oqdw9FqLbpzhDs2wN9T4TKuiO4 neGzpZEjKBcUniTBvLsMYluPDUznfAAPDva/cbBQDUSm4nO55E+wXcHOsoMcIhBMIveYi6QQ5 F48SbgcbSm7P1IdaKBKCmuxSKDFZwp+NO2w7V80+Z3fylrS+HaYHWM/1XJ05CdSGWIqzjiEWG 3RmmwV1dVen5PpPgfUbIAUHFSCn0SzB1/5W8hdZeFKWqVhAJ4RmuKAPN3GFEK+ezRw01/TcX3 tS5Otdnpkk5Bhxf8IqGEhW30MDaU+7FUg1/dfLrbpVGUjmwhMPUPI1RJ2Q33A1X6+1sOVaVeU R6xICOeocBuqcZNvgwTQeHd/BURR0KQ4/p3iCS76RfiO/QXQuUPqz2atCznm+LxZAKllxctK7 BURX6YOT/ob4Fip0lOOsYjlVTPbtNCjYFLI4U2yc0NFxzHjejxAF5olu5yjICE5PsOkpArI+v WwCu+F7hAJfYOrxYhrUmFygYu+T7KzophX9C8d8dNfwJ9w5XBY1/SjN4VyGGSlvoq28SrTot5 RBzq5HaDHyHmDp4G/3Loz4oQURceSYKNw5n9GUSl1hBxRlU/d7XcegfTy93tL9/1OcQvdXCCN mNWNVvhC5rimUftctFy/yCJUTq9S1ZruB2+W+k3/9fNsAbEmaPUrHdi+rYUqDk2pktqEiLpKY wj/jdnfT7wQyLj8nzOt9hS/+XMKjK0T6x3gRuIVa3mBvPgDY6cyFrsY7+ZJpPhHABPnT4afaG M215tEXgC9oaO5nXQWhSPJh9HyjX8KB31zB2x/w== Received-SPF: pass client-ip=212.227.15.19; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/21 15:02:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.4 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmx.net header.s=badeba3b8450 header.b=MLlc87Ae; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -2.11 X-TUID: 02liEKCtvlnO --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hello Guix! While trying to get the Gnome desktop up and running on a Pinebook Pro running Guix, I hit issues building samba. It turned out there was a bug in the configure script which just happened to work on x86_64 by chance. See for more details, then we can backport the patch from upstream. Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFLBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAl9pAqYYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UMdAH9A9b0R5A4xaPksdAEP3RNGrr hBVyscpnRoGgNRqN/A5qLc0/i1APf5vFgI5o7D0OXuuRSExEYVgGL5PXYFC75Vy7 Ocy9Qo+mMvnRZhkZlPyenG7ciQlq6qYZY4zNDtSgij+f78zm/S6KaI91W7pmfhru 2xi3UTPUHQjcoLtQvYM+JIuGyqQUMsNrRT/gDC29RL7cKakUueSJ/8uvbfkbnLj5 rJaar55iDLywzeoyjeirJCQXsF1GSz2K0AEZw6Qs3q5hYStbxX1tElJNMd1a48sC ABIvi1phX+/tDQtnZ4t4ixr9l82kC6Tv6Kt37EgirSvs0bXzEgb7UAyr/RHl8w== =mmz1 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-samba-Fix-fcntl-hint-detection-in-configure-scri.patch Content-Transfer-Encoding: quoted-printable =46rom dc3c16fc1908a17cf834730f13d9ebff82091170 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 19 Sep 2020 23:57:41 +0100 Subject: [PATCH] gnu: samba: Fix fcntl hint detection in configure script. The configure script generates a C program to detect support for lifetime hints on files. But this program could crash, potentially leaving a stale unreadable file behind which could cause the patch-generated-file-shebang phase to fail. Reported upstream . * gnu/packages/patches/patches/samba-fix-fcntl-hint-detection.patch: New file. * gnu/packages/samba.scm (samba)[origin]: Add patch. * gnu/local.mk (dist_patch_DATA): Register patch. =2D-- gnu/local.mk | 1 + .../samba-fix-fcntl-hint-detection.patch | 55 +++++++++++++++++++ gnu/packages/samba.scm | 2 + 3 files changed, 58 insertions(+) create mode 100644 gnu/packages/patches/samba-fix-fcntl-hint-detection.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index ba7c7f373d..a22a1029ab 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1405,6 +1405,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ + %D%/packages/patches/samba-fix-fcntl-hint-detection.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ %D%/packages/patches/sdl-pango-fillrect_crash.patch \ diff --git a/gnu/packages/patches/samba-fix-fcntl-hint-detection.patch b/g= nu/packages/patches/samba-fix-fcntl-hint-detection.patch new file mode 100644 index 0000000000..b56c628537 =2D-- /dev/null +++ b/gnu/packages/patches/samba-fix-fcntl-hint-detection.patch @@ -0,0 +1,55 @@ +From 454ccd986b61799908a6898a55d0480911f15306 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Mon, 21 Sep 2020 07:48:43 +0200 +Subject: [PATCH] s3: fix fcntl waf configure check + +RN: Fix fcntl waf configure check +BUG: https://bugzilla.samba.org/show_bug.cgi?id=3D14503 + +Signed-off-by: Ralph Boehme +Reviewed-by: Volker Lendecke + +Autobuild-User(master): Volker Lendecke +Autobuild-Date(master): Mon Sep 21 07:26:54 UTC 2020 on sn-devel-184 +--- + source3/wscript | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/source3/wscript b/source3/wscript +index 840ed430c0f..d3ef346eecd 100644 +--- a/source3/wscript ++++ b/source3/wscript +@@ -1244,7 +1244,7 @@ err: + + int main(void) + { +- uint64_t *hint, get_hint; ++ uint64_t hint, get_hint; + int fd; + + fd =3D open(DATA, O_RDONLY | O_CREAT | O_EXCL); +@@ -1252,8 +1252,8 @@ int main(void) + goto err; + } + +- *hint =3D RWH_WRITE_LIFE_SHORT; +- int ret =3D fcntl(fd, F_SET_RW_HINT, hint); ++ hint =3D RWH_WRITE_LIFE_SHORT; ++ int ret =3D fcntl(fd, F_SET_RW_HINT, &hint); + if (ret =3D=3D -1) { + goto err; + } +@@ -1267,8 +1267,8 @@ int main(void) + goto err; + } + +- *hint =3D RWH_WRITE_LIFE_EXTREME; +- ret =3D fcntl(fd, F_SET_FILE_RW_HINT, hint); ++ hint =3D RWH_WRITE_LIFE_EXTREME; ++ ret =3D fcntl(fd, F_SET_FILE_RW_HINT, &hint); + if (ret =3D=3D -1) { + goto err; + } +-- +2.28.0 + diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index c04426c49c..76a9c01866 100644 =2D-- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -32,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix licenses) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -182,6 +183,7 @@ external dependencies.") "samba-" version ".tar.gz")) (sha256 (base32 "1lkgih0vrarf5zy6chspkwarqdylzwr63nxr3qjkpazrs86nlm9h")) + (patches (search-patches "samba-fix-fcntl-hint-detection.patch")) (modules '((guix build utils))) (snippet '(begin =2D- 2.28.0 --=-=-=--