rsync2: Update to v3.1.3dev-msys2.7.0-r3

This commit is contained in:
Joseph Benden
2017-07-14 11:41:01 -07:00
parent ec549593cd
commit 63e7f05439
3 changed files with 6 additions and 101 deletions

View File

@@ -1,7 +1,7 @@
# Maintainer: Joseph Benden <joe@benden.us>
pkgname=rsync2
pkgver=3.1.3dev_msys2.7.0_r2
pkgver=3.1.3dev_msys2.7.0_r3
pkgrel=0
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
@@ -13,22 +13,16 @@ makedepends=('msys2-w32api-headers' 'perl' 'yodl')
conflicts=('rsync')
provides=('rsync')
pkgsname=rsync
pkgsver="3.1.3dev-msys2.7.0-r2"
source=("https://codeload.github.com/jbenden/rsync/tar.gz/v3.1.3dev-msys2.7.0-r2"
"ssh-6-option.patch"
"check-debug_levels.patch"
"msys2-testsuite.patch")
sha256sums=('9e5e8931404d5d874046cabc7490daf77cd2614aabd3670e903528ef703629ea'
'ea88046d8935e7a597cca7379d21edffefa520792d896bd7ce663b4cdc0f2069'
'9b79e706eb8880be4600c1e7b93051a9e5ae068d732807d4b136ae0c54af8b3e'
'55adb27e5a5899553bb282944b6d73e1bead5d72c6fa5bd1a4037b08b54dec54')
pkgsver="3.1.3dev-msys2.7.0-r3"
source=("https://codeload.github.com/jbenden/rsync/tar.gz/v3.1.3dev-msys2.7.0-r3"
"ssh-6-option.patch")
sha256sums=('cbb854ede248bf62f8fc6eb43553dd7d6b30909f8dc290a1bc329e7fe6e30bc0'
'ea88046d8935e7a597cca7379d21edffefa520792d896bd7ce663b4cdc0f2069')
prepare() {
cd "${srcdir}/${pkgsname}-${pkgsver}"
patch -p1 -i ${srcdir}/ssh-6-option.patch
patch -p1 -i ${srcdir}/check-debug_levels.patch
patch -p1 -i ${srcdir}/msys2-testsuite.patch
autoreconf -fiv
}

View File

@@ -1,16 +0,0 @@
--- a/syscall.c 2017-06-29 13:25:21.707103000 -0700
+++ b/syscall.c 2017-06-29 13:25:47.096037500 -0700
@@ -485,13 +485,6 @@
(ffd.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
// is symlink!
isSymlink = 1;
- } else {
- if (DEBUG_GTE(TIME, 3)) {
- rprintf(FINFO, "do_lstat %S dwFileAttributes of 0x%x res0 0x%x\n",
- szFname,
- ffd.dwFileAttributes,
- ffd.dwReserved0);
- }
}
CloseHandle(hFind);
}

View File

@@ -1,73 +0,0 @@
--- a/testsuite/rsync.fns 2017-04-19 12:14:33.343959000 -0700
+++ b/testsuite/rsync.fns 2017-06-29 14:08:54.075718600 -0700
@@ -357,7 +357,8 @@
}
# Determine what shell command will appropriately test for links.
-ln -s foo "$scratchdir/testlink"
+touch "$scratchdir/foo"
+ln -s "$scratchdir/foo" "$scratchdir/testlink"
for cmd in test /bin/test /usr/bin/test /usr/ucb/bin/test /usr/ucb/test
do
for switch in -h -L
@@ -373,7 +374,7 @@
done
# ok, now get rid of it
rm "$scratchdir/testlink"
-
+rm "$scratchdir/foo"
if [ "x$TEST_SYMLINK_CMD" = 'x' ]
then
--- a/testsuite/daemon.test.orig 2017-06-29 14:39:22.348185100 -0700
+++ b/testsuite/daemon.test 2017-06-29 14:39:40.582379800 -0700
@@ -21,6 +21,10 @@
. "$suitedir/rsync.fns"
+case "`uname -s`" in
+ MSYS_NT*) test_skipped "Can't test on MSYS2";;
+esac
+
chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
--- a/testsuite/exclude.test.orig 2017-06-29 14:32:41.906903100 -0700
+++ b/testsuite/exclude.test 2017-06-29 14:35:59.810040100 -0700
@@ -12,6 +12,10 @@
. "$suitedir/rsync.fns"
+case "`uname -s`" in
+ MSYS_NT*) test_skipped "Can't test on MSYS2";;
+esac
+
CVSIGNORE='*.junk'
export CVSIGNORE
--- a/testsuite/executability.test.orig 2017-06-29 14:36:31.680000700 -0700
+++ b/testsuite/executability.test 2017-06-29 14:36:54.257392900 -0700
@@ -7,6 +7,10 @@
. $suitedir/rsync.fns
+case "`uname -s`" in
+ MSYS_NT*) test_skipped "Can't test on MSYS2";;
+esac
+
# Put some files in the From directory
mkdir "$fromdir"
cat <<EOF >"$fromdir/1"
--- a/testsuite/itemize.test.orig 2017-06-29 14:37:25.666094600 -0700
+++ b/testsuite/itemize.test 2017-06-29 14:37:43.983984200 -0700
@@ -10,6 +10,10 @@
. "$suitedir/rsync.fns"
+case "`uname -s`" in
+ MSYS_NT*) test_skipped "Can't test on MSYS2";;
+esac
+
to2dir="$tmpdir/to2"
chkfile="$scratchdir/rsync.chk"