summaryrefslogtreecommitdiff
path: root/system/rsync
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-03-10 02:44:11 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-03-10 02:44:11 +0000
commitb2b91cc7b341c21dd2754f766e3688d1cd8683cd (patch)
tree89eb840eb4db48f40d8e3b4315b883b108d3b71e /system/rsync
parent757c7417918541af9e656e023b2ead86998a07d9 (diff)
parent2da62e2b9ab827bf6930e008d51cd0ab468dbd1b (diff)
downloadpackages-b2b91cc7b341c21dd2754f766e3688d1cd8683cd.tar.gz
packages-b2b91cc7b341c21dd2754f766e3688d1cd8683cd.tar.bz2
packages-b2b91cc7b341c21dd2754f766e3688d1cd8683cd.tar.xz
packages-b2b91cc7b341c21dd2754f766e3688d1cd8683cd.zip
Merge branch 'cves.2020.02.28' into 'master'
CVE patches for 2020.02.28 See merge request adelie/packages!408
Diffstat (limited to 'system/rsync')
-rw-r--r--system/rsync/APKBUILD14
1 files changed, 11 insertions, 3 deletions
diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD
index e93da8552..728a32fbc 100644
--- a/system/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=rsync
pkgver=3.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="File transfer program to keep remote files in sync"
url="https://rsync.samba.org/"
arch="all"
license="GPL-3.0+"
depends=""
checkdepends="fakeroot"
-makedepends="perl acl-dev attr-dev popt-dev"
+makedepends="perl acl-dev attr-dev popt-dev zlib-dev"
subpackages="$pkgname-doc $pkgname-openrc rrsync::noarch"
source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
rsyncd.initd
@@ -18,6 +18,13 @@ source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
rsyncd.logrotate
"
+# secfixes:
+# 3.1.3-r2:
+# - CVE-2016-9840
+# - CVE-2016-9841
+# - CVE-2016-9842
+# - CVE-2016-9843
+
build() {
# Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
CFLAGS="$CFLAGS -DINET6" \
@@ -29,7 +36,8 @@ build() {
--mandir=/usr/share/man \
--localstatedir=/var \
--enable-acl-support \
- --enable-xattr-support
+ --enable-xattr-support \
+ --with-included-zlib=no
make
}