diff options
author | NP-Hardass <NP-Hardass@gentoo.org> | 2017-09-20 18:54:58 -0400 |
---|---|---|
committer | NP-Hardass <NP-Hardass@gentoo.org> | 2017-09-20 19:36:10 -0400 |
commit | cf0f407148dc9a70837610f98359dedb993b1b80 (patch) | |
tree | efd707ecb8f78060ae82a93dd9befa60df6985e8 /net-misc/vde | |
parent | net-misc/vde: Fix compilation with format-security (diff) | |
download | gentoo-cf0f407148dc9a70837610f98359dedb993b1b80.tar.gz gentoo-cf0f407148dc9a70837610f98359dedb993b1b80.tar.bz2 gentoo-cf0f407148dc9a70837610f98359dedb993b1b80.zip |
net-misc/vde: Drop orphaned files
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'net-misc/vde')
-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-gcc53.patch | 66 | ||||
-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 | 25 |
5 files changed, 0 insertions, 210 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 deleted file mode 100644 index 3b6e7b003850..000000000000 --- a/net-misc/vde/files/vde-2.2.2-gcc43.patch +++ /dev/null @@ -1,60 +0,0 @@ -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-gcc53.patch b/net-misc/vde/files/vde-2.2.2-gcc53.patch deleted file mode 100644 index 60fb98cc9a8d..000000000000 --- a/net-misc/vde/files/vde-2.2.2-gcc53.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- src/slirpvde/misc.c 2016-01-02 22:54:35.746094904 -0500 -+++ src/slirpvde/misc.c.old 2016-01-02 22:54:33.152132668 -0500 -@@ -120,11 +120,15 @@ getouraddr() - struct quehead_32 { - u_int32_t qh_link; - u_int32_t qh_rlink; - }; - -+#ifdef __GNUC_GNU_INLINE__ - inline void -+#else -+extern inline void -+#endif - insque_32(a, b) - void *a; - void *b; - { - register struct quehead_32 *element = (struct quehead_32 *) a; -@@ -134,11 +134,15 @@ insque_32(a, b) - element->qh_rlink = (u_int32_t)head; - ((struct quehead_32 *)(element->qh_link))->qh_rlink - = (u_int32_t)element; - } - -+#ifdef __GNUC_GNU_INLINE__ - inline void -+#else -+extern inline void -+#endif - remque_32(void *a) - { - register struct quehead_32 *element = (struct quehead_32 *) a; - ((struct quehead_32 *)(element->qh_link))->qh_rlink = element->qh_rlink; - ((struct quehead_32 *)(element->qh_rlink))->qh_link = element->qh_link; -@@ -150,11 +150,15 @@ remque_32(void *a) - struct quehead { - struct quehead *qh_link; - struct quehead *qh_rlink; - }; - -+#ifdef __GNUC_GNU_INLINE__ - inline void -+#else -+extern inline void -+#endif - insque(a, b) - void *a, *b; - { - register struct quehead *element = (struct quehead *) a; - register struct quehead *head = (struct quehead *) b; -@@ -163,11 +163,15 @@ insque(a, b) - element->qh_rlink = (struct quehead *)head; - ((struct quehead *)(element->qh_link))->qh_rlink - = (struct quehead *)element; - } - -+#ifdef __GNUC_GNU_INLINE__ - inline void -+#else -+extern inline void -+#endif - remque(a) - void *a; - { - register struct quehead *element = (struct quehead *) a; - ((struct quehead *)(element->qh_link))->qh_rlink = element->qh_rlink; 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 deleted file mode 100644 index cc494e16ac46..000000000000 --- a/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index d8794537537c..000000000000 --- a/net-misc/vde/files/vde.conf +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index e132d51fad36..000000000000 --- a/net-misc/vde/files/vde.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" -} |