diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 65 | ||||
| -rw-r--r-- | rsync.xinetd | 11 | ||||
| -rw-r--r-- | rsyncd.service | 9 | ||||
| -rw-r--r-- | rsyncd.socket | 10 | ||||
| -rw-r--r-- | rsyncd@.service | 11 |
6 files changed, 45 insertions, 87 deletions
@@ -1,33 +1,31 @@ pkgbase = rsync-git - pkgdesc = A file transfer program to keep remote files in sync - git checkout - pkgver = 3.1.1.r0.g7cb0de6 + pkgdesc = A fast and versatile file copying tool for remote and local files - git checkout + pkgver = 3.2.3.r47.gec1d5d56 pkgrel = 1 - url = http://rsync.samba.org/ + url = https://rsync.samba.org/ arch = i686 arch = x86_64 license = GPL3 makedepends = git - makedepends = yodl + makedepends = python-commonmark + depends = acl + depends = libacl.so + depends = lz4 + depends = openssl depends = perl depends = popt - depends = acl + depends = xxhash + depends = libxxhash.so depends = zlib + depends = zstd provides = rsync conflicts = rsync backup = etc/rsyncd.conf backup = etc/xinetd.d/rsync - source = git://git.samba.org/rsync.git + source = git+https://github.com/WayneD/rsync source = rsyncd.conf - source = rsync.xinetd - source = rsyncd.service - source = rsyncd.socket - source = rsyncd@.service sha256sums = SKIP sha256sums = 733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b - sha256sums = da0ec9ce07bf2edafbc8e44020da29a58038b00c3048a22de57017c56318a767 - sha256sums = a227bf3c2218e0de1e7396751244ea92dd410600a6469f283f0fa3bead56cd0a - sha256sums = 551f17407de0e539c8419fc2cd48dd0124eb0253a186690b165b51703ffad1a5 - sha256sums = b8ab53dde01be38e57f49d29941841249eb74a9f137ff2e28cc985acc5199492 pkgname = rsync-git @@ -5,67 +5,68 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rsync-git -pkgver=3.1.1.r0.g7cb0de6 +pkgver=3.2.3.r47.gec1d5d56 pkgrel=1 -pkgdesc="A file transfer program to keep remote files in sync - git checkout" +pkgdesc='A fast and versatile file copying tool for remote and local files - git checkout' arch=('i686' 'x86_64') -url="http://rsync.samba.org/" +url='https://rsync.samba.org/' license=('GPL3') -depends=('perl' 'popt' 'acl' 'zlib') -makedepends=('git' 'yodl') +depends=('acl' 'libacl.so' 'lz4' 'openssl' 'perl' 'popt' 'xxhash' 'libxxhash.so' + 'zlib' 'zstd') +makedepends=('git' 'python-commonmark') provides=('rsync') conflicts=('rsync') -backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') -source=('git://git.samba.org/rsync.git' - 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' - 'rsyncd.socket' 'rsyncd@.service') +backup=('etc/rsyncd.conf' + 'etc/xinetd.d/rsync') +source=("git+https://github.com/WayneD/rsync" + 'rsyncd.conf') sha256sums=('SKIP' - '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b' - 'da0ec9ce07bf2edafbc8e44020da29a58038b00c3048a22de57017c56318a767' - 'a227bf3c2218e0de1e7396751244ea92dd410600a6469f283f0fa3bead56cd0a' - '551f17407de0e539c8419fc2cd48dd0124eb0253a186690b165b51703ffad1a5' - 'b8ab53dde01be38e57f49d29941841249eb74a9f137ff2e28cc985acc5199492') + '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b') pkgver() { - cd rsync/ + cd "$srcdir/rsync" if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then - echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")" + printf '%s.r%s.g%s' \ + "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \ + "$(git rev-list --count ${GITTAG}..)" \ + "$(git rev-parse --short HEAD)" else - echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")" + printf '0.r%s.g%s' \ + "$(git rev-list --count master)" \ + "$(git rev-parse --short HEAD)" fi } build() { - cd rsync/ + cd "$srcdir/rsync" - ./prepare-source - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ + --disable-debug \ --with-included-popt=no \ - --with-included-zlib=no \ - --enable-acl-support \ - --enable-xattr-support \ - --disable-debug + --with-included-zlib=no make } check() { - cd rsync/ + cd "$srcdir/rsync" make test } package() { - cd rsync + cd "$srcdir/rsync" make DESTDIR="${pkgdir}" install - install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" - install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" - install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" - install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" - install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service" - install -Dm755 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/rsync@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service" + install -Dm0755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" } diff --git a/rsync.xinetd b/rsync.xinetd deleted file mode 100644 index f5b6b1ed59b5..000000000000 --- a/rsync.xinetd +++ /dev/null @@ -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 -} diff --git a/rsyncd.service b/rsyncd.service deleted file mode 100644 index 8502c08cf73b..000000000000 --- a/rsyncd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=A file transfer program to keep remote files in sync - -[Service] -ExecStart=/usr/bin/rsync --daemon --no-detach -RestartSec=1 - -[Install] -WantedBy=multi-user.target diff --git a/rsyncd.socket b/rsyncd.socket deleted file mode 100644 index 2b9a9643ba14..000000000000 --- a/rsyncd.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Rsync Socket -Conflicts=rsyncd.service - -[Socket] -ListenStream=873 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/rsyncd@.service b/rsyncd@.service deleted file mode 100644 index 33db95c4c113..000000000000 --- a/rsyncd@.service +++ /dev/null @@ -1,11 +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 -User=nobody -Group=nobody |