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 | |
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')
-rw-r--r-- | net-misc/vde/Manifest | 3 | ||||
-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 | ||||
-rw-r--r-- | net-misc/vde/metadata.xml | 25 | ||||
-rw-r--r-- | net-misc/vde/vde-2.2.2.ebuild | 40 | ||||
-rw-r--r-- | net-misc/vde/vde-2.3.1.ebuild | 48 | ||||
-rw-r--r-- | net-misc/vde/vde-2.3.2-r1.ebuild | 66 | ||||
-rw-r--r-- | net-misc/vde/vde-2.3.2-r2.ebuild | 68 | ||||
-rw-r--r-- | net-misc/vde/vde-2.3.2.ebuild | 57 |
11 files changed, 452 insertions, 0 deletions
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest new file mode 100644 index 000000000000..62417ad97b1c --- /dev/null +++ b/net-misc/vde/Manifest @@ -0,0 +1,3 @@ +DIST vde2-2.2.2.tar.bz2 472059 SHA256 7d4b68c1ba1b661db05ff3674abff4d2ad5da31bb3471699bbec3f2f360b483a SHA512 47dab6f266fa9bb9e581fc3339719d7ee26b2b293ebdd9dca500d1c08e05fe90299fb2962ca4e6efc8528f1291ec0eb3f429cf3a4bbfb1cd0539d68fa39aeab0 WHIRLPOOL fa2ff0d8d2b2fab6c76e84fe1c63fe32c649dc972cc4735d5d4f0b4fa2b0dba4cce6a3101fabdace1c05f441c4ec679554b1d9e078540910bd9fa559fed5e0a9 +DIST vde2-2.3.1.tar.bz2 510947 SHA256 0baa6d429e022eb4069252c0f58636c4b5e0dd2e3a495bdb14b32ecc363d147f SHA512 0484b8e09039263f3050acc4985b6250f025c12bb03c2a4e4f5a78252d8c220e4297e8bafff93949b1c6807982847fc81200b9ba4bb54abaa05cbfe67efcdbe1 WHIRLPOOL 46726e93531608dee3162cf32a8344b6d3ece433195d0ae15502610a2cfaf6397e2a3dd5fe19ba1fc2844e9b861620ee3710b688f4f0c84dd6246699a31b10c3 +DIST vde2-2.3.2.tar.bz2 600527 SHA256 cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 WHIRLPOOL dde513400eb725fe683c01110628ec9d2c3e415f0907d4f62d9bf09e2ec8ad14c4ad6437e428680a680118eb4297132f938b5cf71123480bf59c8f37eb0fee53 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" +} diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml new file mode 100644 index 000000000000..8ea7011f3c7d --- /dev/null +++ b/net-misc/vde/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>proxy-maintainers</herd> + <maintainer> + <email>mlspamcb@noci.xs4all.nl</email> + </maintainer> + <maintainer> + <email>jmbsvicetto@gentoo.org</email> + <name>Jorge Manuel B. S. Vicetto</name> + </maintainer> + <use> + <flag name="pcap"> + Enable the pcap-based plugin that allows creating a switch against + a real interface. + </flag> + <flag name="ssl"> + Enable the cryptcab plugin that allows creating an encrypted + virtual cable. + </flag> + </use> + <upstream> + <remote-id type="sourceforge">vde</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/vde/vde-2.2.2.ebuild b/net-misc/vde/vde-2.2.2.ebuild new file mode 100644 index 000000000000..3430f3cbf0df --- /dev/null +++ b/net-misc/vde/vde-2.2.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit base eutils user + +MY_P="${PN}2-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" +HOMEPAGE="http://vde.sourceforge.net/" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ppc ~ppc64 x86" +IUSE="" +DEPEND="" +RDEPEND="" + +# The slirpvde-buffer-overflow patch was made by Ludwig Nussel and submitted upstream at +# http://sourceforge.net/tracker/?func=detail&aid=2138410&group_id=95403&atid=611248 +PATCHES=( "${FILESDIR}/${P}-gcc43.patch" "${FILESDIR}/${P}-slirpvde-buffer-overflow.patch" ) + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + newinitd "${FILESDIR}"/vde.init vde + newconfd "${FILESDIR}"/vde.conf vde + + dodoc INSTALL README +} + +pkg_postinst() { + # default group already used in kqemu + enewgroup qemu + einfo "To start vde automatically add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in /etc/conf.d/net" + einfo "To use it as a user be sure to set a group in /etc/conf.d/vde" + einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" +} diff --git a/net-misc/vde/vde-2.3.1.ebuild b/net-misc/vde/vde-2.3.1.ebuild new file mode 100644 index 000000000000..8a5d528eb7f6 --- /dev/null +++ b/net-misc/vde/vde-2.3.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit eutils user + +MY_P="${PN}2-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" +HOMEPAGE="http://vde.sourceforge.net/" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="pcap ssl static-libs" + +RDEPEND="pcap? ( net-libs/libpcap ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND}" + +src_configure() { + econf \ + $(use_enable pcap) \ + $(use_enable ssl cryptcab) \ + $(use_enable static-libs static) +} + +src_install() { + default + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + + + newinitd "${FILESDIR}"/vde.init vde + newconfd "${FILESDIR}"/vde.conf vde +} + +pkg_postinst() { + # default group already used in kqemu + enewgroup qemu + einfo "To start vde automatically add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in /etc/conf.d/net" + einfo "To use it as a user be sure to set a group in /etc/conf.d/vde" + einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" +} diff --git a/net-misc/vde/vde-2.3.2-r1.ebuild b/net-misc/vde/vde-2.3.2-r1.ebuild new file mode 100644 index 000000000000..fa698020c4e2 --- /dev/null +++ b/net-misc/vde/vde-2.3.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit eutils python-single-r1 user + +MY_P="${PN}2-${PV}" + +DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" +HOMEPAGE="http://vde.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="pcap python ssl static-libs" + +RDEPEND="pcap? ( net-libs/libpcap ) + python? ( ${PYTHON_DEPS} ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + # default group already used in kqemu + enewgroup qemu + + python-single-r1_pkg_setup +} + +src_prepare() { + epatch_user +} + +src_configure() { + econf \ + $(use_enable pcap) \ + $(use_enable python) \ + $(use_enable ssl cryptcab) \ + $(use_enable static-libs static) +} + +src_compile() { + emake -j1 +} + +src_install() { + default + prune_libtool_files + + newinitd "${FILESDIR}"/vde.init vde + newconfd "${FILESDIR}"/vde.conf vde +} + +pkg_postinst() { + einfo "To start vde automatically add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in /etc/conf.d/net" + einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" + einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" +} diff --git a/net-misc/vde/vde-2.3.2-r2.ebuild b/net-misc/vde/vde-2.3.2-r2.ebuild new file mode 100644 index 000000000000..d78c5e406f21 --- /dev/null +++ b/net-misc/vde/vde-2.3.2-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit eutils python-single-r1 user + +MY_P="${PN}2-${PV}" + +DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" +HOMEPAGE="http://vde.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="pcap python selinux ssl static-libs" + +COMMON_DEPS="pcap? ( net-libs/libpcap ) + python? ( ${PYTHON_DEPS} ) + ssl? ( dev-libs/openssl )" +DEPEND="${COMMON_DEPS}" +RDEPEND="${COMMON_DEPS} + selinux? ( sec-policy/selinux-vde )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + # default group already used in kqemu + enewgroup qemu + + python-single-r1_pkg_setup +} + +src_prepare() { + epatch_user +} + +src_configure() { + econf \ + $(use_enable pcap) \ + $(use_enable python) \ + $(use_enable ssl cryptcab) \ + $(use_enable static-libs static) +} + +src_compile() { + emake -j1 +} + +src_install() { + default + prune_libtool_files + + newinitd "${FILESDIR}"/vde.init vde + newconfd "${FILESDIR}"/vde.conf vde +} + +pkg_postinst() { + einfo "To start vde automatically add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in /etc/conf.d/net" + einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" + einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" +} diff --git a/net-misc/vde/vde-2.3.2.ebuild b/net-misc/vde/vde-2.3.2.ebuild new file mode 100644 index 000000000000..88f423771a51 --- /dev/null +++ b/net-misc/vde/vde-2.3.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit eutils python user + +MY_P="${PN}2-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" +HOMEPAGE="http://vde.sourceforge.net/" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="pcap python ssl static-libs" + +RDEPEND="pcap? ( net-libs/libpcap ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND}" + +src_configure() { + econf \ + $(use_enable pcap) \ + $(use_enable python) \ + $(use_enable ssl cryptcab) \ + $(use_enable static-libs static) +} + +src_compile() { + emake -j1 || die "emake failed" +} + +src_install() { + default + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + + + newinitd "${FILESDIR}"/vde.init vde + newconfd "${FILESDIR}"/vde.conf vde +} + +pkg_postinst() { + # default group already used in kqemu + enewgroup qemu + + einfo "To start vde automatically add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in /etc/conf.d/net" + einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" + einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" +} |