diff options
| author | snj <snj@pkgsrc.org> | 2018-01-27 04:21:18 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2018-01-27 04:21:18 +0000 |
| commit | d4d9111d7166360978e02644a585532c99a1f458 (patch) | |
| tree | 68da71d5c958d0191f83f7fb8f53fa7570f02260 /net/rsync | |
| parent | 4183e859c8e84449332a5dc4f3bd8f71f657bead (diff) | |
| download | pkgsrc-d4d9111d7166360978e02644a585532c99a1f458.tar.gz | |
Fix CVE-2018-5764.
Bump PKGREVISION to 3.
Diffstat (limited to 'net/rsync')
| -rw-r--r-- | net/rsync/Makefile | 4 | ||||
| -rw-r--r-- | net/rsync/distinfo | 3 | ||||
| -rw-r--r-- | net/rsync/patches/patch-options.c | 27 |
3 files changed, 31 insertions, 3 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index b9553a50ed8..827db7bb802 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.106 2017/12/31 20:55:43 snj Exp $ +# $NetBSD: Makefile,v 1.107 2018/01/27 04:21:18 snj Exp $ DISTNAME= rsync-3.1.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= http://rsync.samba.org/ftp/rsync/ MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/ diff --git a/net/rsync/distinfo b/net/rsync/distinfo index ae95a80aabb..7c94dd3c7e7 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2017/12/31 20:55:43 snj Exp $ +$NetBSD: distinfo,v 1.47 2018/01/27 04:21:18 snj Exp $ SHA1 (rsync-3.1.2.tar.gz) = 0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a RMD160 (rsync-3.1.2.tar.gz) = f7d6c0c9752af8d9eb933cffc6032c1763490a04 @@ -7,6 +7,7 @@ Size (rsync-3.1.2.tar.gz) = 892724 bytes SHA1 (patch-Makefile.in) = df3479e93de86524a391433a3d6e6108a797835a SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2 SHA1 (patch-authenticate.c) = 0612fb141cea1509b882df78f1b90fa52b1092b0 +SHA1 (patch-options.c) = f5c163f457bf108cd9646d09f1253583326cc000 SHA1 (patch-receiver.c) = 5bf0b7ceaaf79e0fd5f93e1c433162e9248fe37c SHA1 (patch-rsync.c) = e390038a9592d9bc3e77ebc2aabfa62bdd6778b3 SHA1 (patch-xattrs.c) = 9883ea79a60c786dd5a3dc74f4872621823c9377 diff --git a/net/rsync/patches/patch-options.c b/net/rsync/patches/patch-options.c new file mode 100644 index 00000000000..d56b05a389b --- /dev/null +++ b/net/rsync/patches/patch-options.c @@ -0,0 +1,27 @@ +$NetBSD: patch-options.c,v 1.1 2018/01/27 04:21:18 snj Exp $ + +Fix CVE-2018-5764. Patch from: + +https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff;h=7706303828fcde524222babb2833864a4bd09e07 + +--- options.c.orig 2018-01-26 20:08:22.204810417 -0800 ++++ options.c 2018-01-26 20:09:37.250284871 -0800 +@@ -1294,6 +1294,7 @@ int parse_arguments(int *argc_p, const c + const char *arg, **argv = *argv_p; + int argc = *argc_p; + int opt; ++ int orig_protect_args = protect_args; + + if (ref && *ref) + set_refuse_options(ref); +@@ -1903,6 +1904,10 @@ int parse_arguments(int *argc_p, const c + if (fuzzy_basis > 1) + fuzzy_basis = basis_dir_cnt + 1; + ++ /* Don't let the client reset protect_args if it was already processed */ ++ if (orig_protect_args == 2 && am_server) ++ protect_args = orig_protect_args; ++ + if (protect_args == 1 && am_server) + return 1; + |