Merge #322012: rsync: fix missing ipv6 support (again)

...into staging
2024-07-20 09:32:49 +02:00
parent 59dba7c5d9 df5bf2f5f0
commit 3271e61066
2 changed files with 17 additions and 0 deletions
@@ -0,0 +1,12 @@
+diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
+--- rsync-3.2.7/configure.sh	2022-10-20 17:57:22
+++ rsync-3.2.7-fixed/configure.sh	2024-01-01 19:51:58
+@@ -7706,7 +7706,7 @@ else $as_nop
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-main()
+int main()
+ {
+    if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+      exit(1);
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ];

+  patches = [
+    # https://github.com/WayneD/rsync/pull/558
+    ./configure.ac-fix-failing-IPv6-check.patch
+  ];
+
  buildInputs = [ libiconv zlib popt ]
    ++ lib.optional enableACLs acl
    ++ lib.optional enableZstd zstd