diff -uN vde2.old/PKGBUILD vde2/PKGBUILD --- vde2.old/PKGBUILD 2009-04-01 08:48:48.072416121 +0200 +++ vde2/PKGBUILD 2009-04-01 09:13:02.996343589 +0200 @@ -1,20 +1,24 @@ pkgname=vde2 pkgver=2.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Virtual Distributed Ethernet for qemu" url="http://sourceforge.net/projects/vde/" license=("GPL") arch=('i686' 'x86_64') install=vde2.install -source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 rcdvde) +source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 \ + rcdvde dhcpd.conf.sample iptables.rules.sample) md5sums=('b198b92d511e4a6276b3bc87dfebe5d7' - 'b697a7b6be3acc6bcc5bba3d78b56d67') - + 'b5d65d8c28755bb9139211f1ef6e99d2' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55') build() { cd $srcdir/$pkgname-$pkgver patch -p1 < ../../vde-path_max.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 make || return 1 make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install && \ - install -m 755 -D ../rcdvde $pkgdir/etc/rc.d/vde + install -m 755 -D ../rcdvde $pkgdir/etc/rc.d/vde || return 1 + install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample || return 1 + install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample || return 1 } diff -uN vde2.old/dhcpd.conf.sample vde2/dhcpd.conf.sample --- vde2.old/dhcpd.conf.sample 1970-01-01 01:00:00.000000000 +0100 +++ vde2/dhcpd.conf.sample 2009-04-01 08:53:06.136557295 +0200 @@ -0,0 +1,12 @@ +ddns-update-style none; + +subnet 192.168.254.0 netmask 255.255.255.0 { + range 192.168.254.1 192.168.254.253; + option routers 192.168.254.254; + option domain-name "virtual.example.com"; + # find your DNS servers from /etc/resolv.conf + # otherwise only pure IP addresses will work + option domain-name-servers 192.168.254.254; + option broadcast-address 192.168.254.255; + default-lease-time 86400; +} diff -uN vde2.old/iptables.rules.sample vde2/iptables.rules.sample --- vde2.old/iptables.rules.sample 1970-01-01 01:00:00.000000000 +0100 +++ vde2/iptables.rules.sample 2009-04-01 09:10:51.519897709 +0200 @@ -0,0 +1,5 @@ +*filter +-A INPUT -i tun -j ACCEPT +-A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT +*nat +-A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE diff -uN vde2.old/rcdvde vde2/rcdvde --- vde2.old/rcdvde 2009-04-01 08:48:48.072416121 +0200 +++ vde2/rcdvde 2009-04-01 09:06:31.246669898 +0200 @@ -7,9 +7,8 @@ start) stat_busy "Starting VDE" vde_switch -tap tun -daemon && \ - sleep 3 && \ ifconfig tun 192.168.254.254 && \ - chmod 755 /var/run/vde.ctl/ -R && \ + chmod 777 /var/run/vde.ctl/ -R && \ add_daemon vde && \ stat_done || stat_fail ;; @@ -20,7 +19,6 @@ ;; restart) $0 stop - sleep 3 $0 start ;; *) diff -uN vde2.old/vde2.install vde2/vde2.install --- vde2.old/vde2.install 2009-04-01 08:48:48.072416121 +0200 +++ vde2/vde2.install 2009-04-01 09:11:44.512278234 +0200 @@ -1,28 +1,8 @@ post_install() { - chmod 777 /var/run/vde.ctl echo "(required) Start /etc/rc.d/vde" - echo "-------------------------------" - echo "(Optional) Add to /etc/rc.d/iptables.rules" - echo "[section *filter]" - echo "-A INPUT -i tun -j ACCEPT" - echo "-A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT" - echo "[section *nat]" - echo "-A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE" - echo "-------------------------------" - echo "(optional) Example dhcpd config /etc/dhcpd.conf" - echo "ddns-update-style none;" - echo "" - echo "subnet 192.168.254.0 netmask 255.255.255.0 {" - echo "option domain-name \"virtual.domain.pl\";" - echo "option domain-name-servers 195.114.161.61, 195.114.181.130;" - echo "option broadcast-address 192.168.254.255;" - echo "option routers 192.168.254.254;" - echo "default-lease-time 86400;" - echo "range 192.168.254.1 192.168.254.253;" - echo "" - echo "Echange in /etc/rc.d/dhcpd: '/usr/sbin/dhcpd -p' for '/usr/sbin/dhcpd -p tun'" - echo "Add \"NoUpgrade = etc/rc.d/dhcpd\" to /etc/pacman.conf" - echo "-------------------------------" + echo "(Optional) Merge /usr/share/vde2/iptables.rules.sample to" + echo " /etc/iptables/iptables.rules" + echo "(optional) Example dhcpd config is in /usr/share/vde2/dhpcd.conf.sample" } post_upgrade() {