Re: Shall we merge wip-gnome3.30 to core-updates?

[Marius Bakke]

Efraim Flashner <address@hidden> writes:

> On Thu, Jun 13, 2019 at 07:09:47PM -0400, Kei Kebreau wrote:
>> Hello again Marius,
>> 
>> Marius Bakke <address@hidden> writes:
>> 
>> > Hi Kei,
>> >
>> > Kei Kebreau <address@hidden> writes:
>> >
> <...>
>> 
>> * The samba package seems to require the "rpcgen" binary as part of its
>> build process, but I don't know which package includes that binary. I
>> know it appears somewhere in the process of building the "gcc-toolchain"
>> package, but I'd rather not include that whole package if it isn't
>> necessary.
>
>
> rpcgen seems to be in glibc

Not since commit 3670ea70e2e932969a3ffc0acf75a714c7b42540 ;-)

This patch allows Samba to build.  Other distributions seem to give
Samba libtirpc as input too, so I haven't finished investigating yet:

From 9be0787b1b2a55aecefaba09dc73836c1931e10a Mon Sep 17 00:00:00 2001
From: Marius Bakke <address@hidden>
Date: Sun, 16 Jun 2019 08:21:11 +0200
Subject: [PATCH 1/2] gnu: Add rpcsvc-proto.

* gnu/packages/onc-rpc.scm (rpcsvc-proto): New public variable.
---
 gnu/packages/onc-rpc.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 64887212d3..f3ce12ef7a 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -99,6 +99,26 @@ IPv4 and IPv6.  ONC RPC is notably used by the network file 
system (NFS).")
 universal addresses.")
     (license bsd-3)))
 
+(define-public rpcsvc-proto
+  (package
+    (name "rpcsvc-proto")
+    (version "1.4")
+    (home-page "https://github.com/thkukuk/rpcsvc-proto";)
+    (source (origin
+              (method url-fetch)
+              (uri (string-append home-page "/releases/download/v" version
+                                  "/rpcsvc-proto-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0i93wbpw5dk2gf5v4a5hq6frh814wzgjydh7saj28wlgbpqdaja1"))))
+    (build-system gnu-build-system)
+    (synopsis "RPCSVC protocol definitions")
+    (description
+     "This package provides @code{rpcsvc} @file{protocol.x} files and headers
+that are not included with the @code{libtirpc} package.  Additionally it
+contains @command{rpcgen}, which is used to produce header files and sources
+from the protocol files.")
+    (license bsd-3)))
 
 (define-public libnsl
   (package
-- 
2.22.0


From bb49cb2307bcfb4274af1b80498ac8625a2891b8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <address@hidden>
Date: Sun, 16 Jun 2019 08:21:57 +0200
Subject: [PATCH 2/2] gnu: samba: Add rpcgen input.

This is required because Glibc no longer provides this executable since
commit 3670ea70e2e932969a3ffc0acf75a714c7b42540.

* gnu/packages/samba.scm (samba)[native-inputs]: Add RPCSVC-PROTO.
---
 gnu/packages/samba.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 7803a1c8d1..c4a40187c4 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -43,6 +43,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -225,6 +226,7 @@ anywhere.")
     (native-inputs
      `(("docbook-xsl" ,docbook-xsl)    ;for generating manpages
        ("xsltproc" ,libxslt)           ;ditto
+       ("rpcsvc-proto" ,rpcsvc-proto)  ;for 'rpcgen'
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python" ,python)))
-- 
2.22.0

@Kei: If you have tested this branch elsewhere, I think it's okay to
merge even if it does not yet build on 'core-updates'.

signature.asc
Description: PGP signature