summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rsync
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-02 12:04:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit2345af9b4829ed3eed5abf60f2483055649f8af7 (patch)
tree96a9a31e4b1957b93c4fe3eb669117d2752caf0d /meta/recipes-devtools/rsync
parentc4901328fe5cf912c0965e5b011b64a95a9bcb9d (diff)
downloadpoky-2345af9b4829ed3eed5abf60f2483055649f8af7.tar.gz
recipes: Move out stale GPLv2 versions to a seperate layeruninative-1.5
These are recipes where the upstream has moved to GPLv3 and these old versions are the last ones under the GPLv2 license. There are several reasons for making this move. There is a different quality of service with these recipes in that they don't get security fixes and upstream no longer care about them, in fact they're actively hostile against people using old versions. The recipes tend to need a different kind of maintenance to work with changes in the wider ecosystem and there needs to be isolation between changes made in the v3 versions and those in the v2 versions. There are probably better ways to handle a "non-GPLv3" system but right now having these in OE-Core makes them look like a first class citizen when I believe they have potential for a variety of undesireable issues. Moving them into a separate layer makes their different needs clearer, it also makes it clear how many of these there are. Some are probably not needed (e.g. mc), I also wonder whether some are useful (e.g. gmp) since most things that use them are GPLv3 only already. Someone could now more clearly see how to streamline the list of recipes here. I'm proposing we mmove to this separate layer for 2.3 with its future maintinership and testing to be determined in 2.4 and beyond. (From OE-Core rev: 19b7e950346fb1dde6505c45236eba6cd9b33b4b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rsync')
-rw-r--r--meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch71
-rw-r--r--meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf15
-rw-r--r--meta/recipes-devtools/rsync/rsync_2.6.9.bb15
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 @@
1Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ]
2CVE: CVE-2007-4091
3
4The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to
5address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091
6
7Date: Tue May 10 10:07:36 2011 +0800
8Dexuan Cui <dexuan.cui@intel.com>
9
10diff --git a/sender.c b/sender.c
11index 6fcaa65..053a8f1 100644
12--- a/sender.c
13+++ b/sender.c
14@@ -123,6 +123,7 @@ void successful_send(int ndx)
15 char fname[MAXPATHLEN];
16 struct file_struct *file;
17 unsigned int offset;
18+ size_t l = 0;
19
20 if (ndx < 0 || ndx >= the_file_list->count)
21 return;
22@@ -133,6 +134,20 @@ void successful_send(int ndx)
23 file->dir.root, "/", NULL);
24 } else
25 offset = 0;
26+
27+ l = offset + 1;
28+ if (file) {
29+ if (file->dirname)
30+ l += strlen(file->dirname);
31+ if (file->basename)
32+ l += strlen(file->basename);
33+ }
34+
35+ if (l >= sizeof(fname)) {
36+ rprintf(FERROR, "Overlong pathname\n");
37+ exit_cleanup(RERR_FILESELECT);
38+ }
39+
40 f_name(file, fname + offset);
41 if (remove_source_files) {
42 if (do_unlink(fname) == 0) {
43@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
44 enum logcode log_code = log_before_transfer ? FLOG : FINFO;
45 int f_xfer = write_batch < 0 ? batch_fd : f_out;
46 int i, j;
47+ size_t l = 0;
48
49 if (verbose > 2)
50 rprintf(FINFO, "send_files starting\n");
51@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, int f_in)
52 fname[offset++] = '/';
53 } else
54 offset = 0;
55+
56+ l = offset + 1;
57+ if (file) {
58+ if (file->dirname)
59+ l += strlen(file->dirname);
60+ if (file->basename)
61+ l += strlen(file->basename);
62+ }
63+
64+ if (l >= sizeof(fname)) {
65+ rprintf(FERROR, "Overlong pathname\n");
66+ exit_cleanup(RERR_FILESELECT);
67+ }
68+
69 fname2 = f_name(file, fname + offset);
70
71 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 @@
1# /etc/rsyncd.conf
2
3# Minimal configuration file for rsync daemon
4# See rsync(1) and rsyncd.conf(5) man pages for help
5
6# This file is required by rsync --daemon
7pid file = /var/run/rsyncd.pid
8use chroot = yes
9read only = yes
10
11# Simple example for enabling your own local rsync server
12#[everything]
13# path = /
14# comment = Everything except /etc exposed
15# 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 @@
1require rsync.inc
2
3SRC_URI += "file://rsync-2.6.9-fname-obo.patch \
4 file://rsyncd.conf \
5"
6
7SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942"
8SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9"
9
10LICENSE = "GPLv2+"
11LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
12
13PR = "r4"
14
15PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"