aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-08-05 21:31:52 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-08-15 15:48:06 +0000
commit4998b609e9a4ad588bc3f7cc04b245b77cd93bd0 (patch)
treef5c1de1331172341156d4bb530eebf18a3ccd103
parent7157efb35c7aec96d7a0c5270923aa046c69be15 (diff)
main/rsync: use supervise-daemon for running rsyncd, fix license
-rw-r--r--main/rsync/APKBUILD11
-rw-r--r--main/rsync/rsyncd.confd2
-rw-r--r--main/rsync/rsyncd.initd11
3 files changed, 13 insertions, 11 deletions
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 51e711ff471..0349320c313 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=rsync
pkgver=3.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="A file transfer program to keep remote files in sync"
url="https://rsync.samba.org/"
arch="all"
options="!checkroot"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
makedepends="perl acl-dev attr-dev popt-dev"
subpackages="$pkgname-doc $pkgname-openrc rrsync"
-source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://download.samba.org/pub/rsync/rsync-$pkgver.tar.gz
rsyncd.initd
rsyncd.confd
rsyncd.conf
rsyncd.logrotate
"
-builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
# 3.1.2-r7:
@@ -74,7 +73,7 @@ rrsync() {
}
sha512sums="8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 rsync-3.1.3.tar.gz
-638d87c9a753b35044f6321ccd09d2c0addaab3c52c40863eb6905905576b5268bec67b496df81225528c9e39fbd92e9225d7b3037ab1fda78508d452c78158f rsyncd.initd
-c7527e289c81bee5e4c14b890817cdb47d14f0d26dd8dcdcbe85c7199cf27c57a0b679bdd1b115bfe00de77b52709cc5d97522a47f63c1bb5104f4a7220c9961 rsyncd.confd
+a970a1a991df32ea28678791d6599f3302e32e2c5c53f44fae567c191db7951bc07e4001f34864fec63e0005dcaa5dc939e77edf652481ff8820e7f422895dfb rsyncd.initd
+94308fa7c0f80156d0863a446ec4630afeafed7b458c6c83e93aba41192327d113b712cde875ce2967bc98cd8fb6a9ebc57841d58ae9759aa232643fb72fb005 rsyncd.confd
3db8a2b364fc89132af6143af90513deb6be3a78c8180d47c969e33cb5edde9db88aad27758a6911f93781e3c9846aeadc80fffc761c355d6a28358853156b62 rsyncd.conf
b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 rsyncd.logrotate"
diff --git a/main/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
index 7128f97fde8..6cf9f3c6bdd 100644
--- a/main/rsync/rsyncd.confd
+++ b/main/rsync/rsyncd.confd
@@ -5,4 +5,4 @@
# See man pages for rsync or run `rsync --daemon --help`
# for valid cmdline options.
-#command_args=""
+#RSYNC_OPTS=""
diff --git a/main/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index eb05b3b59ea..8d60a9399af 100644
--- a/main/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
@@ -1,13 +1,16 @@
#!/sbin/openrc-run
+supervisor=supervise-daemon
+
: ${cfgfile:="/etc/rsyncd.conf"}
+name="rsync daemon"
+description="A file transfer program to keep remote files in sync"
+
command="/usr/bin/rsync"
-command_args="--daemon --no-detach --config=$cfgfile
- $command_args $RSYNC_OPTS"
-command_background="yes"
+command_args="--daemon --config=$cfgfile $RSYNC_OPTS"
+command_args_foreground="--no-detach"
-pidfile="/run/$RC_SVCNAME.pid"
required_files="$cfgfile"
depend() {