From unknown Thu Jun 19 14:21:43 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38410] [PATCH] gnu: glusterfs: Update to 7.0 Resent-From: Andrew Miloradovsky Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Nov 2019 08:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38410 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38410@debbugs.gnu.org Cc: Andrew Miloradovsky X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15749287828760 (code B ref -1); Thu, 28 Nov 2019 08:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2019 08:13:02 +0000 Received: from localhost ([127.0.0.1]:56564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaEv7-0002HB-KT for submit@debbugs.gnu.org; Thu, 28 Nov 2019 03:13:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:39144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaEv5-0002H3-53 for submit@debbugs.gnu.org; Thu, 28 Nov 2019 03:12:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40986) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaEv3-0007ku-Ci for guix-patches@gnu.org; Thu, 28 Nov 2019 03:12:58 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaEpy-0007xs-TZ for guix-patches@gnu.org; Thu, 28 Nov 2019 03:07:45 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:51855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaEpy-0007o8-Jn for guix-patches@gnu.org; Thu, 28 Nov 2019 03:07:42 -0500 X-Originating-IP: 109.73.36.242 Received: from localhost.localdomain (109-73-36-242.in-addr.mastertelecom.ru [109.73.36.242]) (Authenticated sender: andrew@interpretmath.pw) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 56FF61BF204; Thu, 28 Nov 2019 08:07:37 +0000 (UTC) From: Andrew Miloradovsky Date: Thu, 28 Nov 2019 11:06:29 +0300 Message-Id: <20191128080629.9888-1-andrew@interpretmath.pw> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Spam-Score: 165 X-GND-Status: SPAM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.201 X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/file-systems.scm (glusterfs): from 3.10.12 to 7.0 [arguments]: run ./autogen.sh, fix python, force enable unit tests [native-inputs]: +libtirpc +rpcsvc-proto +auto{conf,make} +libtool [inputs]: -lvm2 -sqlite +fuse +libaio +rdma-core --- gnu/packages/file-systems.scm | 119 ++++++++++++++++------------------ 1 file changed, 56 insertions(+), 63 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 85bfd8dd38..019c39bd8b 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages glib) #:use-module (gnu packages linux) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) @@ -145,73 +146,65 @@ non-determinism in the build process.") (define-public glusterfs (package - (name "glusterfs") - (version "3.10.12") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.gluster.org/pub/gluster/glusterfs/" - (version-major+minor version) "/" version - "/glusterfs-" version ".tar.gz")) - (sha256 - (base32 - "01ysvamvfv2l5pswa1rygpg8w0954h2wkh1ba97h3nx03m5n0prg")) - (patches - (search-patches "glusterfs-use-PATH-instead-of-hardcodes.patch")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "--with-initdir=" out "/etc/init.d") - (string-append "--with-mountutildir=" out "/sbin"))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'replace-config.sub - (lambda* (#:key inputs #:allow-other-keys) - ;; The distributed config.sub is intentionally left empty and - ;; must be replaced. - (install-file (string-append (assoc-ref inputs "automake") - "/share/automake-" - ,(version-major+minor (package-version automake)) "/config.sub") - ".") - #t)) - ;; Fix flex error. This has already been fixed with upstream commit - ;; db3fe245a9e8812829eae7d143e49d0bfdfef9a7, but is not available in - ;; current releases. - (add-before 'configure 'fix-lex - (lambda _ - (substitute* "libglusterfs/src/Makefile.in" - (("libglusterfs_la_LIBADD = @LEXLIB@") - "libglusterfs_la_LIBADD =")) - #t))))) - (native-inputs - `(("cmocka" ,cmocka) - ("pkg-config" ,pkg-config) - ("python-2" ,python-2) ; must be version 2 - ("flex" ,flex) - ("bison" ,bison) - ("automake" ,automake))) - (inputs - `(("acl" ,acl) - ;; GlusterFS fails to build with libressl because HMAC_CTX_new and - ;; HMAC_CTX_free are undefined. - ("openssl" ,openssl) - ("liburcu" ,liburcu) - ("libuuid" ,util-linux) - ("libxml2" ,libxml2) - ("lvm2" ,lvm2) - ("readline" ,readline) - ("sqlite" ,sqlite) ; for tiering - ("zlib" ,zlib))) - (home-page "https://www.gluster.org") - (synopsis "Distributed file system") - (description "GlusterFS is a distributed scalable network file system + (name "glusterfs") + (version "7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gluster.org/pub/gluster/glusterfs/" + (version-major+minor version) "/" + "glusterfs-" version ".tar.gz")) + (sha256 + (base32 + "0yzhx710ypj0j3m5dcgmmgvkp7p0rmmp2p7ld0axrm4vpwc2b1wa")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (let ((out (assoc-ref %outputs "out")) + (p2 (assoc-ref %build-inputs "python-2"))) + (list (string-append "PYTHON=" p2 "/bin/python") + (string-append "--with-initdir=" out "/etc/init.d") + (string-append "--with-mountutildir=" out "/sbin") + "--enable-cmocka" ; unit tests + ;; "--enable-debug" ; debug build options + ;; "--enable-asan" ; Address Sanitizer + ;; "--enable-tsan" ; ThreadSanitizer + )) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ (invoke "./autogen.sh")))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libtirpc", libtirpc) + ("rpcsvc-proto", rpcsvc-proto) + ("python-2" ,python-2) ; must be version 2 + ("flex" ,flex) + ("bison" ,bison) + ("libtool" ,libtool) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("cmocka" ,cmocka))) + (inputs + `(("acl" ,acl) + ("fuse", fuse) + ("openssl" ,openssl) + ("liburcu" ,liburcu) + ("libuuid" ,util-linux) + ("libxml2" ,libxml2) + ("readline" ,readline) + ("zlib" ,zlib) + ("libaio", libaio) + ("rdma-core", rdma-core))) + (home-page "https://www.gluster.org") + (synopsis "Distributed file system") + (description "GlusterFS is a distributed scalable network file system suitable for data-intensive tasks such as cloud storage and media streaming. It allows rapid provisioning of additional storage based on your storage consumption needs. It incorporates automatic failover as a primary feature. All of this is accomplished without a centralized metadata server.") - ;; The user may choose either LGPLv3+ or GPLv2 only. - (license (list license:lgpl3+ license:gpl2+)))) + ;; The user may choose either LGPLv3+ or GPLv2 only. + (license (list license:lgpl3+ license:gpl2+)))) (define-public curlftpfs (package -- 2.23.0 From unknown Thu Jun 19 14:21:43 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Andrew Miloradovsky Subject: bug#38410: closed (Re: [bug#38410] [PATCH] gnu: glusterfs: Update to 7.0) Message-ID: References: <87lfrnsp8k.fsf@gnu.org> <20191128080629.9888-1-andrew@interpretmath.pw> X-Gnu-PR-Message: they-closed 38410 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 38410@debbugs.gnu.org Date: Sun, 08 Dec 2019 02:38:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1575772682-22930-1" This is a multi-part message in MIME format... ------------=_1575772682-22930-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #38410: [PATCH] gnu: glusterfs: Update to 7.0 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 38410@debbugs.gnu.org. --=20 38410: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D38410 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1575772682-22930-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 38410-done) by debbugs.gnu.org; 8 Dec 2019 02:37:45 +0000 Received: from localhost ([127.0.0.1]:50001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1idmS9-0005xG-00 for submit@debbugs.gnu.org; Sat, 07 Dec 2019 21:37:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1idmS7-0005x4-EY for 38410-done@debbugs.gnu.org; Sat, 07 Dec 2019 21:37:43 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1idjH9-0000Ho-Ry; Sat, 07 Dec 2019 18:14:15 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54314 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1idjH4-00014g-Sl; Sat, 07 Dec 2019 18:14:09 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andrew Miloradovsky Subject: Re: [bug#38410] [PATCH] gnu: glusterfs: Update to 7.0 References: <20191128080629.9888-1-andrew@interpretmath.pw> Date: Sun, 08 Dec 2019 00:14:03 +0100 In-Reply-To: <20191128080629.9888-1-andrew@interpretmath.pw> (Andrew Miloradovsky's message of "Thu, 28 Nov 2019 11:06:29 +0300") Message-ID: <87lfrnsp8k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 38410-done Cc: 38410-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Andrew, Andrew Miloradovsky skribis: > * gnu/packages/file-systems.scm (glusterfs): from 3.10.12 to 7.0 > [arguments]: run ./autogen.sh, fix python, force enable unit tests > [native-inputs]: +libtirpc +rpcsvc-proto +auto{conf,make} +libtool > [inputs]: -lvm2 -sqlite +fuse +libaio +rdma-core I fixed the URL, adjusted the commit log to match our conventions and committed. Note that your patch modified the indentation; I=E2=80=99ve restored it, wh= ich makes the diff clearer. Thanks, Ludo=E2=80=99. ------------=_1575772682-22930-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Nov 2019 08:13:02 +0000 Received: from localhost ([127.0.0.1]:56564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaEv7-0002HB-KT for submit@debbugs.gnu.org; Thu, 28 Nov 2019 03:13:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:39144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iaEv5-0002H3-53 for submit@debbugs.gnu.org; Thu, 28 Nov 2019 03:12:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40986) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaEv3-0007ku-Ci for guix-patches@gnu.org; Thu, 28 Nov 2019 03:12:58 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaEpy-0007xs-TZ for guix-patches@gnu.org; Thu, 28 Nov 2019 03:07:45 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:51855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaEpy-0007o8-Jn for guix-patches@gnu.org; Thu, 28 Nov 2019 03:07:42 -0500 X-Originating-IP: 109.73.36.242 Received: from localhost.localdomain (109-73-36-242.in-addr.mastertelecom.ru [109.73.36.242]) (Authenticated sender: andrew@interpretmath.pw) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 56FF61BF204; Thu, 28 Nov 2019 08:07:37 +0000 (UTC) From: Andrew Miloradovsky To: guix-patches@gnu.org Subject: [PATCH] gnu: glusterfs: Update to 7.0 Date: Thu, 28 Nov 2019 11:06:29 +0300 Message-Id: <20191128080629.9888-1-andrew@interpretmath.pw> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Spam-Score: 165 X-GND-Status: SPAM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.201 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Andrew Miloradovsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/file-systems.scm (glusterfs): from 3.10.12 to 7.0 [arguments]: run ./autogen.sh, fix python, force enable unit tests [native-inputs]: +libtirpc +rpcsvc-proto +auto{conf,make} +libtool [inputs]: -lvm2 -sqlite +fuse +libaio +rdma-core --- gnu/packages/file-systems.scm | 119 ++++++++++++++++------------------ 1 file changed, 56 insertions(+), 63 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 85bfd8dd38..019c39bd8b 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages glib) #:use-module (gnu packages linux) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) @@ -145,73 +146,65 @@ non-determinism in the build process.") (define-public glusterfs (package - (name "glusterfs") - (version "3.10.12") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.gluster.org/pub/gluster/glusterfs/" - (version-major+minor version) "/" version - "/glusterfs-" version ".tar.gz")) - (sha256 - (base32 - "01ysvamvfv2l5pswa1rygpg8w0954h2wkh1ba97h3nx03m5n0prg")) - (patches - (search-patches "glusterfs-use-PATH-instead-of-hardcodes.patch")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "--with-initdir=" out "/etc/init.d") - (string-append "--with-mountutildir=" out "/sbin"))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'replace-config.sub - (lambda* (#:key inputs #:allow-other-keys) - ;; The distributed config.sub is intentionally left empty and - ;; must be replaced. - (install-file (string-append (assoc-ref inputs "automake") - "/share/automake-" - ,(version-major+minor (package-version automake)) "/config.sub") - ".") - #t)) - ;; Fix flex error. This has already been fixed with upstream commit - ;; db3fe245a9e8812829eae7d143e49d0bfdfef9a7, but is not available in - ;; current releases. - (add-before 'configure 'fix-lex - (lambda _ - (substitute* "libglusterfs/src/Makefile.in" - (("libglusterfs_la_LIBADD = @LEXLIB@") - "libglusterfs_la_LIBADD =")) - #t))))) - (native-inputs - `(("cmocka" ,cmocka) - ("pkg-config" ,pkg-config) - ("python-2" ,python-2) ; must be version 2 - ("flex" ,flex) - ("bison" ,bison) - ("automake" ,automake))) - (inputs - `(("acl" ,acl) - ;; GlusterFS fails to build with libressl because HMAC_CTX_new and - ;; HMAC_CTX_free are undefined. - ("openssl" ,openssl) - ("liburcu" ,liburcu) - ("libuuid" ,util-linux) - ("libxml2" ,libxml2) - ("lvm2" ,lvm2) - ("readline" ,readline) - ("sqlite" ,sqlite) ; for tiering - ("zlib" ,zlib))) - (home-page "https://www.gluster.org") - (synopsis "Distributed file system") - (description "GlusterFS is a distributed scalable network file system + (name "glusterfs") + (version "7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gluster.org/pub/gluster/glusterfs/" + (version-major+minor version) "/" + "glusterfs-" version ".tar.gz")) + (sha256 + (base32 + "0yzhx710ypj0j3m5dcgmmgvkp7p0rmmp2p7ld0axrm4vpwc2b1wa")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (let ((out (assoc-ref %outputs "out")) + (p2 (assoc-ref %build-inputs "python-2"))) + (list (string-append "PYTHON=" p2 "/bin/python") + (string-append "--with-initdir=" out "/etc/init.d") + (string-append "--with-mountutildir=" out "/sbin") + "--enable-cmocka" ; unit tests + ;; "--enable-debug" ; debug build options + ;; "--enable-asan" ; Address Sanitizer + ;; "--enable-tsan" ; ThreadSanitizer + )) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ (invoke "./autogen.sh")))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("libtirpc", libtirpc) + ("rpcsvc-proto", rpcsvc-proto) + ("python-2" ,python-2) ; must be version 2 + ("flex" ,flex) + ("bison" ,bison) + ("libtool" ,libtool) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("cmocka" ,cmocka))) + (inputs + `(("acl" ,acl) + ("fuse", fuse) + ("openssl" ,openssl) + ("liburcu" ,liburcu) + ("libuuid" ,util-linux) + ("libxml2" ,libxml2) + ("readline" ,readline) + ("zlib" ,zlib) + ("libaio", libaio) + ("rdma-core", rdma-core))) + (home-page "https://www.gluster.org") + (synopsis "Distributed file system") + (description "GlusterFS is a distributed scalable network file system suitable for data-intensive tasks such as cloud storage and media streaming. It allows rapid provisioning of additional storage based on your storage consumption needs. It incorporates automatic failover as a primary feature. All of this is accomplished without a centralized metadata server.") - ;; The user may choose either LGPLv3+ or GPLv2 only. - (license (list license:lgpl3+ license:gpl2+)))) + ;; The user may choose either LGPLv3+ or GPLv2 only. + (license (list license:lgpl3+ license:gpl2+)))) (define-public curlftpfs (package -- 2.23.0 ------------=_1575772682-22930-1--