Skip to content

Commit 34460ac

Browse files
authored
Merge pull request #3804 from citrus-it/pkgrsyncr52
rsync - update from 3.3.0 to 3.4.0 (r151052)
2 parents 1e27886 + 55e2100 commit 34460ac

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

build/rsync/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# }}}
1414
#
1515
# Copyright 2011-2012 OmniTI Computer Consulting, Inc. All rights reserved.
16-
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
16+
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
1717

1818
. ../../lib/build.sh
1919

2020
PROG=rsync
21-
VER=3.3.0
21+
VER=3.4.0
2222
PKG=network/rsync
2323
SUMMARY="rsync - faster, flexible replacement for rcp"
2424
DESC="An open source utility that provides fast incremental file transfer"

build/rsync/patches/gcc14.patch

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
2-
--- a~/configure.ac 1970-01-01 00:00:00
3-
+++ a/configure.ac 1970-01-01 00:00:00
4-
@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable
5-
#include <stdlib.h>
6-
#include <sys/types.h>
7-
#include <sys/socket.h>
8-
-main()
9-
+int main(void)
1+
diff --git a/popt/findme.c b/popt/findme.c
2+
index ac4cbae..65f6ebc 100644
3+
--- a/popt/findme.c
4+
+++ b/popt/findme.c
5+
@@ -9,6 +9,8 @@
6+
#include "system.h"
7+
#include "findme.h"
8+
9+
+#include <alloca.h>
10+
+
11+
const char * findProgramPath(const char * argv0)
1012
{
11-
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
12-
exit(1);
13+
char * path = getenv("PATH");

build/rsync/testsuite.log

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ PASS missing
3535
PASS mkpath
3636
SKIP protected-regular (Can't find protected_regular setting (only available on Linux))
3737
PASS relative
38+
PASS safe-links
3839
PASS ssh-basic
3940
PASS symlink-ignore
4041
PASS trimslash
@@ -45,6 +46,6 @@ PASS xattrs-hlink
4546
PASS xattrs
4647
------------------------------------------------------------
4748
----- overall results:
48-
39 passed
49+
40 passed
4950
6 skipped
5051
------------------------------------------------------------

0 commit comments

Comments
 (0)