Skip to content

Commit

Permalink
Merge pull request #3804 from citrus-it/pkgrsyncr52
Browse files Browse the repository at this point in the history
rsync - update from 3.3.0 to 3.4.0 (r151052)
  • Loading branch information
citrus-it authored Jan 14, 2025
2 parents 1e27886 + 55e2100 commit 34460ac
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build/rsync/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 12 additions & 11 deletions build/rsync/patches/gcc14.patch
Original file line number Diff line number Diff line change
@@ -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");
3 changes: 2 additions & 1 deletion build/rsync/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,6 +46,6 @@ PASS xattrs-hlink
PASS xattrs
------------------------------------------------------------
----- overall results:
39 passed
40 passed
6 skipped
------------------------------------------------------------

0 comments on commit 34460ac

Please sign in to comment.