Date: Friday, June 19, 2020 @ 22:03:39 Author: eworm Revision: 389561
upgpkg: rsync 3.2.0-1 new upstream release Modified: rsync/trunk/PKGBUILD rsync/trunk/rsync.install Deleted: rsync/trunk/0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch rsync/trunk/rsync.xinetd rsync/trunk/rsyncd.service rsync/trunk/rsyncd.socket rsync/trunk/[email protected] -------------------------------------------------------+ 0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch | 19 ----- PKGBUILD | 60 ++++++---------- rsync.install | 10 +- rsync.xinetd | 11 -- rsyncd.service | 14 --- rsyncd.socket | 10 -- [email protected] | 13 --- 7 files changed, 29 insertions(+), 108 deletions(-) Deleted: 0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch =================================================================== --- 0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch 2020-06-19 20:58:59 UTC (rev 389560) +++ 0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,19 +0,0 @@ -commit c90b87e021709be78853354bd7776acfdd1c95d9 -Author: Wayne Davison <[email protected]> -Date: Fri Jan 4 21:43:50 2019 -0800 - - Avoid a failed test if dirs report 1 hlink (e.g. WSL weirdness). - -diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test -index f7d9a6df..86165e0c 100644 ---- a/testsuite/xattrs.test -+++ b/testsuite/xattrs.test -@@ -163,7 +163,7 @@ checkit "$RSYNC -aiX $XFILT $dashH --fake-super --link-dest=../chk . ../to" "$ch - cd "$todir" - xls $dirs $files | diff $diffopt "$scratchdir/xattrs.txt" - - --sed -n -e '/^[^ ][^ ]* *[^ ][^ ]* *[^ ][^ ]* *1 /p' "$scratchdir/ls-to" >"$scratchdir/ls-diff-all" -+sed -n -e '/^[^d ][^ ]* *[^ ][^ ]* *[^ ][^ ]* *1 /p' "$scratchdir/ls-to" >"$scratchdir/ls-diff-all" - fgrep -v './file1' "$scratchdir/ls-diff-all" >"$scratchdir/ls-diff" || : - if [ -s "$scratchdir/ls-diff" ]; then - echo "Missing hard links on:" Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-19 20:58:59 UTC (rev 389560) +++ PKGBUILD 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,62 +1,50 @@ +# Maintainer: Christian Hesse <[email protected]> pkgname=rsync -pkgver=3.1.3 -pkgrel=3 -pkgdesc="A file transfer program to keep remote files in sync" +_tag='affe6786e63ef638af993a0ba788c62e047accb8' # git rev-parse v${pkgver} +pkgver=3.2.0 +pkgrel=1 +pkgdesc='A fast and versatile file copying tool for remote and local files' arch=('x86_64') -url="https://rsync.samba.org/"; +url='https://rsync.samba.org/' license=('GPL3') -depends=('acl' 'perl' 'popt' 'zlib') -backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') +depends=('acl' 'libacl.so' 'lz4' 'openssl' 'perl' 'popt' 'xxhash' 'libxxhash.so' + 'zlib' 'zstd') +makedepends=('git' 'python-commonmark') +backup=('etc/rsyncd.conf' + 'etc/xinetd.d/rsync') install=rsync.install validpgpkeys=('0048C8B026D4C96F0E589C2F6C859FB14B96A8C5') # Wayne Davison <[email protected]> -source=("https://rsync.samba.org/ftp/rsync/src/$pkgname-$pkgver.tar.gz"{,.asc} - '0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch' - 'rsyncd.conf' - 'rsync.xinetd' - 'rsyncd.service' - 'rsyncd.socket' - '[email protected]') -sha256sums=('55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0' - 'SKIP' - 'efd0a969820ed23167dd3cd39114a5135b19eaaf1c0efc87b46a53d097a82405' - '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b' - 'da0ec9ce07bf2edafbc8e44020da29a58038b00c3048a22de57017c56318a767' - '6ad010a1f85f5637bdd0972403c032ca30d71608a36943c71c34ba1c5b463cd6' - '551f17407de0e539c8419fc2cd48dd0124eb0253a186690b165b51703ffad1a5' - '21983037aa116943b89ec982bc88e02c12376763e46f5ab25944cc1da29235ae') +source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"; + 'rsyncd.conf') +sha256sums=('SKIP' + '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b') -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 < ../0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch -} - build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/rsync" ./configure \ --prefix=/usr \ + --disable-debug \ --with-included-popt=no \ - --with-included-zlib=no \ - --disable-debug + --with-included-zlib=no make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/rsync" make test } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/rsync" make DESTDIR="$pkgdir" install install -Dm0644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" - install -Dm0644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" - install -Dm0644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" - install -m0644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" - install -m0644 ../[email protected] "$pkgdir/usr/lib/systemd/system/[email protected]" + 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" } Modified: rsync.install =================================================================== --- rsync.install 2020-06-19 20:58:59 UTC (rev 389560) +++ rsync.install 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,14 +1,14 @@ #!/bin/sh post_upgrade() { - # return if old package version greater 3.1.2-5... - (( $(vercmp "$2" '3.1.2-5') > 0 )) && return + # return if old package version greater 3.1.99... + (( $(vercmp "$2" '3.1.99') > 0 )) && return 0 # return if neither service nor socket is enabled... systemctl -q is-enabled rsyncd.service rsyncd.socket || return 0 - echo ' > For security reasons the rsyncd service protects the system by making' - echo ' > paths /boot, /etc and /usr read-only. If you need write access use' - echo ' > rsync via ssh or see the wiki for instructions to override:' + echo ' > The rsync package now uses upstream systemd units, which also protect' + echo ' > home directories (/root and /home). If you need access use rsync' + echo ' > via ssh (recommended) or see the wiki for instructions to override:' echo ' > https://wiki.archlinux.org/index.php/Rsync#rsync_daemon' } Deleted: rsync.xinetd =================================================================== --- rsync.xinetd 2020-06-19 20:58:59 UTC (rev 389560) +++ rsync.xinetd 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,11 +0,0 @@ -service rsync -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/rsync - server_args = --daemon - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Deleted: rsyncd.service =================================================================== --- rsyncd.service 2020-06-19 20:58:59 UTC (rev 389560) +++ rsyncd.service 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,14 +0,0 @@ -[Unit] -Description=A file transfer program to keep remote files in sync -After=network.target - -[Service] -ExecStart=/usr/bin/rsync --daemon --no-detach -RestartSec=1 -ProtectSystem=full -ProtectHome=off -PrivateDevices=on -NoNewPrivileges=on - -[Install] -WantedBy=multi-user.target Deleted: rsyncd.socket =================================================================== --- rsyncd.socket 2020-06-19 20:58:59 UTC (rev 389560) +++ rsyncd.socket 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,10 +0,0 @@ -[Unit] -Description=Rsync Socket -Conflicts=rsyncd.service - -[Socket] -ListenStream=873 -Accept=true - -[Install] -WantedBy=sockets.target Deleted: [email protected] =================================================================== --- [email protected] 2020-06-19 20:58:59 UTC (rev 389560) +++ [email protected] 2020-06-19 22:03:39 UTC (rev 389561) @@ -1,13 +0,0 @@ -[Unit] -Description=A file transfer program to keep remote files in sync -After=network.target - -[Service] -ExecStart=-/usr/bin/rsync --daemon -StandardInput=socket -StandardOutput=inherit -StandardError=journal -ProtectSystem=full -ProtectHome=off -PrivateDevices=on -NoNewPrivileges=on
