diff options
Diffstat (limited to 'meta/recipes-devtools/rsync')
-rw-r--r-- | meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 71 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync_2.6.9.bb | 15 |
3 files changed, 0 insertions, 101 deletions
diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch deleted file mode 100644 index bea325ea05..0000000000 --- a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ] -CVE: CVE-2007-4091 - -The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to -address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 - -Date: Tue May 10 10:07:36 2011 +0800 -Dexuan Cui <dexuan.cui@intel.com> - -diff --git a/sender.c b/sender.c -index 6fcaa65..053a8f1 100644 ---- a/sender.c -+++ b/sender.c -@@ -123,6 +123,7 @@ void successful_send(int ndx) - char fname[MAXPATHLEN]; - struct file_struct *file; - unsigned int offset; -+ size_t l = 0; - - if (ndx < 0 || ndx >= the_file_list->count) - return; -@@ -133,6 +134,20 @@ void successful_send(int ndx) - file->dir.root, "/", NULL); - } else - offset = 0; -+ -+ l = offset + 1; -+ if (file) { -+ if (file->dirname) -+ l += strlen(file->dirname); -+ if (file->basename) -+ l += strlen(file->basename); -+ } -+ -+ if (l >= sizeof(fname)) { -+ rprintf(FERROR, "Overlong pathname\n"); -+ exit_cleanup(RERR_FILESELECT); -+ } -+ - f_name(file, fname + offset); - if (remove_source_files) { - if (do_unlink(fname) == 0) { -@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) - enum logcode log_code = log_before_transfer ? FLOG : FINFO; - int f_xfer = write_batch < 0 ? batch_fd : f_out; - int i, j; -+ size_t l = 0; - - if (verbose > 2) - rprintf(FINFO, "send_files starting\n"); -@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, int f_in) - fname[offset++] = '/'; - } else - offset = 0; -+ -+ l = offset + 1; -+ if (file) { -+ if (file->dirname) -+ l += strlen(file->dirname); -+ if (file->basename) -+ l += strlen(file->basename); -+ } -+ -+ if (l >= sizeof(fname)) { -+ rprintf(FERROR, "Overlong pathname\n"); -+ exit_cleanup(RERR_FILESELECT); -+ } -+ - fname2 = f_name(file, fname + offset); - - if (verbose > 2) diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf b/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf deleted file mode 100644 index 845f5b33f5..0000000000 --- a/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/rsyncd.conf - -# Minimal configuration file for rsync daemon -# See rsync(1) and rsyncd.conf(5) man pages for help - -# This file is required by rsync --daemon -pid file = /var/run/rsyncd.pid -use chroot = yes -read only = yes - -# Simple example for enabling your own local rsync server -#[everything] -# path = / -# comment = Everything except /etc exposed -# exclude = /etc diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb deleted file mode 100644 index 17f1d31945..0000000000 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ /dev/null @@ -1,15 +0,0 @@ -require rsync.inc - -SRC_URI += "file://rsync-2.6.9-fname-obo.patch \ - file://rsyncd.conf \ -" - -SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942" -SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" - -PR = "r4" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |