diff options
author | xiota | 2022-11-13 02:27:17 -0800 |
---|---|---|
committer | xiota | 2022-11-13 03:14:53 -0800 |
commit | 288c4f412fb9fb5c4fb737203cef4265a57922e7 (patch) | |
tree | 439cd679cfbdb819268fce4b7592c0043e113824 | |
parent | f29762814fc642d5cb65d17d80f961776982f70d (diff) | |
download | aur-288c4f412fb9fb5c4fb737203cef4265a57922e7.tar.gz |
upgpkg: rsync-reflink 3.2.7-2: add detect-renamed patch
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | .gitignore | 6 | ||||
-rw-r--r-- | PKGBUILD | 25 |
3 files changed, 27 insertions, 14 deletions
@@ -1,7 +1,7 @@ pkgbase = rsync-reflink pkgdesc = A fast and versatile file copying tool for remote and local files - with reflink support pkgver = 3.2.7 - pkgrel = 1 + pkgrel = 2 url = https://rsync.samba.org/ arch = x86_64 license = GPL3 @@ -17,13 +17,19 @@ pkgbase = rsync-reflink depends = libxxhash.so depends = zlib depends = zstd + provides = rsync + conflicts = rsync backup = etc/rsyncd.conf backup = etc/xinetd.d/rsync - source = git+https://github.com/WayneD/rsync#tag=b13e7a8ef4fa430223f66403506fb821caae5cfd + source = git+https://github.com/WayneD/rsync#tag=v3.2.7 source = https://github.com/WayneD/rsync-patches/raw/master/clone-dest.diff + source = https://github.com/WayneD/rsync-patches/raw/master/detect-renamed.diff + source = https://github.com/WayneD/rsync-patches/raw/master/detect-renamed-lax.diff source = rsyncd.conf sha256sums = SKIP sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP sha256sums = 733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b pkgname = rsync-reflink diff --git a/.gitignore b/.gitignore index 590a2a3f52b5..624578c22214 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ pkg src -*.tar.* *.log -clone-dest.diff -rsync/ +*.tar.* +*.diff +rsync* @@ -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" |