diff --git a/CHECKSUMS.md5 b/CHECKSUMS.md5
index 60f9fc9..e378d42 100644
--- a/CHECKSUMS.md5
+++ b/CHECKSUMS.md5
@@ -10,10 +10,10 @@ tail +13 CHECKSUMS.md5 | md5sum --check | less
/pub/gnu, or at any GNU mirror site.
MD5 message digest Filename
-3df86b71965322c16284a02fb61ff8c1 ./ChangeLog.rss
-0b1850fb631b70d2be1e8e620bc084a8 ./ChangeLog.txt
-d129f834905511a5af6480a5bcaf1da2 ./ChangeLog.txt.gz
-f3e11390b8d6c6caaba359ccd4903670 ./FILELIST.TXT
+5cfcf58f1e9cf84b46ba5989ed76f128 ./ChangeLog.rss
+1c4560e98db2a49d14dbff8dafdf3cca ./ChangeLog.txt
+fbcdb24734e173ce240541c5d48d9861 ./ChangeLog.txt.gz
+72333dbe8fbb387212c610be756dcc84 ./FILELIST.TXT
7f4bffeb686cc5fd6056bd404dda08d7 ./GPG-KEY
12ae1b17fdf1ab84aef618bf338e4922 ./MANIFEST.bz2
929e7c4ff15161d2fcba2057ec2a2f3a ./NetworkManager-fortisslvpn/HEADER.txt
@@ -28,8 +28,8 @@ f3e11390b8d6c6caaba359ccd4903670 ./FILELIST.TXT
862766d751cd6bf0a92e6162bd329186 ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.tgz.asc
d65495fb9b09ee9b0ede6c5903119dde ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.tgz.md5
10f078f71cb5fa957784abc1c53a70d4 ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.txt
-0a84566e7838ba4ae064805701b78e61 ./PACKAGES.TXT
-98f60dbc9d49d682d19aaf979a185918 ./PACKAGES.TXT.gz
+716d0353d265b22961ffe952e829b83f ./PACKAGES.TXT
+9ccf9f8aa2b2c58635d91eb17c9e1764 ./PACKAGES.TXT.gz
c816a86246d3cc161cf2e869d16131bd ./audit/HEADER.txt
c816a86246d3cc161cf2e869d16131bd ./audit/README
29eb321fa3b3c679ba8e4ae4b36a3809 ./audit/build/README
@@ -553,11 +553,11 @@ d71863045ca687649982f4534099954d ./valgrind/pkg64/current/valgrind-3.17.0-x86_6
7425e883ba618e5c93fe64c1995afd13 ./vde2/README
49dfdb4025bc70e022493da2a68046b7 ./vde2/build/README
15d93e7f8b49f6946f8ad462a3b69bc1 ./vde2/build/doinst.sh
-ada715e4040143d020d4ddf6ecb31005 ./vde2/build/rc.vde2
+1d5075dd0c0e0c3ca88901e645e32faf ./vde2/build/rc.vde2
7425e883ba618e5c93fe64c1995afd13 ./vde2/build/slack-desc
46fbc5f97f03dc517aa3b2c9d9ea6628 ./vde2/build/vde2-2.3.2.tar.bz2
-a15b29fbb1ee975f0f125bbc91c2a265 ./vde2/build/vde2.SlackBuild
-ae5692af793a8d16b793e59219b8a881 ./vde2/build/vde2.info
+a835e574d6c28576fae7b21f96c1b731 ./vde2/build/vde2.SlackBuild
+0d844bb191994fd8f464a70f77f13822 ./vde2/build/vde2.info
4fefed469c111a070005368e5d96811c ./vde2/build/vde_cryptcab-compile-against-openssl-1.1.0.patch
89f1f7294949d150af49cacf3c4adb9a ./virglrenderer/HEADER.txt
89f1f7294949d150af49cacf3c4adb9a ./virglrenderer/README
diff --git a/CHECKSUMS.md5.asc b/CHECKSUMS.md5.asc
index f5a4c28..93e6dca 100644
--- a/CHECKSUMS.md5.asc
+++ b/CHECKSUMS.md5.asc
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNATURE-----
-iQJNBAABCgA3FiEEm8dazQnvu0U1Gdmc9s+lqZ57WVcFAmCW5agZHGd6YW11ZGlv
-QGxpYnJlbWV4Lm9yZy5teAAKCRD2z6WpnntZV6C5D/4gkeUb0hxrZrElL7xB5Xd6
-C2aA68a6mXJvPI3bCIsbj6tudQAlNOX9McrPGgjm+C0Tf0d9pbPNUKL30BlWEwEl
-ct+tqtD8kHfkbCt/50QiatyaMsWJhZVwaByyRXb9nLILHfCCVqMPyeBfbBeqBYuV
-PSdn5PE6+QuTOhuY/8I+fgH/J78ZPwbYAhmgnn9os+GWgyJ7VxZU2JIrp2lwAqg1
-yFufJ1+Fr2hVO58bEaW5avy0csZmJcKhHJk0janRfHJni3rgKhEQ5JJ60Z4BEKkn
-KL+nUaPSsqVxDSDQS2Auhip4Esk+YUx2vf34vn1aJ8cPDEShd9EavkLRRvlyLqC/
-ajyFWug+mQQ8zw03WGpC1Z6RMeqkh9cuey0SsVWSh//2KJjZt1dqwf90BEj0+LX3
-PkToX4zAbYGWyzfhRE/DcnIwWHTr/y1ds/wtCh0losi4ZIMHR0p1baHXjUtjsyQe
-82Q3VTcoE8lxKSV97OTbPV+XBAsO/ggJBh2iwerlq65F9XFi8NxDKBIxVvM5Xrdh
-IaZcfOsFMfO0z6m0k35QpgROCRDj1PLBSM4/IGF5HovMTNlCs59iArWbnNdiMrWq
-Ie98YUcFbpySCLRR0lTfZIpHokeMNq7l5u0TGDvKvPBIRAdrHLT/rrqKAVvXKBXo
-YUuGTiwpP9rwu3teCowB6A==
-=uUtv
+iQJNBAABCgA3FiEEm8dazQnvu0U1Gdmc9s+lqZ57WVcFAmCW5lkZHGd6YW11ZGlv
+QGxpYnJlbWV4Lm9yZy5teAAKCRD2z6WpnntZV+swD/9ASPlt4BF/QeiHwWs+b41V
+XBioUm4dqv1b9wNHSlIBCJJ77TVgqa/1txBl7dI01H4kip0VuI3/IMob4ol3rRKb
+FJhM6PytcOqzAx/uI0a08Sy1ezxZCnoJNbyT5vpT09t+UFhmpnaMHsDF1T9oXxf4
+kpPDQksCbo//apq+kDHVueA/Sy8uXKlc9yDfROKhG3LodqvNRmSxwUJqm2BAVDi8
+1/yqyF6tFDXTxmDafxB9fwzVt1QoKji1PJwVD9Gv+2ugqBcNNvqI3tCnUw3a1gKE
+qzxtmfEzaebwyXR3Mc96hykc7Cj7zxf5QAJQX3x+PTLmUU7thmgFDIP7iW7197NQ
+i7xmv8yuo15W3YdLuA+ChfUAba2+7J7F/N/4JMBJaaa888cyvzlYruVUdaziaNTT
+1ll0r9yYRzYYG2LN9u6aPUTezvXOKF9+7sZZXdS4eIwX3zlh/LjGYadAJVksLoEh
+y0W6HhbOj+YqtA9ZjeDbhrkmTmVqqpM64djwyQ2pxdtn8cvJvuWO9vkKwiAHW99u
+oNKJZS8pPHhZgtRVZulFLY8CmkkrMLVbJvT+qjbG3/OyyB0wI0l2XYLpazHdSHVS
+TXueah+iJjm652ed+Cegt5V5BQz4jGbIBDr+1sStcDdSWBsJLLnpEghf8ZGf6gRF
+vCVh1dTl2SNyIXwaHdtaeQ==
+=/sQH
-----END PGP SIGNATURE-----
diff --git a/CHECKSUMS.md5.gz b/CHECKSUMS.md5.gz
index 03c5bbe..93081ae 100644
Binary files a/CHECKSUMS.md5.gz and b/CHECKSUMS.md5.gz differ
diff --git a/CHECKSUMS.md5.gz.asc b/CHECKSUMS.md5.gz.asc
index 874f544..271155d 100644
--- a/CHECKSUMS.md5.gz.asc
+++ b/CHECKSUMS.md5.gz.asc
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNATURE-----
-iQJNBAABCgA3FiEEm8dazQnvu0U1Gdmc9s+lqZ57WVcFAmCW5agZHGd6YW11ZGlv
-QGxpYnJlbWV4Lm9yZy5teAAKCRD2z6WpnntZV2ukEACMecSr/qLracJtPr0vTyOL
-PQqspzMDFI6o0RvURXslCrhRdX4HnTNEQpebyBWHQKeR/Boenxrri6d4jjljA3+1
-ObuomVnrqGFt5vkoa2EukxcFIW9VUHHbL/MTSKffr+pyDW9ryy2HRN7ygCACKwCU
-f7yTeQqDIETozFkG1XVNHV8CpstgzTMbYKY70aImRIepVdUjnCZw0s4xF9H+91dx
-hnzbn4Gt4n7Jym4hIRRdcMPSrjSOjN+hhCg6CDhs5o4o8uI8UcLoobV3CfyojjDJ
-B1JUdFHhkNE/71U+NBbRshmCW5fZIAgsSagBQ2QPcm8KteecFtCqtpuJjVQRJylu
-AYLWeKHnnZh7LdUvkjAwsQMbX3dLCQpt/gwOM51e2Fy0xPDtQcEI4j0j3QagStcL
-rglSj2DK1kb9CWkN3qRa2EI0IlanPDvC7Ql4YteeWacrechuqLPvFI96xNoNYCSf
-/7GsX/55+UavFRyeOgLYeJZPKjcKPb+gcs5XgRaYDD2gRHqIrfjzeyPw64aay2w/
-07Noz6FHk7GPn1MxHwyd5ZgELWHO8DWaHFYKPsAcFpxH9Oe7SvsWR6/4kR31HuQE
-L6oRwuCasMWTDMWjpbcDBgGSXk23UK+iSDYMQN/WLy2fjrJuCr5wTqkyF+EWavIe
-50oJZes2AiE+SRFJpklPIg==
-=NG21
+iQJNBAABCgA3FiEEm8dazQnvu0U1Gdmc9s+lqZ57WVcFAmCW5lkZHGd6YW11ZGlv
+QGxpYnJlbWV4Lm9yZy5teAAKCRD2z6WpnntZV6QGD/wMf1X7VXI1Xbsya0Jol8mP
+w1GMtv4/6sGsifLpRMXu6rQahlgvjsl60kkwSZcDkHVCsC2+i3y2yw/Txl2VoWK1
+k/ewZm/gdJLSykSZNmQF6/VsS/z7yltp4k9S6xCTfQQdsR0Ni55AEOrOz6aGU3j7
+ChEI7IWlDxFJ42rQb1dXQPp4kZPmhdgOQbRT3h4MSRYHmscBF9KCOn+Q/PFlhhOH
+aS81TTPeAq7nXaXjjYfm/CAo1SAf7WSJ8CHdwpERGrnTOgaKaDTU9Rk/URp1Vh2z
+/uuV47KVQPRrUmrJzLGyRghbE2Y7xNwrxhKyMnp47KP5gQez2osvIulzoh7pd9qu
+fn3CGnF6WemgSM/3KiHBqUh4XinARNMzYUMRkUOfaMrz0a6jqP3IOnKw1fAxbHhF
+1ugaJ2gWnJrdxhyVM6R/ykVtd7RRsv+RACIIsCOYBZWrpE7AMjbiuqRIUYbwljXe
+hXZY9Mm9tx/XV7AMYiWGtzEJ+1c77+FbB0eLCja9cPRcpxA5DQy5s3JuNkH2xGn9
+Z0m7QsDxMkcTGQELriYqpgAD0xkVYoFNNtgyOPvV2KduO8gKSWgEePPxywnA0k3+
+WOgRp6iykVei5teIirdXOpGl7/3V2JDUsFZebsSty+i8e8ZXJWwc2DQ7HRLG1HZk
+vBNk79M33o/1yBv3lJC0ow==
+=fCdQ
-----END PGP SIGNATURE-----
diff --git a/ChangeLog.rss b/ChangeLog.rss
index f345638..519f10a 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,21 @@
Repositorio de software para Slackare Linux proporcionado por Libre Expresión México
en-us
urn:uuid:f735159c-86bd-11ea-9d48-04d4c453db33
-Sat, 8 May 2021 19:25:10 GMT
-Sat, 8 May 2021 19:25:22 GMT
+Sat, 8 May 2021 19:28:07 GMT
+Sat, 8 May 2021 19:28:20 GMT
gen_repos_files.sh v 1.98
-
+Sat, 8 May 2021 19:28:07 GMT
+https://mirror.slackware.mx/libremex/slackbuilds/ChangeLog.txt
+Sat, 8 May 2021 19:28:07 GMT
+20210508142807
+
+
+vde2: Asumir el mantenimiento
+]]>
+
+
+-
Sat, 8 May 2021 19:25:10 GMT
https://mirror.slackware.mx/libremex/slackbuilds/ChangeLog.txt
Sat, 8 May 2021 19:25:10 GMT
@@ -190,16 +201,5 @@ liburing: Agregar paquete
]]>
--
-Sun, 2 May 2021 05:14:36 GMT
-https://mirror.slackware.mx/libremex/slackbuilds/ChangeLog.txt
-Sun, 2 May 2021 05:14:36 GMT
-20210502001436
-
-
-liburing: Nuevo
-]]>
-
-
diff --git a/ChangeLog.txt b/ChangeLog.txt
index bf016dd..9bcdeaa 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
++--------------------------+
+Sat May 8 19:28:07 UTC 2021
+vde2: Asumir el mantenimiento
+
+--------------------------+
Sat May 8 19:25:10 UTC 2021
vde2: Nuevo
diff --git a/ChangeLog.txt.gz b/ChangeLog.txt.gz
index 2ec477b..30a2db3 100644
Binary files a/ChangeLog.txt.gz and b/ChangeLog.txt.gz differ
diff --git a/FILELIST.TXT b/FILELIST.TXT
index da23c43..6d3815f 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,4 +1,4 @@
-Sat May 8 19:25:10 UTC 2021
+Sat May 8 19:28:07 UTC 2021
Here is the file list for https://mirror.slackware.mx/libremex/slackbuilds ,
maintained by Gerardo Zamudio .
@@ -6,17 +6,17 @@ If you are using a mirror site and find missing or extra files
in the subdirectories, please have the archive administrator
refresh the mirror.
-drwxr-xr-x 46 1000 100 4096 2021-05-08 14:25 .
--rw-r--r-- 1 1000 100 45478 2021-05-08 14:20 ./CHECKSUMS.md5
--rw-r--r-- 1 1000 100 870 2021-05-08 14:20 ./CHECKSUMS.md5.asc
--rw-r--r-- 1 1000 100 13904 2021-05-08 14:20 ./CHECKSUMS.md5.gz
--rw-r--r-- 1 1000 100 870 2021-05-08 14:20 ./CHECKSUMS.md5.gz.asc
--rw-r--r-- 1 1000 100 6204 2021-05-08 14:25 ./ChangeLog.rss
--rw-r--r-- 1 1000 100 17728 2021-05-08 14:25 ./ChangeLog.txt
--rw-r--r-- 1 1000 100 2517 2021-05-08 14:25 ./ChangeLog.txt.gz
--rw-r--r-- 1 1000 100 311 2021-05-08 14:25 ./FILELIST.TXT
+drwxr-xr-x 46 1000 100 4096 2021-05-08 14:28 .
+-rw-r--r-- 1 1000 100 46084 2021-05-08 14:25 ./CHECKSUMS.md5
+-rw-r--r-- 1 1000 100 870 2021-05-08 14:25 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 1000 100 14158 2021-05-08 14:25 ./CHECKSUMS.md5.gz
+-rw-r--r-- 1 1000 100 870 2021-05-08 14:25 ./CHECKSUMS.md5.gz.asc
+-rw-r--r-- 1 1000 100 6218 2021-05-08 14:28 ./ChangeLog.rss
+-rw-r--r-- 1 1000 100 17817 2021-05-08 14:28 ./ChangeLog.txt
+-rw-r--r-- 1 1000 100 2525 2021-05-08 14:28 ./ChangeLog.txt.gz
+-rw-r--r-- 1 1000 100 311 2021-05-08 14:28 ./FILELIST.TXT
-rw-r--r-- 1 1000 100 6217 2020-05-23 23:52 ./GPG-KEY
--rw-r--r-- 1 1000 100 50517 2021-05-08 14:25 ./MANIFEST.bz2
+-rw-r--r-- 1 1000 100 50517 2021-05-08 14:28 ./MANIFEST.bz2
drwxr-xr-x 4 1000 100 4096 2020-05-23 23:54 ./NetworkManager-fortisslvpn
-rw-r--r-- 1 1000 100 981 2020-05-23 23:54 ./NetworkManager-fortisslvpn/HEADER.txt
-rw-r--r-- 1 1000 100 981 2020-05-23 23:54 ./NetworkManager-fortisslvpn/README
@@ -33,8 +33,8 @@ drwxr-xr-x 2 1000 100 4096 2020-05-23 19:03 ./NetworkManager-fortisslvpn/pk
-rw-r--r-- 1 1000 100 870 2020-05-23 19:03 ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.tgz.asc
-rw-r--r-- 1 1000 100 85 2020-05-23 19:03 ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.tgz.md5
-rw-r--r-- 1 1000 100 474 2020-05-23 19:03 ./NetworkManager-fortisslvpn/pkg64/current/NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.txt
--rw-r--r-- 1 1000 100 29404 2021-05-08 14:25 ./PACKAGES.TXT
--rw-r--r-- 1 1000 100 7282 2021-05-08 14:25 ./PACKAGES.TXT.gz
+-rw-r--r-- 1 1000 100 29404 2021-05-08 14:28 ./PACKAGES.TXT
+-rw-r--r-- 1 1000 100 7282 2021-05-08 14:28 ./PACKAGES.TXT.gz
drwxr-xr-x 4 1000 100 4096 2021-04-25 04:28 ./audit
-rw-r--r-- 1 1000 100 884 2021-04-25 04:28 ./audit/HEADER.txt
-rw-r--r-- 1 1000 100 884 2021-04-25 04:28 ./audit/README
@@ -716,11 +716,11 @@ drwxr-xr-x 4 1000 100 4096 2021-05-08 14:24 ./vde2
drwxr-xr-x 2 1000 100 4096 2021-05-08 14:25 ./vde2/build
-rw-r--r-- 1 1000 100 2110 2021-05-01 11:50 ./vde2/build/README
-rw-r--r-- 1 1000 100 599 2021-05-01 11:50 ./vde2/build/doinst.sh
--rw-r--r-- 1 1000 100 1947 2021-05-01 11:50 ./vde2/build/rc.vde2
+-rw-r--r-- 1 1000 100 6345 2021-05-08 14:27 ./vde2/build/rc.vde2
-rw-r--r-- 1 1000 100 992 2021-05-01 11:50 ./vde2/build/slack-desc
-rw-r--r-- 1 1000 100 600527 2011-11-23 10:54 ./vde2/build/vde2-2.3.2.tar.bz2
--rw-r--r-- 1 1000 100 3841 2021-05-01 11:50 ./vde2/build/vde2.SlackBuild
--rw-r--r-- 1 1000 100 294 2021-05-01 11:50 ./vde2/build/vde2.info
+-rw-r--r-- 1 1000 100 3876 2021-05-08 14:27 ./vde2/build/vde2.SlackBuild
+-rw-r--r-- 1 1000 100 306 2021-05-08 14:27 ./vde2/build/vde2.info
-rw-r--r-- 1 1000 100 2222 2021-05-01 11:50 ./vde2/build/vde_cryptcab-compile-against-openssl-1.1.0.patch
drwxr-xr-x 3 1000 100 4096 2021-05-08 14:24 ./vde2/pkg64
drwxr-xr-x 2 1000 100 4096 2021-05-08 14:24 ./vde2/pkg64/current
diff --git a/PACKAGES.TXT b/PACKAGES.TXT
index 544dada..4435ab0 100644
--- a/PACKAGES.TXT
+++ b/PACKAGES.TXT
@@ -1,4 +1,4 @@
-PACKAGES.TXT; Sat May 8 19:25:10 UTC 2021
+PACKAGES.TXT; Sat May 8 19:28:07 UTC 2021
PACKAGE NAME: NetworkManager-fortisslvpn-1.2.10-x86_64-1_lem.tgz
PACKAGE MIRROR: https://mirror.slackware.mx/libremex/slackbuilds
diff --git a/PACKAGES.TXT.gz b/PACKAGES.TXT.gz
index b037161..826ca7a 100644
Binary files a/PACKAGES.TXT.gz and b/PACKAGES.TXT.gz differ
diff --git a/vde2/build/rc.vde2 b/vde2/build/rc.vde2
index 9cc1bec..e87e5c3 100644
--- a/vde2/build/rc.vde2
+++ b/vde2/build/rc.vde2
@@ -1,74 +1,204 @@
#!/bin/sh
+# $Id: rc.vdenetwork,v 1.7 2011/12/06 14:18:08 root Exp root $
+# Qemu environment preparation script
-#=========================== EDIT THE FOLLOWING VARIABLES ==========================
-# _________________________________________________________________________________
-# | |
-# | Interface name to use for the TAP device |
-# | |
- TAP_IF="tap0"
-# |_________________________________________________________________________________|
-# | |
-# | IP Address/Subnet in CIDR Notation for the Virtual Network |
-# | |
- TAP_NET="10.10.10.1/24"
-# |_________________________________________________________________________________|
+# ---------------------------------------------------------------------------
#
-#=========================== DO NOT EDIT BELOW THIS LINE ============================
+# After running this startup script, run a QEMU virtual machine in this way:
+#
+# qemu-system-x86_64 \
+# -net vde,sock=/var/run/kvm0.ctl,vlan=0 -net nic,vlan=0 \
+# [qemu_option [qemu_option], ...]
+#
+# This will automatically connect the QEMU virtual machine to the VDE switch.
+#
+# ---------------------------------------------------------------------------
+#
+# Network type can be one of "route" "bridge" or "nat":
+# - In "route" mode, the script will expect that the 'routed' daemon is running
+# on the host (see /etc/rc.d/rc.inet2 to start 'routed'), and will not
+# create iptables NAT rules.
+# The virtual network will be routed on the LAN and will be accessible as a
+# separate network segment (make sure the IP range defined below does not
+# conflict with existing parts of your network!). The guests will use our
+# private dnsmasq server to obtain IP addresses.
+# - In "bridge" mode, the script will try to add the tap device to an existing
+# network bridge, and will not create iptables NAT rules.
+# The guests will be seen on the LAN as part of the network.
+# - In "nat" mode, the script will create iptables NAT rules. These hide the
+# virtual network behind an internal NAT router. The guests will have full
+# network access, but will be accessible only from the host.
+#
+# ---------------------------------------------------------------------------
-start(){
- echo -n "Starting VDE Switch..."
+#NETWORKTYPE="route"
+#NETWORKTYPE="bridge"
+NETWORKTYPE="nat"
- # Load tun module
- modprobe tun || { echo "Error, cannot load 'tun' module. Exiting..." ; exit 1 ; }
- sleep 1
+# Host interfaces that need to be NAT-ed (in case we're not bridging/routing):
+# Add more interfaces space-separated, like "eth+ wlan+"
+NAT_IFS="eth+"
- # Start tap switch
- vde_switch -tap ${TAP_IF} -daemon || { echo "Error, cannot assign IP to ${TAP_IF}. Exiting..." ; exit 1 ; }
+# What is the bridge interface called if we are bridging?
+BR_DEV=br0
- # Bring tap interface up
- ip addr add ${TAP_NET} dev ${TAP_IF}
- ip link set ${TAP_IF} up
-
- #chmod 666 /tmp/vde.ctl
- chmod -R a+rwx /var/run/vde.ctl
+# What is the name of the tun/tap device we will be using?
+TAP_DEV=kvm0
- # Apply workaround
- echo 1024 > /proc/sys/dev/rtc/max-user-freq
- echo
-}
+start_tap() {
+ # Load tun module
+ /sbin/modprobe tun 2>/dev/null
+ # Wait for the module to be loaded
+ while ! /bin/lsmod |grep -q "^tun"; do echo Waiting for tun device;sleep 1; done
+
+ # Start tap switch
+ vde_switch --tap ${TAP_DEV} --daemon --group kvm \
+ --sock /var/run/${TAP_DEV}.ctl --pidfile /var/run/${TAP_DEV}_vde.pid \
+ --mod 775 --mgmtmode 770 --mgmt /var/run/${TAP_DEV}-manage
+
+ sleep 1
+
+ # Change pipe permission:
+ #chmod -R a+rwx /var/run/vde.ctl
+} # End start_tap
+
+stop_tap() {
+ # Bring tap interface down:
+ ifconfig ${TAP_DEV} down
+
+ # Kill VDE switch:
+ #pgrep -f vde_switch | xargs kill -TERM
+ kill -HUP $(cat /var/run/${TAP_DEV}_vde.pid)
+
+ # Remove the control socket:
+ #rmdir /var/run/vde.ctl
+} # End stop_tap
+
+start_localdhcp() {
+ # The IP configuration for the tap device that will be used for
+ # the virtual machine network:
+
+ TAP_IP=10.111.111.254
+ TAP_MASK=255.255.255.0
+ TAP_BCAST=$(/bin/ipmask ${TAP_MASK} ${TAP_IP} | cut -f 1 -d ' ')
+
+ # Definitions for the LAN segment the Qemu virtual machines will be in.
+ # These definitions will be fed to dnsmasq - this program will provide DNS
+ # and DHCP to the Qemu LAN.
+ # The VM_IPLOW and VM_IPHIGH addresses must agree with the definitions for
+ # the tap0 device above. These 'low' and 'high' values are the IP address
+ # range for the DHCP server to use.
-stop(){
- echo -n "Stopping VDE Switch..."
+ VM_DOMAIN=qemu.lan
+ VM_IPLOW=10.111.111.128
+ VM_IPHIGH=10.111.111.199
+ VM_BCAST=${TAP_BCAST}
+ VM_MASK=${TAP_MASK}
- # Bring tap interface down
- ip addr flush dev ${TAP_IF}
- ip link set ${TAP_IF} down
+ # For additional options to dnsmasq - the commented example specifies that
+ # all DNS lookups for 'my.net' should go to 192.168.1.1;
+ # On the second line you find a configuration for supporting network boot:
+ #DNSMASQ_OPTIONS="--server /my.net/192.168.1.1 \
+ # --dhcp-boot=/pxelinux.0,\"192.168.1.1\",192.168.1.1"
+ DNSMASQ_OPTIONS=""
- # Kill VDE switch
- kill $(pgrep vde_switch)
- sleep 1
+ # Bring tap interface up
+ ifconfig ${TAP_DEV} ${TAP_IP} broadcast ${TAP_BCAST} netmask ${TAP_MASK}
- # Remove tun module
- modprobe -r tun
- echo
+ # Start dnsmasq, the DNS/DHCP server
+ # for our Virtual Machines behind the tap0 interface.
+ # The '--conf-file' option prevents this instance from reading the default
+ # /etc/dnsmasq.conf settings. Also, binds to the tun interface, to keep it
+ # from interfering with other dnsmasq/named processes running on the host's
+ # primary interfaces.
+ /usr/sbin/dnsmasq \
+ --log-queries \
+ --user=daemon \
+ --dhcp-leasefile=/var/state/dhcp/qemu-dhcpd.leases \
+ --dhcp-range=${VM_IPLOW},${VM_IPHIGH},${VM_MASK},${VM_BCAST},8h \
+ --interface=${TAP_DEV} --except-interface=lo --bind-interfaces \
+ --pid-file=/var/run/${TAP_DEV}_dnsmasq.pid --conf-file \
+ --domain=${VM_DOMAIN} \
+ $DNSMASQ_OPTIONS
+
+} # End start_localdhcp
+
+stop_localdhcp() {
+ # Stop dnsmasq
+ #pgrep -f dnsmasq | xargs kill -TERM
+ kill -TERM $(cat /var/run/${TAP_DEV}_dnsmasq.pid) \
+ && rm -f /var/run/${TAP_DEV}_dnsmasq.pid
+} # End stop_localdhcp
+
+start_route() {
+ # We need a private dnsmasq instance in a routed configuration:
+ start_localdhcp
+} # End start_route
+
+stop_route() {
+ # We need to stop our private dnsmasq instance in a routed configuration:
+ stop_localdhcp
+} # End stop_route
+
+start_nat() {
+ # Start IP Forwarding
+ echo "1" > /proc/sys/net/ipv4/ip_forward
+ for NIC in ${NAT_IFS}; do
+ iptables -t nat -A POSTROUTING -o ${NIC} -j MASQUERADE
+ done
+
+ # We need a private dnsmasq instance in a NAT configuration:
+ start_localdhcp
+
+} # End start_nat
+
+stop_nat() {
+ # We need to stop our private dnsmasq in a NAT configuration:
+ stop_localdhcp
+
+ # Delete the NAT rules
+ for NIC in ${NAT_IFS}; do
+ iptables -t nat -D POSTROUTING -o ${NIC} -j MASQUERADE
+ done
+ # Stop IP Forwarding
+ echo "0" > /proc/sys/net/ipv4/ip_forward
}
+start_bridge() {
+ # Connect our tap device from the bridge:
+ /sbin/ifconfig $TAP_DEV down
+ /sbin/ifconfig $TAP_DEV 0.0.0.0 promisc up
+ /sbin/brctl addif $BR_DEV $TAP_DEV
+}
+
+stop_bridge() {
+ # Disconnect our tap device from the bridge:
+ /sbin/brctl delif $BR_DEV $TAP_DEV
+}
+
+# See how we were called.
case "$1" in
- start)
- start
- ;;
-
- stop)
- stop
- ;;
-
- restart)
- stop
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart}"
- ;;
+ start)
+ echo -n "Starting VDE network for QEMU: "
+
+ start_tap
+ start_$NETWORKTYPE
+ echo
+ ;;
+ stop)
+ echo -n "Stopping VDE network for QEMU: "
+ stop_$NETWORKTYPE
+ stop_tap
+ echo
+ ;;
+ restart|reload)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
esac
diff --git a/vde2/build/vde2.SlackBuild b/vde2/build/vde2.SlackBuild
index 910dbd4..6f3e049 100644
--- a/vde2/build/vde2.SlackBuild
+++ b/vde2/build/vde2.SlackBuild
@@ -23,11 +23,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Modified by Antonio Hernández Blas
+#
+# A cargo del mantenimiento: Gerardo Zamudio
+# para Libre Expresión México, A.C
+#
PRGNAM=vde2
VERSION=${VERSION:-2.3.2}
BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-_lem}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -38,7 +42,7 @@ if [ -z "$ARCH" ]; then
fi
CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/tmp/lem}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -81,10 +85,6 @@ if [ "$EXPERIMENTAL" = "true" ]; then
OPTIONS+="--enable-experimental"
fi
-# This seems like a not yet implemented feature so this is just
-# a reminder:
-# --enable-kernel-switch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -95,6 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
--datarootdir=/usr \
--datadir=/usr/share \
--enable-shared=yes \
+ --enable-kernel-switch \
--disable-static \
$OPTIONS \
--build=$ARCH-slackware-linux
diff --git a/vde2/build/vde2.info b/vde2/build/vde2.info
index 51d679f..1d5e595 100644
--- a/vde2/build/vde2.info
+++ b/vde2/build/vde2.info
@@ -6,5 +6,5 @@ MD5SUM="46fbc5f97f03dc517aa3b2c9d9ea6628"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gzamudio@libremex.org.mx"