rsync - update from 3.3.0 to 3.4.0

omniosorg · Jan 14, 2025 · aed85d7 · aed85d7
1 parent d4119d1
commit aed85d7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/build/rsync/build.sh b/build/rsync/build.sh
@@ -13,12 +13,12 @@
 # }}}
 #
 # Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=rsync
-VER=3.3.0
+VER=3.4.0
 PKG=network/rsync
 SUMMARY="rsync - faster, flexible replacement for rcp"
 DESC="An open source utility that provides fast incremental file transfer"

diff --git a/build/rsync/patches/gcc14.patch b/build/rsync/patches/gcc14.patch
@@ -1,12 +1,13 @@
-diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
---- a~/configure.ac	1970-01-01 00:00:00
-+++ a/configure.ac	1970-01-01 00:00:00
-@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--main()
-+int main(void)
+diff --git a/popt/findme.c b/popt/findme.c
+index ac4cbae..65f6ebc 100644
+--- a/popt/findme.c
++++ b/popt/findme.c
+@@ -9,6 +9,8 @@
+ #include "system.h"
+ #include "findme.h"
+
++#include <alloca.h>
++
+ const char * findProgramPath(const char * argv0)
  {
-    if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-      exit(1);
+     char * path = getenv("PATH");
diff --git a/build/rsync/testsuite.log b/build/rsync/testsuite.log
@@ -35,6 +35,7 @@ PASS    missing
 PASS    mkpath
 SKIP    protected-regular (Can't find protected_regular setting (only available on Linux))
 PASS    relative
+PASS    safe-links
 PASS    ssh-basic
 PASS    symlink-ignore
 PASS    trimslash
@@ -45,6 +46,6 @@ PASS    xattrs-hlink
 PASS    xattrs
 ------------------------------------------------------------
 ----- overall results:
-      39 passed
+      40 passed
       6 skipped
 ------------------------------------------------------------
diff --git a/doc/packages.md b/doc/packages.md
@@ -69,7 +69,7 @@
 | meta/data/microcode/intel		| 20241112		| https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases
 | network/dns/bind			| 9.18.32		| https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/
 | network/openssh			| 9.9p1			| https://www.mirrorservice.org/pub/OpenBSD/OpenSSH/portable/
-| network/rsync				| 3.3.0			| https://rsync.samba.org/
+| network/rsync				| 3.4.0			| https://rsync.samba.org/
 | network/service/isc-dhcp		| 4.4.3-P1		| https://ftp.isc.org/isc/dhcp/ https://www.isc.org/downloads/
 | network/socat				| 1.8.0.2		| http://www.dest-unreach.org/socat/download/
 | network/test/iperf			| 3.18			| https://github.com/esnet/iperf/releases