[arch-commits] Commit in vde2/trunk (PKGBUILD vde-path_max.patch vde.rc)

Tobias Powalowski tpowa at archlinux.org
Fri Jun 11 01:41:52 EDT 2010


    Date: Friday, June 11, 2010 @ 01:41:52
  Author: tpowa
Revision: 82421

upgpkg: vde2 2.2.3-1
bump to latest version, fix #19344

Modified:
  vde2/trunk/PKGBUILD
  vde2/trunk/vde.rc
Deleted:
  vde2/trunk/vde-path_max.patch

--------------------+
 PKGBUILD           |   11 ++-----
 vde-path_max.patch |   77 ---------------------------------------------------
 vde.rc             |    3 +
 3 files changed, 6 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-10 23:24:30 UTC (rev 82420)
+++ PKGBUILD	2010-06-11 05:41:52 UTC (rev 82421)
@@ -2,8 +2,8 @@
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=vde2
-pkgver=2.2.2
-pkgrel=6
+pkgver=2.2.3
+pkgrel=1
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
@@ -11,7 +11,6 @@
 depends=('bash' 'libpcap' 'openssl')
 backup=(etc/conf.d/vde)
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
-        vde-path_max.patch
         dhcpd.conf.sample
         iptables.rules.sample
         vde-config.sample
@@ -23,7 +22,6 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../vde-path_max.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
              --enable-experimental
   make || return 1
@@ -37,11 +35,10 @@
   # install slirp license
   install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
 }
-md5sums=('b198b92d511e4a6276b3bc87dfebe5d7'
-         '93ad951e2f94ae7f50ff9535638127e5'
+md5sums=('6f59e47fe2c8872afd85d130d2193794'
          '7d9bc56d2e561d849e915000d1c0f269'
          'a920123fc620bcedbccb703a8d1bdc55'
          'cb8ace28e8efd4dad128be4be71b3b07'
          '63033c33565e2030541c5e05e9d9b063'
          'a22730f051f4840da4a3162a88ff8156'
-         '6033d9ad0fef546d766bacac47318af6')
+         '6c7dc01bc2f039f0ff1682ee70d3d1da')

Deleted: vde-path_max.patch
===================================================================
--- vde-path_max.patch	2010-06-10 23:24:30 UTC (rev 82420)
+++ vde-path_max.patch	2010-06-11 05:41:52 UTC (rev 82421)
@@ -1,77 +0,0 @@
-diff -aur 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-06-15 13:49:19.000000000 -0300
-+++ vde2-2.2.2/src/kvde_switch/consmgmt.c	2008-09-12 18:19:00.935408481 -0300
-@@ -13,6 +13,7 @@
- #include <syslog.h>
- #include <stdlib.h>
- #include <libgen.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff -aur 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-06-15 13:49:19.000000000 -0300
-+++ vde2-2.2.2/src/kvde_switch/datasock.c	2008-09-12 18:17:36.727494138 -0300
-@@ -15,6 +15,7 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <libgen.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-diff -aur vde2-2.2.2-orig/src/slirpvde/slirpvde.c vde2-2.2.2/src/slirpvde/slirpvde.c
---- vde2-2.2.2-orig/src/slirpvde/slirpvde.c	2008-06-15 13:49:15.000000000 -0300
-+++ vde2-2.2.2/src/slirpvde/slirpvde.c	2008-09-12 18:21:50.872173559 -0300
-@@ -12,6 +12,7 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <libgen.h>
-+#include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-diff -aur vde2-2.2.2-orig/src/vde_autolink.c vde2-2.2.2/src/vde_autolink.c
---- vde2-2.2.2-orig/src/vde_autolink.c	2008-03-10 06:10:34.000000000 -0300
-+++ vde2-2.2.2/src/vde_autolink.c	2008-09-12 18:21:19.982059871 -0300
-@@ -26,6 +26,7 @@
- #include <limits.h>
- #include <string.h>
- #include <time.h>
-+#include <sys/param.h>
- #include <sys/wait.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-diff -aur 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-03-10 06:10:46.000000000 -0300
-+++ vde2-2.2.2/src/vde_plug2tap.c	2008-09-12 18:20:08.629583649 -0300
-@@ -10,6 +10,7 @@
- #include <syslog.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-diff -aur vde2-2.2.2-orig/src/vdetaplib/libvdetap.c vde2-2.2.2/src/vdetaplib/libvdetap.c
---- vde2-2.2.2-orig/src/vdetaplib/libvdetap.c	2008-03-10 06:10:43.000000000 -0300
-+++ vde2-2.2.2/src/vdetaplib/libvdetap.c	2008-09-12 18:21:03.755406693 -0300
-@@ -4,6 +4,7 @@
- #define _GNU_SOURCE
- #include <dlfcn.h>
- #include <stdio.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/syscall.h>
-diff -aur vde2-2.2.2-orig/src/wirefilter.c vde2-2.2.2/src/wirefilter.c
---- vde2-2.2.2-orig/src/wirefilter.c	2008-07-07 02:56:22.000000000 -0300
-+++ vde2-2.2.2/src/wirefilter.c	2008-09-12 18:21:36.019384936 -0300
-@@ -26,6 +26,7 @@
- #include <signal.h>
- #include <math.h>
- #include <stdarg.h>
-+#include <sys/param.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>

Modified: vde.rc
===================================================================
--- vde.rc	2010-06-10 23:24:30 UTC (rev 82420)
+++ vde.rc	2010-06-11 05:41:52 UTC (rev 82421)
@@ -25,6 +25,7 @@
       [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
       [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
       vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
+      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
       if [ $? -gt 0 ]; then
         stat_fail
       else
@@ -33,7 +34,7 @@
       if [ "$SLIRP" = "yes" ]; then
         stat_busy "Starting slirpvde for $i"
         [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n"
+        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
         [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
         [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
         [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"



More information about the arch-commits mailing list