rsync: bump version

2026-04-23 12:10:06 +02:00 · 2023-06-03 19:16:57 +02:00
parent 9bae1f2873
commit 0572306a98
3 changed files with 99 additions and 91 deletions
--- a/net-misc/rsync/patches/rsync-3.2.7.patchset
+++ b/net-misc/rsync/patches/rsync-3.2.7.patchset
@@ -1,14 +1,14 @@
-From 33498c7b021a9834a42822a02985b9cd5110a0aa Mon Sep 17 00:00:00 2001
+From 8dcc4c2640a1910bbc4aeb2a2ac1d2e5173bbbb4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 25 Dec 2015 22:07:28 +0000
 Subject: Haiku patch


 diff --git a/configure.ac b/configure.ac
-index 1b32dfb..a9da74b 100644
+index a2c9955..14ae117 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -456,6 +456,9 @@ if test x"$ac_cv_func_connect" = x"no"; then
+@@ -697,6 +697,9 @@ if test x"$ac_cv_func_connect" = x"no"; then
 fi
 
 AC_SEARCH_LIBS(inet_ntop, resolv)
@@ -18,7 +18,7 @@ index 1b32dfb..a9da74b 100644
 
 # For OS X, Solaris, HP-UX, etc.: figure out if -liconv is needed.  We'll
 # accept either iconv_open or libiconv_open, since some include files map
-@@ -1047,6 +1050,12 @@ else
+@@ -1410,6 +1413,12 @@ else
 	AC_DEFINE(SUPPORT_XATTRS, 1)
 	AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])
 	;;
@@ -32,22 +32,22 @@ index 1b32dfb..a9da74b 100644
 	if test x"$enable_xattr_support" = x"yes"; then
 	    AC_MSG_ERROR(Failed to find extended attribute support)
 diff --git a/rsync.h b/rsync.h
-index 6e1e1dd..ff24175 100644
+index d3709fe..8282d62 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -443,7 +443,9 @@ enum delret {
- #ifdef MAKEDEV_TAKES_3_ARGS
+@@ -486,7 +486,9 @@ enum delret {
 #define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor)
 #else
+ #ifndef __TANDEM
 -#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor)
 +#define MAKEDEV(devmajor,devminor) ((dev_t)0)
 +#define major(dev) (0)
 +#define minor(dev) (0)
- #endif
- 
- #ifdef HAVE_COMPAT_H
+ #else
+ # define major DEV_TO_MAJOR
+ # define minor DEV_TO_MINOR
 diff --git a/testsuite/hands.test b/testsuite/hands.test
-index 46928d4..08a9eec 100644
+index 8e265b7..610ae79 100644
 --- a/testsuite/hands.test
 +++ b/testsuite/hands.test
@@ -15,7 +15,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
@@ -56,24 +56,9 @@ index 46928d4..08a9eec 100644
 
 -ln "$fromdir/filelist" "$fromdir/dir"
 +cp -p "$fromdir/filelist" "$fromdir/dir"
- runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
+ runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
 
 rm "$todir/text"
-diff --git a/testsuite/relative.test b/testsuite/relative.test
-index 686399e..c6e14dc 100644
--- a/testsuite/relative.test
-+++ b/testsuite/relative.test
-@@ -31,8 +31,8 @@ $RSYNC -ai --include=/down/ --exclude='/*' "$fromdir/" "$chkdir/"
- sleep 1
- runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$chkdir" "$todir"'
- 
-ln $deepstr/filelist $deepstr/dir
-ln ../chk/$deepstr/filelist ../chk/$deepstr/dir
-+cp -p $deepstr/filelist $deepstr/dir
-+cp -p ../chk/$deepstr/filelist ../chk/$deepstr/dir
- # Work around time rounding/truncating issue by touching both dirs.
- touch -r $deepstr/dir $deepstr/dir ../chk/$deepstr/dir
- runtest "hard links" 'checkit "$RSYNC -avHR ./$deepstr/ \"$todir\"" "$chkdir" "$todir"'
 -- 
-2.2.2
+2.37.3

--- a/net-misc/rsync/rsync-3.1.3.recipe
+++ b/net-misc/rsync/rsync-3.1.3.recipe
@@ -1,63 +0,0 @@
-SUMMARY="A utility for fast incremental file transfer"
-DESCRIPTION="rsync is a file transfer program for Unix systems. rsync uses the \
-'rsync algorithm' which provides a very fast method for bringing remote files \
-into sync. It does this by sending just the differences in the files across \
-the link, without requiring that both sets of files are present at one of the \
-ends of the link beforehand."
-HOMEPAGE="https://rsync.samba.org/"
-COPYRIGHT="1996-2013 by Andrew Tridgell, Wayne Davison, and others"
-LICENSE="GNU GPL v3"
-REVISION="1"
-SOURCE_URI="http://rsync.samba.org/ftp/rsync/src/rsync-$portVersion.tar.gz"
-CHECKSUM_SHA256="55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0"
-PATCHES="rsync-$portVersion.patchset"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	rsync = $portVersion compat >= 3
-	cmd:rsync = $portVersion compat >= 3
-	"
-REQUIRES="
-	haiku
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:find
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	"
-
-BUILD()
-{
-	aclocal
-	autoconf
-	runConfigure ./configure \
-		--enable-xattr-support \
-		--disable-iconv \
-		--disable-iconv-open \
-		--disable-locale \
-		--disable-debug \
-		--with-included-zlib=no
-
-	make reconfigure
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
--- a/net-misc/rsync/rsync-3.2.7.recipe
+++ b/net-misc/rsync/rsync-3.2.7.recipe
@@ -0,0 +1,86 @@
+SUMMARY="A utility for fast incremental file transfer"
+DESCRIPTION="rsync is a file transfer program for Unix systems. rsync uses the \
+'rsync algorithm' which provides a very fast method for bringing remote files \
+into sync. It does this by sending just the differences in the files across \
+the link, without requiring that both sets of files are present at one of the \
+ends of the link beforehand."
+HOMEPAGE="https://rsync.samba.org/"
+COPYRIGHT="1996-2022 by Andrew Tridgell, Wayne Davison, and others"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="http://rsync.samba.org/ftp/rsync/src/rsync-$portVersion.tar.gz"
+CHECKSUM_SHA256="4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb"
+PATCHES="rsync-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	rsync$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:rsync$commandSuffix = $portVersion compat >= 3
+	cmd:rsync_ssl$commandSuffix = $portVersion compat >= 3
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:liblz4$secondaryArchSuffix
+	lib:libxxhash$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libzstd$secondaryArchSuffix
+	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		rsync
+		"
+fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix
+	devel:liblz4$secondaryArchSuffix
+	devel:libxxhash$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libzstd$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage rsync$secondaryArchSuffix $commandBinDir/rsync
+
+BUILD()
+{
+	aclocal
+	autoconf
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
+		--enable-xattr-support \
+		--disable-iconv \
+		--disable-iconv-open \
+		--disable-locale \
+		--disable-debug \
+		--with-included-zlib=no
+
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}