Date: Monday, September 26, 2022 @ 07:25:47 Author: eworm Revision: 456798
upgpkg: rsync 3.2.6-2: cherry-pick upstream fixes https://www.mail-archive.com/rsync%40lists.samba.org/msg33576.html Modified: rsync/trunk/PKGBUILD ----------+ PKGBUILD | 65 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-26 07:03:20 UTC (rev 456797) +++ PKGBUILD 2022-09-26 07:25:47 UTC (rev 456798) @@ -3,7 +3,7 @@ pkgname=rsync _tag='40695f1e31d29e5d715d986a53cdad1fe0ce0210' # git rev-parse v${pkgver} pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc='A fast and versatile file copying tool for remote and local files' arch=('x86_64') url='https://rsync.samba.org/' @@ -20,31 +20,60 @@ sha256sums=('SKIP' '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b') +_backports=( + # Fix really silly bug with --relative rules. + '464555ea923b32f3504678d05bc7de9205e5c8da' + + # Fix bug with validing remote filter rules. + '950730313de994d191ba2d5be575e97690b355e8' +) + +_reverts=( +) + +prepare() { + cd "$srcdir/rsync" + + local _c + for _c in "${_backports[@]}"; do + if [[ $_c == *..* ]]; then + git log --oneline --reverse "${_c}" + else + git log --oneline -1 "${_c}" + fi + git cherry-pick -n -m1 "${_c}" + done + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done +} + build() { - cd "$srcdir/rsync" + cd "$srcdir/rsync" - ./configure \ - --prefix=/usr \ - --disable-debug \ - --with-included-popt=no \ - --with-included-zlib=no - make + ./configure \ + --prefix=/usr \ + --disable-debug \ + --with-included-popt=no \ + --with-included-zlib=no + make } check() { - cd "$srcdir/rsync" + cd "$srcdir/rsync" - make test + make test } package() { - cd "$srcdir/rsync" + cd "$srcdir/rsync" - make DESTDIR="$pkgdir" install - install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" - install -Dm0644 packaging/lsb/rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" - install -Dm0644 packaging/systemd/rsync.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" - install -Dm0644 packaging/systemd/rsync.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" - install -Dm0644 packaging/systemd/[email protected] "$pkgdir/usr/lib/systemd/system/[email protected]" - install -Dm0755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" + make DESTDIR="$pkgdir" install + install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" + install -Dm0644 packaging/lsb/rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" + install -Dm0644 packaging/systemd/rsync.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" + install -Dm0644 packaging/systemd/rsync.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" + install -Dm0644 packaging/systemd/[email protected] "$pkgdir/usr/lib/systemd/system/[email protected]" + install -Dm0755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" }
