upgpkg: rsync-reflink 3.2.7-2: add detect-renamed patch

1 files changed, 16 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7dd39ab13145..9bf73e90c6a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,31 @@ _pkgname=rsync
 pkgname=rsync-reflink
 _tag='b13e7a8ef4fa430223f66403506fb821caae5cfd' # git rev-parse v${pkgver}
 pkgver=3.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast and versatile file copying tool for remote and local files - with reflink support'
 arch=('x86_64')
 url='https://rsync.samba.org/'
 license=('GPL3')
 depends=('acl' 'libacl.so' 'lz4' 'openssl' 'perl' 'popt' 'xxhash' 'libxxhash.so' 'zlib' 'zstd')
 makedepends=('git' 'python-commonmark')
+provides=("${_pkgname}")
+conflicts=(${provides[@]})
 backup=(
   'etc/rsyncd.conf'
   'etc/xinetd.d/rsync'
 )
 source=(
-  "git+https://github.com/WayneD/rsync#tag=${_tag}"
+  "git+https://github.com/WayneD/rsync#tag=v${pkgver}"
   'https://github.com/WayneD/rsync-patches/raw/master/clone-dest.diff'
+  'https://github.com/WayneD/rsync-patches/raw/master/detect-renamed.diff'
+  'https://github.com/WayneD/rsync-patches/raw/master/detect-renamed-lax.diff'
   'rsyncd.conf'
 )
 sha256sums=(
   'SKIP'
   'SKIP'
+  'SKIP'
+  'SKIP'
   '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b'
 )
 
@@ -33,7 +39,7 @@ _reverts=(
 )
 
 prepare() {
-  cd "$srcdir/rsync"
+  cd "${srcdir}/${_pkgname}"
 
   local _c
   for _c in "${_backports[@]}"; do
@@ -49,12 +55,14 @@ prepare() {
     git revert -n "${_c}"
   done
 
-  # patch to add reflink support
-  patch -p1 < "$srcdir/clone-dest.diff"
+  # patches
+  patch -Np1 -F100 -i "$srcdir/clone-dest.diff"
+  patch -Np1 -F100 -i "$srcdir/detect-renamed.diff"
+  patch -Np1 -F100 -i "$srcdir/detect-renamed-lax.diff"
 }
 
 build() {
-  cd "$srcdir/rsync"
+  cd "${srcdir}/${_pkgname}"
 
   ./configure \
     --prefix=/usr \
@@ -65,13 +73,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/rsync"
-
+  cd "${srcdir}/${_pkgname}"
   make test
 }
 
 package() {
-  cd "$srcdir/rsync"
+  cd "${srcdir}/${_pkgname}"
 
   make DESTDIR="$pkgdir" install
   install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"