diff options
| author | Yelninei <yelninei@tutamail.com> | 2026-05-19 15:29:52 +0000 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-08-12 10:42:47 +0900 |
| commit | b00db666b7d1538611bbc8e08b4c2a06913df51f (patch) | |
| tree | d5088e4394d92410f81e48b1df6732fb76bbe5fe /gnu | |
| parent | e388dbdb2c67b0487e1d5643b031a9b27968e401 (diff) | |
gnu: rpcbind: Fix build on the Hurd.
* gnu/packages/patches/rpcbind-hurd.patch: New file.
* gnu/packages/onc-rpc.scm (rpc-bind)[source]<patches>: Add it.
* gnu/local.mk (dist_patch_DATA): Register it.
Merges: https://codeberg.org/guix/guix/pulls/8718
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/onc-rpc.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/rpcbind-hurd.patch | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f738a512a2b..2bb04a47cfe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -2413,6 +2413,7 @@ dist_patch_DATA = \ | |||
| 2413 | %D%/packages/patches/r-sapa-lapack.patch \ | 2413 | %D%/packages/patches/r-sapa-lapack.patch \ |
| 2414 | %D%/packages/patches/ripperx-missing-file.patch \ | 2414 | %D%/packages/patches/ripperx-missing-file.patch \ |
| 2415 | %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ | 2415 | %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ |
| 2416 | %D%/packages/patches/rpcbind-hurd.patch \ | ||
| 2416 | %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \ | 2417 | %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \ |
| 2417 | %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ | 2418 | %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ |
| 2418 | %D%/packages/patches/racket-launcher-config-dir.patch \ | 2419 | %D%/packages/patches/racket-launcher-config-dir.patch \ |
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 5da9b4807e2..e2298ced7df 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm | |||
| @@ -95,7 +95,8 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") | |||
| 95 | (uri (string-append "mirror://sourceforge/" name "/" name "/" | 95 | (uri (string-append "mirror://sourceforge/" name "/" name "/" |
| 96 | version "/" | 96 | version "/" |
| 97 | name "-" version ".tar.bz2")) | 97 | name "-" version ".tar.bz2")) |
| 98 | (patches (search-patches "rpcbind-CVE-2017-8779.patch")) | 98 | (patches (search-patches "rpcbind-hurd.patch" |
| 99 | "rpcbind-CVE-2017-8779.patch")) | ||
| 99 | (sha256 | 100 | (sha256 |
| 100 | (base32 "1pp8xvprsfz8nlmmvxf829gilx0ibb08bfs3lhisxrfai5j784sn")))) | 101 | (base32 "1pp8xvprsfz8nlmmvxf829gilx0ibb08bfs3lhisxrfai5j784sn")))) |
| 101 | (build-system gnu-build-system) | 102 | (build-system gnu-build-system) |
diff --git a/gnu/packages/patches/rpcbind-hurd.patch b/gnu/packages/patches/rpcbind-hurd.patch new file mode 100644 index 00000000000..b49c050ebbe --- /dev/null +++ b/gnu/packages/patches/rpcbind-hurd.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | Taken from https://salsa.debian.org/debian/rpcbind/-/raw/master/debian/patches/04-610718-non-linux.patch | ||
| 2 | |||
| 3 | --- a/src/security.c | ||
| 4 | +++ b/src/security.c | ||
| 5 | @@ -63,7 +63,7 @@ | ||
| 6 | #ifndef PORTMAP_LOG_SEVERITY | ||
| 7 | # define PORTMAP_LOG_SEVERITY LOG_INFO | ||
| 8 | #endif | ||
| 9 | -#ifdef __linux__ | ||
| 10 | +#if defined(INET6) && !defined(IPV6PORT_RESERVED) | ||
| 11 | #define IPV6PORT_RESERVED IPPORT_RESERVED | ||
| 12 | #endif | ||
| 13 | |||
