* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
@ 2017-05-05 19:35 Leo Famulari
2017-05-06 17:13 ` Kei Kebreau
0 siblings, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2017-05-05 19:35 UTC (permalink / raw)
To: 26788
* gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
---
gnu/packages/nfs.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index f18fe6cb5..94a18480c 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -41,7 +41,7 @@
(define-public nfs-utils
(package
(name "nfs-utils")
- (version "1.3.4")
+ (version "2.1.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -49,7 +49,7 @@
"/nfs-utils-" version ".tar.xz"))
(sha256
(base32
- "0xarqhwy757vazv9gqhyrgxsrx083yhvkkih01jh83fqm305naml"))))
+ "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
--
2.12.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
2017-05-05 19:35 bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1 Leo Famulari
@ 2017-05-06 17:13 ` Kei Kebreau
2017-05-07 20:48 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Kei Kebreau @ 2017-05-06 17:13 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26788
[-- Attachment #1: Type: text/plain, Size: 945 bytes --]
Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
> ---
> gnu/packages/nfs.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
> index f18fe6cb5..94a18480c 100644
> --- a/gnu/packages/nfs.scm
> +++ b/gnu/packages/nfs.scm
> @@ -41,7 +41,7 @@
> (define-public nfs-utils
> (package
> (name "nfs-utils")
> - (version "1.3.4")
> + (version "2.1.1")
> (source (origin
> (method url-fetch)
> (uri (string-append
> @@ -49,7 +49,7 @@
> "/nfs-utils-" version ".tar.xz"))
> (sha256
> (base32
> - "0xarqhwy757vazv9gqhyrgxsrx083yhvkkih01jh83fqm305naml"))))
> + "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg"))))
> (build-system gnu-build-system)
> (arguments
> `(#:configure-flags
LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
2017-05-06 17:13 ` Kei Kebreau
@ 2017-05-07 20:48 ` Leo Famulari
2017-05-08 21:36 ` Kei Kebreau
2017-05-09 5:49 ` Ricardo Wurmus
0 siblings, 2 replies; 6+ messages in thread
From: Leo Famulari @ 2017-05-07 20:48 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26788, Ricardo Wurmus
[-- Attachment #1.1: Type: text/plain, Size: 513 bytes --]
On Sat, May 06, 2017 at 01:13:50PM -0400, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
>
> LGTM.
Thanks!
I poked around some more and found that our nfs-utils package does not
keep a reference to gss. So, I'm removing gss in this update.
I also verified that all of the substitutions in the
'adjust-command-file-names' phase still have an effect.
I'll push these updated patches soon if there are no more comments.
[-- Attachment #1.2: 0001-gnu-nfs-utils-Update-to-2.1.1.patch --]
[-- Type: text/plain, Size: 1923 bytes --]
From 633f9ba6139d6a721d47b1662a72c0efbae95268 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 4 May 2017 21:17:07 -0400
Subject: [PATCH 1/2] gnu: nfs-utils: Update to 2.1.1.
* gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
[inputs]: Remove gss.
---
gnu/packages/nfs.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index f18fe6cb5..03ac841e4 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,7 +21,6 @@
#:use-module (gnu packages)
#:use-module (gnu packages linux)
#:use-module (gnu packages databases)
- #:use-module (gnu packages gsasl)
#:use-module (gnu packages libevent)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages onc-rpc)
@@ -41,7 +41,7 @@
(define-public nfs-utils
(package
(name "nfs-utils")
- (version "1.3.4")
+ (version "2.1.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -49,7 +49,7 @@
"/nfs-utils-" version ".tar.xz"))
(sha256
(base32
- "0xarqhwy757vazv9gqhyrgxsrx083yhvkkih01jh83fqm305naml"))))
+ "1vqrqzhg9nh2wj1icp7k8v9dibgnn521b45np79nnkmqf16bbbhg"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -98,7 +98,6 @@
("libnfsidmap" ,libnfsidmap)
("sqlite" ,sqlite)
("lvm2" ,lvm2)
- ("gss" ,gss)
("util-linux" ,util-linux)
("mit-krb5" ,mit-krb5)
("libtirpc" ,libtirpc)))
--
2.12.2
[-- Attachment #1.3: 0002-gnu-nfs-utils-Adjust-indentation.patch --]
[-- Type: text/plain, Size: 4495 bytes --]
From b39ebdb434140ae654199ca6df0d35b5aa8fe4ca Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sun, 7 May 2017 16:33:06 -0400
Subject: [PATCH 2/2] gnu: nfs-utils: Adjust indentation.
* gnu/packages/nfs.scm (nfs-utils): Re-indent.
---
gnu/packages/nfs.scm | 70 ++++++++++++++++++++++++++--------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index 03ac841e4..28751c400 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -57,43 +57,43 @@
,(string-append "--with-start-statd="
(assoc-ref %outputs "out") "/sbin/start-statd")
,(string-append "--with-krb5=" (assoc-ref %build-inputs "mit-krb5")))
- #:phases (modify-phases %standard-phases
- (add-before
- 'configure 'adjust-command-file-names
- (lambda _
- ;; Remove assumptions of FHS from start-statd script
- (substitute* `("utils/statd/start-statd")
- (("^PATH=.*") "")
- (("^flock")
- (string-append
- (assoc-ref %build-inputs "util-linux")
- "/bin/flock"))
- (("^exec rpc.statd")
- (string-append "exec "
- (assoc-ref %outputs "out") "/sbin/rpc.statd")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'adjust-command-file-names
+ (lambda _
+ ;; Remove assumptions of FHS from start-statd script
+ (substitute* `("utils/statd/start-statd")
+ (("^PATH=.*") "")
+ (("^flock")
+ (string-append
+ (assoc-ref %build-inputs "util-linux")
+ "/bin/flock"))
+ (("^exec rpc.statd")
+ (string-append "exec "
+ (assoc-ref %outputs "out") "/sbin/rpc.statd")))
- ;; This hook tries to write to /var
- ;; That needs to be done by a service too.
- (substitute* `("Makefile.in")
- (("^install-data-hook:")
- "install-data-hook-disabled-for-guix:"))
+ ;; This hook tries to write to /var
+ ;; That needs to be done by a service too.
+ (substitute* `("Makefile.in")
+ (("^install-data-hook:")
+ "install-data-hook-disabled-for-guix:"))
- ;; Replace some hard coded paths.
- (substitute* `("utils/nfsd/nfssvc.c")
- (("/bin/mount")
- (string-append
- (assoc-ref %build-inputs "util-linux")
- "/bin/mount")))
- (substitute* `("utils/statd/statd.c")
- (("/usr/sbin/")
- (string-append (assoc-ref %outputs "out") "/sbin/")))
- (substitute* `("utils/osd_login/Makefile.in"
- "utils/mount/Makefile.in"
- "utils/nfsdcltrack/Makefile.in")
- (("^sbindir = /sbin")
- (string-append "sbindir = "
- (assoc-ref %outputs "out") "/sbin")))
- #t)))))
+ ;; Replace some hard coded paths.
+ (substitute* `("utils/nfsd/nfssvc.c")
+ (("/bin/mount")
+ (string-append
+ (assoc-ref %build-inputs "util-linux")
+ "/bin/mount")))
+ (substitute* `("utils/statd/statd.c")
+ (("/usr/sbin/")
+ (string-append (assoc-ref %outputs "out") "/sbin/")))
+ (substitute* `("utils/osd_login/Makefile.in"
+ "utils/mount/Makefile.in"
+ "utils/nfsdcltrack/Makefile.in")
+ (("^sbindir = /sbin")
+ (string-append "sbindir = "
+ (assoc-ref %outputs "out") "/sbin")))
+ #t)))))
(inputs `(("libevent" ,libevent)
("libnfsidmap" ,libnfsidmap)
("sqlite" ,sqlite)
--
2.12.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
2017-05-07 20:48 ` Leo Famulari
@ 2017-05-08 21:36 ` Kei Kebreau
2017-05-08 23:28 ` Leo Famulari
2017-05-09 5:49 ` Ricardo Wurmus
1 sibling, 1 reply; 6+ messages in thread
From: Kei Kebreau @ 2017-05-08 21:36 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26788, Ricardo Wurmus
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Leo Famulari <leo@famulari.name> writes:
> On Sat, May 06, 2017 at 01:13:50PM -0400, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>>
>> > * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
>>
>> LGTM.
>
> Thanks!
>
> I poked around some more and found that our nfs-utils package does not
> keep a reference to gss. So, I'm removing gss in this update.
>
> I also verified that all of the substitutions in the
> 'adjust-command-file-names' phase still have an effect.
>
> I'll push these updated patches soon if there are no more comments.
They still work, so no opposition here.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
2017-05-08 21:36 ` Kei Kebreau
@ 2017-05-08 23:28 ` Leo Famulari
0 siblings, 0 replies; 6+ messages in thread
From: Leo Famulari @ 2017-05-08 23:28 UTC (permalink / raw)
Cc: 26788-done
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
On Mon, May 08, 2017 at 05:36:28PM -0400, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > On Sat, May 06, 2017 at 01:13:50PM -0400, Kei Kebreau wrote:
> >> Leo Famulari <leo@famulari.name> writes:
> >>
> >> > * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
> >>
> >> LGTM.
> >
> > Thanks!
> >
> > I poked around some more and found that our nfs-utils package does not
> > keep a reference to gss. So, I'm removing gss in this update.
> >
> > I also verified that all of the substitutions in the
> > 'adjust-command-file-names' phase still have an effect.
> >
> > I'll push these updated patches soon if there are no more comments.
>
> They still work, so no opposition here.
I pushed as a472f0d0752366a702515c28b1184b564fabf366.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1.
2017-05-07 20:48 ` Leo Famulari
2017-05-08 21:36 ` Kei Kebreau
@ 2017-05-09 5:49 ` Ricardo Wurmus
1 sibling, 0 replies; 6+ messages in thread
From: Ricardo Wurmus @ 2017-05-09 5:49 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26788, Kei Kebreau
Leo Famulari <leo@famulari.name> writes:
> On Sat, May 06, 2017 at 01:13:50PM -0400, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>>
>> > * gnu/packages/nfs.scm (nfs-utils): Update to 2.1.1.
>>
>> LGTM.
>
> Thanks!
>
> I poked around some more and found that our nfs-utils package does not
> keep a reference to gss. So, I'm removing gss in this update.
>
> I also verified that all of the substitutions in the
> 'adjust-command-file-names' phase still have an effect.
Thanks for the extra diligence!
> I'll push these updated patches soon if there are no more comments.
Sounds good to me. Thanks!
--
Ricardo
GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC
https://elephly.net
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-09 5:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-05 19:35 bug#26788: [PATCH] gnu: nfs-utils: Update to 2.1.1 Leo Famulari
2017-05-06 17:13 ` Kei Kebreau
2017-05-07 20:48 ` Leo Famulari
2017-05-08 21:36 ` Kei Kebreau
2017-05-08 23:28 ` Leo Famulari
2017-05-09 5:49 ` Ricardo Wurmus
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.