From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MGNzF98YvmHbegAAgWs5BA (envelope-from ) for ; Sat, 18 Dec 2021 18:22:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6LwBE98YvmEdIgAAbx9fmQ (envelope-from ) for ; Sat, 18 Dec 2021 17:22:39 +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 00D15846B for ; Sat, 18 Dec 2021 18:22:39 +0100 (CET) Received: from localhost ([::1]:55234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mydPq-0006kQ-61 for larch@yhetil.org; Sat, 18 Dec 2021 12:22:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mydPW-0006i5-4w for guix-patches@gnu.org; Sat, 18 Dec 2021 12:22:18 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mydPH-00054c-Bw for guix-patches@gnu.org; Sat, 18 Dec 2021 12:22:17 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mydPH-0005Sm-8B for guix-patches@gnu.org; Sat, 18 Dec 2021 12:22:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52578] [PATCH] updating openldap and adding service definition Resent-From: Jean-Francois GUILLAUME Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 17:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 52578@debbugs.gnu.org Received: via spool by 52578-submit@debbugs.gnu.org id=B52578.163984809420939 (code B ref 52578); Sat, 18 Dec 2021 17:22:03 +0000 Received: (at 52578) by debbugs.gnu.org; 18 Dec 2021 17:21:34 +0000 Received: from localhost ([127.0.0.1]:43735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mydOn-0005Ra-Dw for submit@debbugs.gnu.org; Sat, 18 Dec 2021 12:21:34 -0500 Received: from smtp2.univ-nantes.fr ([193.52.82.19]:45722 helo=smtp-prv.univ-nantes.fr) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myXb4-0005ef-VE for 52578@debbugs.gnu.org; Sat, 18 Dec 2021 06:09:52 -0500 Received: from localhost (localhost [127.0.0.1]) by smtp-prv.univ-nantes.fr (Postfix) with ESMTP id 80A2E8B9512; Sat, 18 Dec 2021 12:09:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=univ-nantes.fr; s=mailv2; t=1639825789; bh=Fj/dpu2XKl/8u5PFfMFcRhbAiuzgvskTePyT/mELv80=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NIuS3zx3XuKuAkLw5s6gxYXYsLZYoMJ+WcwY6O8/xVgPHGy2GZgIGvFu3Sng0eSMo 4dNvw2IQshx2s5/96aaEQH6M4+U9YY4kYUTE6ho7LVoqnzEXnk9QZKwAUQuDOcmull BI9gY/ZPPCDJGDHf7ot01etUNX3qduSMt0RUIBoDjtCeivZeXEMGZf9MQGha6JuBNq g0medk9NQ/miyncQgJBVWh8lfKR++LQ/pek4+ts4VQBhCKFbsNoqEmj/zGJMiinq9a jL8NMoouWKrFPmgEpnC0m1PeWfuXI/cM6JE/uWV8lKQZwg8iPSQ4LgqRlOKUBJ2D9R d5QA7IEAp0WNg== X-Virus-Scanned: Debian amavisd-new at smtp2.univ-nantes.fr Received: from smtp-prv.univ-nantes.fr ([127.0.0.1]) by localhost (smtp2.u12.univ-nantes.prive [127.0.0.1]) (amavisd-new, port 10024) with LMTP id MolyeA-9XGEu; Sat, 18 Dec 2021 12:09:49 +0100 (CET) Received: from webmail.univ-nantes.fr (webmail2-lmb.cprv.univ-nantes.prive [172.26.0.61]) by smtp-prv.univ-nantes.fr (Postfix) with ESMTP id 5AA1684540F; Sat, 18 Dec 2021 12:09:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=univ-nantes.fr; s=mailv2; t=1639825789; bh=Fj/dpu2XKl/8u5PFfMFcRhbAiuzgvskTePyT/mELv80=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NIuS3zx3XuKuAkLw5s6gxYXYsLZYoMJ+WcwY6O8/xVgPHGy2GZgIGvFu3Sng0eSMo 4dNvw2IQshx2s5/96aaEQH6M4+U9YY4kYUTE6ho7LVoqnzEXnk9QZKwAUQuDOcmull BI9gY/ZPPCDJGDHf7ot01etUNX3qduSMt0RUIBoDjtCeivZeXEMGZf9MQGha6JuBNq g0medk9NQ/miyncQgJBVWh8lfKR++LQ/pek4+ts4VQBhCKFbsNoqEmj/zGJMiinq9a jL8NMoouWKrFPmgEpnC0m1PeWfuXI/cM6JE/uWV8lKQZwg8iPSQ4LgqRlOKUBJ2D9R d5QA7IEAp0WNg== MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Date: Sat, 18 Dec 2021 12:09:49 +0100 From: Jean-Francois GUILLAUME Organization: UFR MEDECINE/FED 4203 SFR SANTE In-Reply-To: <86ee6aqkky.fsf@gmail.com> References: <86ee6aqkky.fsf@gmail.com> Message-ID: X-Sender: Jean-Francois.Guillaume@univ-nantes.fr User-Agent: Roundcube Webmail/1.1.2 X-Mailman-Approved-At: Sat, 18 Dec 2021 12:21:31 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639848159; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Fj/dpu2XKl/8u5PFfMFcRhbAiuzgvskTePyT/mELv80=; b=Y9EZQpDU2QFKXsKIBnatpfU3dVid2IY/5zXutfflTl/YckQvVYlIJR6aCW3XPAe5QJUC19 HfnHwdOgPK87v3TGnuJOfs9xY0qVEeyL9HmcRpufZzNW0H6rmip/Upk5Tx9vE4tKplb3i7 Cw8oN2oFUagTrrRssr5YoMDc8Aq1pPrmZBxiOZZc8pMZ0MxFCGbW1ApDLvaf6xkptSf/WL 5bH23FZLZD4rkE5jSl0Cf/CAOoYYdgb4/XQCaRqOEZiqvbEfipj5okmgdE54tK2dFyM0EM X+DInE3R24xfVFYRG1AlbzdlntzRxww3p+97hOEjpZwj/E51IfKpW/NNzEYZXg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639848159; a=rsa-sha256; cv=none; b=uGYpZ3J7E4Aipzy8nSdAvgrd8NMGWIabZ4zmrjAGbjcUWl4alATWMiLkEiiphx6bjbQJvm tUK6U9PZgZgBnd1FvGy7o2sE0Qpnsrw7B3EUanlec9a1WnDnxtFV//ec0zTZoQ23X63/XE lmqr5/yqfFLr8wJm/tVy4xDS0wF9ZcV9MYCbnsSuTijcOW9GSycBkcv8G9xogjmldsbinb B8nQ0DTF/vZ9XoUBL7tcs92X4fadNZv8J27tocV/nk9lkoHdjCVgW5cOoHazNWw8djqFy5 o7k+3rxi/RYojTDrt+gCFkr4rqlFDDqOWA+FywEwdXbYoB8Ptbj8lkcUyD6Djw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=univ-nantes.fr header.s=mailv2 header.b=NIuS3zx3; dkim=fail ("headers rsa verify failed") header.d=univ-nantes.fr header.s=mailv2 header.b=NIuS3zx3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=univ-nantes.fr (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.71 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=univ-nantes.fr header.s=mailv2 header.b=NIuS3zx3; dkim=fail ("headers rsa verify failed") header.d=univ-nantes.fr header.s=mailv2 header.b=NIuS3zx3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=univ-nantes.fr (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 00D15846B X-Spam-Score: -3.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: 12TRWAKjoBKH Hi Simon, > Nice to see you here. :-) Thanks :) > Various comments for improving the submission. Angain, thank you. I'll glady take on these as i've other packages to=20 contribute. > I would split: one commit for adding a big openldap and another for > adding the service. WDYT? >=20 > (I have not looked yet to the service.) As you wish, i must admit i was kind of lazy and wanted to provide=20 everything in one go. >=20 > Why the mirror list had been removed? >=20 > [...] >=20 > This is new, right? >=20 It's still using a mirror list, i've tried to select a few on each=20 region of th e world on openldap's download page. > As it is currently and already done in gnu/packages/openldap.scm, to > ease the reading, this long string could be slip as, >=20 > --8<---------------cut here---------------start------------->8--- > (string-append > "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" > "openldap-release/openldap-" version ".tgz"))) > --8<---------------cut here---------------end--------------->8--- >=20 > (See below for details if many variants are required.) >=20 Well, i found it more easy to read on one line but it's true that i use=20 a wide terminal. I can change it, no problems. >=20 >> + (inputs `( >> + ("argon2", argon2) >> + ("cyrus-sasl", cyrus-sasl) >> + ("libevent", libevent) >> + ("libgcrypt", libgcrypt) >> + ("libltdl", libltdl) >> + ("lz4", lz4) >> + ("openssl", openssl) >> + ("perl", perl) >> + ("snappy", snappy) >> + ("unixodbc", unixodbc) >> + ("wiredtiger", wiredtiger) >> + ("zlib", zlib) >> + )) >> + (native-inputs `( >> + ("bdb", bdb) >> + ("groff", groff) >> + ("libtool", libtool) >> + ("pkg-config", pkg-config) >> + )) >=20 > Currently, openldap@2.4.57 is built using (reformatted by me to ease=20 > the > comparison): >=20 > --8<---------------cut here---------------start------------->8--- > (inputs (list bdb-5.3 > cyrus-sasl > gnutls > libgcrypt > zlib)) > (native-inputs (list libtool > groff > bdb-5.3)) > --8<---------------cut here---------------end--------------->8--- >=20 > Aside the new style vs the old style which is a detail, are these lists > expanded because the version bump or because more OpenLDAP is built > using more features? >=20 With his definition you can now run a fully featured openldap server. We=20 were missing quite a few features when using the 2.4.57 version (which=20 is nearly only the client tools). >=20 >> + (arguments `( >> + ; this is needed because the make check does not work inside=20 >> guix >> + #:tests? #f >=20 > It was already off, but I do not understand the new comment. Well, > maybe this commentary is not necessary. >=20 My bad, leftovers from our local repo. For some strange reasons, when=20 the tests are run by guix build they do not properly clean after each=20 steps and ends up failing. If you do the same inside a guix environment=20 they work properly. And i think some tests need some kinds of network=20 connection but that could be on another package. >=20 >> + #:configure-flags '( >> + "--enable-debug" >> + "--enable-dynamic" >> + "--enable-syslog" >> + "--enable-ipv6" >> + "--enable-local" >> + "--enable-slapd" >> + "--enable-dynacl" >> + "--enable-aci" >> + "--enable-cleartext" >> + "--enable-crypt" >> + "--enable-spasswd" >> + "--enable-modules" >> + "--enable-rlookups" >> + "--enable-slapi" >> + "--enable-backends=3Dmod" >> + "--enable-overlays=3Dmod" >> + "--enable-argon2" >> + "--enable-balancer" >> + "--disable-static" >> + "--enable-shared" >> + "--with-tls=3Dopenssl" >> + "--disable-static" >=20 > This is a lot more. :-) [...] Indeed, need quite a lot to get a fully featured server. > [...] Therefore, the question is: is it better >=20 > - to have only one BIG openldap package? > - or to have one minimal openldap and a bigger variant? >=20 > Well, =E2=80=9Cguix refresh -l openldap=E2=80=9D answers for us. ;-) >=20 > I propose to keep openldap@2.4.57 minimal, as it currently is, and use > =E2=80=99inherit=E2=80=99 to build BIG =E2=80=99openldap@2.6.0.=E2=80=99 = and variants. >=20 As you wish either work for me. I can also do a "-minimal" version with=20 only what is needed to get a client version and a "-full" version to get=20 a fully featured server. >=20 >> + ,@(if (%current-target-system) >> + '("--with-yielding_select=3Dyes" >> "ac_cv_func_memcmp_working=3Dyes") >> + '() >> + ) >> + ) >> + #:make-flags '("STRIP=3D") >> + #:parallel-build? #t >=20 > This is not necessary because it is the default. >=20 OK. >=20 >> + #:phases (modify-phases %standard-phases >> + (add-before 'build 'make-depend >> + (lambda* (#:key input #:allow-other-keys) >> + (invoke "make" "depend") >> + ) >> + ) >> + ,@(if (%current-target-system) >> + '( >> + (add-before 'make-depend 'fix-cross-gcc >> + (lambda* (#:key target #:allow-other-keys) >> + (setenv "CC" (string-append target "-gcc")) >> + #t >> + ) >> + ) >> + ) >> + '() >> + ) >> + ) >> + )) >=20 > A minor comment, usually, we do: >=20 > --8<---------------cut here---------------start------------->8--- > ,@(if (%current-target-system) > '((add-before 'make-depend 'fix-cross-gcc > (lambda* (#:key target #:allow-other-keys) > (setenv "CC" (string-append target "-gcc")) > #t))) > '())))) > --8<---------------cut here---------------end--------------->8--- >=20 > instead of all these closing parens, each on one line. >=20 > Using =E2=80=99inherit=E2=80=99, this is even probably not required. :-) >=20 Leftovers from our local repo, we rely a bit to much on indentation to=20 help us have a better view of where blocks start and stop. >=20 >> +(define-public openldap-2.5.9 >> + (package >> + (inherit openldap) >> + (name "openldap") >> + (version "2.5.9") >> + (source (origin >> + (method url-fetch) >> + (uri (list >> + (string-append >> "https://www.openldap.org/software/download/OpenLDAP/openldap-release/op= enldap-" >> version ".tgz") >> + (string-append >> "http://repository.linagora.org/OpenLDAP/openldap-release/openldap-" >> version ".tgz") >> + (string-append >> "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/openldap-" >> version ".tgz") >> + )) >> + (sha256 ( base32 >> "17pvwrj27jybbmjqpv0p7kd2qa4i6jnp134lz7cxa0sqrbs153n0" )) >> + ) >=20 > Do you need all these variants? If yes, it could be nice to have, > instead of copy/paste all, something like: >=20 > --8<---------------cut here---------------start------------->8--- > (define (openldap-uris version) > (let ((openldap-release "OpenLDAP/openldap-release/") > (openldap-version.tgz > (string-append "openldap-" version ".tgz"))) > (map (lambda (url) > (string-append url openldap-release openldap-version.tgz)) > (list "https://www.openldap.org/software/download/" > "http://repository.linagora.org/" > "ftp://ftp.dti.ad.jp/pub/net/")))) >=20 > (define-public openldap-2.5.8 > (package > (inherit openldap) > (name "openldap") > (version "2.5.8") > (source (origin > (method url-fetch) > (uri (openldap-uris version)) > (sha256 > (base32=20 > "1p3jck2kh7rsz6mkrqaailaf9ky050hn72wph52dw0j2nb1s2vin"))))) >=20 > [=E2=80=A6] > --8<---------------cut here---------------end--------------->8--- >=20 > (Untested though. :-))) >=20 This is mostly another case of copy-paste from our local repository went=20 wrong. Initially i intended to provide only the latests versions for 2.6.x and=20 2.5.x and keeping 2.4.57 from compatibility reasons. While doing the definitions, i was wondering how i could provide only=20 the hash and the version, guess i'll try your solution :) Best, --- Cordialement, Jean-Fran=C3=A7ois GUILLAUME Plateforme Bioinformatique BiRD T=C3=A9l. : +33 (0)2 28 08 00 57 www.pf-bird.univ-nantes.fr Inserm UMR 1087/CNRS UMR 6291 IRS-UN - 8 quai Moncousu - BP 70721 44007 Nantes Cedex 1