diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/vde/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/vde/files')
-rw-r--r-- | net-misc/vde/files/vde-2.2.2-gcc43.patch | 60 | ||||
-rw-r--r-- | net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch | 49 | ||||
-rw-r--r-- | net-misc/vde/files/vde.conf | 10 | ||||
-rw-r--r-- | net-misc/vde/files/vde.init | 26 |
4 files changed, 145 insertions, 0 deletions
diff --git a/net-misc/vde/files/vde-2.2.2-gcc43.patch b/net-misc/vde/files/vde-2.2.2-gcc43.patch new file mode 100644 index 000000000000..3b6e7b003850 --- /dev/null +++ b/net-misc/vde/files/vde-2.2.2-gcc43.patch @@ -0,0 +1,60 @@ +diff -NrU5 vde2-2.2.2.orig/src/kvde_switch/consmgmt.c vde2-2.2.2/src/kvde_switch/consmgmt.c +--- vde2-2.2.2.orig/src/kvde_switch/consmgmt.c 2008-09-04 21:14:55.000000000 +0200 ++++ vde2-2.2.2/src/kvde_switch/consmgmt.c 2008-09-04 21:16:26.000000000 +0200 +@@ -22,10 +22,11 @@ + #include <net/if.h> + #include <stdarg.h> + #include <getopt.h> + #include <dlfcn.h> + #include <time.h> ++#include <linux/limits.h> + + #include <config.h> + #include <vde.h> + #include <vdecommon.h> + +diff -NrU5 vde2-2.2.2.orig/src/kvde_switch/datasock.c vde2-2.2.2/src/kvde_switch/datasock.c +--- vde2-2.2.2.orig/src/kvde_switch/datasock.c 2008-09-04 21:14:55.000000000 +0200 ++++ vde2-2.2.2/src/kvde_switch/datasock.c 2008-09-04 21:19:59.000000000 +0200 +@@ -24,10 +24,11 @@ + #include <net/if.h> + #include <stdarg.h> + #include <grp.h> + #define _GNU_SOURCE + #include <getopt.h> ++#include <linux/limits.h> + + #include <config.h> + #include <vde.h> + #include <vdecommon.h> + +diff -NrU5 vde2-2.2.2.orig/src/vde_plug2tap.c vde2-2.2.2/src/vde_plug2tap.c +--- vde2-2.2.2.orig/src/vde_plug2tap.c 2008-09-04 21:14:55.000000000 +0200 ++++ vde2-2.2.2/src/vde_plug2tap.c 2008-09-04 21:22:23.000000000 +0200 +@@ -16,10 +16,11 @@ + #include <stdarg.h> + #include <syslog.h> + #include <libgen.h> + #define _GNU_SOURCE + #include <getopt.h> ++#include <linux/limits.h> + + #include <config.h> + #include <vde.h> + #include <vdecommon.h> + #include <libvdeplug.h> +diff -NrU5 vde2-2.2.2.orig/src/wirefilter.c vde2-2.2.2/src/wirefilter.c +--- vde2-2.2.2.orig/src/wirefilter.c 2008-09-04 21:14:55.000000000 +0200 ++++ vde2-2.2.2/src/wirefilter.c 2008-09-04 21:25:21.000000000 +0200 +@@ -29,10 +29,11 @@ + #include <sys/time.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/socket.h> + #include <sys/un.h> ++#include <linux/limits.h> + + #include <config.h> + #include <vde.h> + #include <vdecommon.h> + #include <libvdeplug.h> diff --git a/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch b/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch new file mode 100644 index 000000000000..cc494e16ac46 --- /dev/null +++ b/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch @@ -0,0 +1,49 @@ +From d466d77be6ec40d8d7d96050fbee5e17e7c61af9 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel <ludwig.nussel@suse.de> +Date: Tue, 30 Sep 2008 16:59:01 +0200 +Subject: [PATCH] fix static buffer overflows + +--- + src/slirpvde/slirpvde.c | 12 +++++++----- + 1 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/slirpvde/slirpvde.c b/src/slirpvde/slirpvde.c +index 47512ca..016aa45 100644 +--- a/src/slirpvde/slirpvde.c ++++ b/src/slirpvde/slirpvde.c +@@ -53,7 +53,7 @@ + VDECONN *conn; + int dhcpmgmt=0; + static char *pidfile = NULL; +-static char pidfile_path[_POSIX_PATH_MAX]; ++static char pidfile_path[PATH_MAX]; + int logok=0; + char *prog; + extern FILE *lfd; +@@ -78,9 +78,11 @@ void printlog(int priority, const char *format, ...) + static void save_pidfile() + { + if(pidfile[0] != '/') +- strncat(pidfile_path, pidfile, PATH_MAX - strlen(pidfile_path)); +- else +- strcpy(pidfile_path, pidfile); ++ strncat(pidfile_path, pidfile, sizeof(pidfile_path) - strlen(pidfile_path) -1); ++ else { ++ pidfile_path[0] = 0; ++ strncat(pidfile_path, pidfile, sizeof(pidfile_path)-1); ++ } + + int fd = open(pidfile_path, + O_WRONLY | O_CREAT | O_EXCL, +@@ -433,7 +435,7 @@ int main(int argc, char **argv) + exit(1); + } + +- strcat(pidfile_path, "/"); ++ strncat(pidfile_path, "/", sizeof(pidfile_path) - strlen(pidfile_path) -1); + if (daemonize && daemon(0, 0)) { + printlog(LOG_ERR,"daemon: %s",strerror(errno)); + exit(1); +-- +1.5.6 + diff --git a/net-misc/vde/files/vde.conf b/net-misc/vde/files/vde.conf new file mode 100644 index 000000000000..d8794537537c --- /dev/null +++ b/net-misc/vde/files/vde.conf @@ -0,0 +1,10 @@ +# load the tun module +VDE_MODPROBE_TUN="yes" +# virtual tap networking device to be used for vde +VDE_TAP="tap0" +# mode and group for the socket +VDE_SOCK_CHMOD="770" +VDE_SOCK_CHOWN=":qemu" + +# This is the actual options string passed to VDE. Change this at your own risk. +VDE_OPTS="-tap ${VDE_TAP} -daemon" diff --git a/net-misc/vde/files/vde.init b/net-misc/vde/files/vde.init new file mode 100644 index 000000000000..9a1500eeae9e --- /dev/null +++ b/net-misc/vde/files/vde.init @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + after net.${VDE_TAP} +} + + +start() { + ebegin "Starting vde" + [ "${VDE_MODPROBE_TUN}" = "yes" ] && modprobe tun + start-stop-daemon --start --quiet \ + --exec /usr/bin/vde_switch -- ${VDE_OPTS} + eend $? "Failed to start vde" + chmod -R ${VDE_SOCK_CHMOD} /var/run/vde.ctl + chown -R ${VDE_SOCK_CHOWN} /var/run/vde.ctl +} + +stop() { + ebegin "Stopping vde" + start-stop-daemon --stop --quiet --exec /usr/bin/vde_switch + [ "${VDE_MODPROBE_TUN}" = "yes" ] && modprobe -r tun + eend $? "Failed to stop vde" +} |