diff options
author | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2023-12-07 12:28:29 +0900 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-22 17:47:16 +0100 |
commit | 4a1b3830a8ff6b05ad9a2b27c8a2cdbd00a45787 (patch) | |
tree | 8b525930f1c165d29eb187227f7bc88e2683318f /gnu/packages/networking.scm | |
parent | 211c66d49e720eb32c866234ec450d51f322584c (diff) | |
download | guix-patches-4a1b3830a8ff6b05ad9a2b27c8a2cdbd00a45787.tar guix-patches-4a1b3830a8ff6b05ad9a2b27c8a2cdbd00a45787.tar.gz |
gnu: dante: Enable preloading support.
Fixes <https://issues.guix.gnu.org/63250>.
Dante uses dlopen which doesn't work with libc.so but libc.so.6.
This fixes socksify, which is patched to skip invoking uname needlessly.
* gnu/packages/networking.scm (dante): Enable preloading support.
* gnu/packages/patches/dante-non-darwin.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
References: https://github.com/NixOS/nixpkgs/pull/68418#discussion_r343625853
Change-Id: I03a5b6b6e11cf6a0453a4968ff00c6dd627249a8
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/networking.scm')
-rw-r--r-- | gnu/packages/networking.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2d2bce96c2..dad217beb0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3640,13 +3640,10 @@ and check if the WLAN key or the master key was transmitted unencrypted.") (uri (string-append "https://www.inet.no/dante/files/dante-" version ".tar.gz")) (sha256 - (base32 "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1")))) + (base32 "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1")) + (patches (search-patches "dante-non-darwin.patch")))) (build-system gnu-build-system) - (arguments - ;; XXX: The dynamic socks library doesn't work with 'libc.so' (GNU ld - ;; script). When preloading is enabled, 'sockd' failed with: - ;; … Failed to open library "libc.so": …: invalid ELF header - '(#:configure-flags '("--disable-preload"))) + (arguments '(#:configure-flags '("--with-libc=libc.so.6"))) (home-page "https://www.inet.no/dante/") (synopsis "SOCKS server and client") (description "Dante is a SOCKS client and server implementation. It can |