Date: Friday, May 20, 2022 @ 09:17:30 Author: dvzrv Revision: 446125 archrelease: copy trunk to extra-x86_64
Added: vde2/repos/extra-x86_64/PKGBUILD (from rev 446124, vde2/trunk/PKGBUILD) Deleted: vde2/repos/extra-x86_64/PKGBUILD vde2/repos/extra-x86_64/dhcpd.conf.sample vde2/repos/extra-x86_64/iptables.rules.sample vde2/repos/extra-x86_64/vde-config.sample vde2/repos/extra-x86_64/vde-connection.sample vde2/repos/extra-x86_64/vde2-2.3.2-format-security.patch vde2/repos/extra-x86_64/vde2-2.3.2-openssl-1.1.patch vde2/repos/extra-x86_64/vde2.install ----------------------------------+ PKGBUILD | 106 ++++++++++++++----------------------- dhcpd.conf.sample | 12 ---- iptables.rules.sample | 5 - vde-config.sample | 35 ------------ vde-connection.sample | 6 -- vde2-2.3.2-format-security.patch | 31 ---------- vde2-2.3.2-openssl-1.1.patch | 92 -------------------------------- vde2.install | 9 --- 8 files changed, 42 insertions(+), 254 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-20 09:17:20 UTC (rev 446124) +++ PKGBUILD 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,64 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: Sergej Pupykin - -pkgname=vde2 -pkgver=2.3.2 -pkgrel=21 -pkgdesc="Virtual Distributed Ethernet for emulators like qemu" -arch=(x86_64) -url="https://github.com/virtualsquare/vde-2" -license=(GPL2 LGPL2.1 BSD) -depends=(bash libpcap openssl) -source=( - https://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 - dhcpd.conf.sample - iptables.rules.sample - vde-config.sample - vde-connection.sample - vde2-2.3.2-openssl-1.1.patch - vde2-2.3.2-format-security.patch -) -install=vde2.install -options=(debug) -sha256sums=('cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542' - 'da0e2766dc63069da929c28126831ad5fdddcc4a04105a21217d78832c7ca1bc' - '99076d7466cd99673dbe91ef83865187e7868177959b38e125df63eea957f83e' - '5727c215646333c37b26388146cd3e6b3814b88d60d54051d7da99e00c0aef87' - '5139110ed6d5d1174bf12971512dac5196d9d07df46dd393d7b1cd083118fe9b' - '110370a5f48f1e241d43f8bb5e3ea6d2ca7d2c1949e1cf672d03bfc897f2e11f' - 'af087758609338365b9f331c498e330fc67efdac6d0dd9ce699e2bd1645e52b5') -b2sums=('6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990' - '95687f7a895e48be47bf183de011d6e10c0bb48a32fa99635dc82aac517c0c9646cf2044136b2d2a1667e617cb4fd7d7b7c44e7410fb13fcb1aa20f1bfb2c319' - 'f5900923b47eff8438525346531205a8034ae462cea4a6ee519497f2baa37eaef90c7d200ffa6965b2545082ef1f04da3995f6385feeefe4ba362c000f1097c7' - '4f78982013168cac4ed57a006fb99e3de4b22b225a0874dbe9287c96a6ba8ebdd0d72e6e1f387fe41684f29c5e4a73e6ddda981f8f03d5b85008f876fb59f43d' - '9bda749135c87a6cf0621e7ee09718ecc4e647732a986de127c2ab6675f7674fc298e2bf84753f967f98b71afd104a8f87df4d7b7fccd4cba3988a75210c5e2f' - '6681dec01d1d2df3375685117e6d597998605e65fdbd40b52390c99b583e54332c94dfbd35fb023b9bbdfa441bbd269fcde2a14fbccdf710973184696abaef23' - '7345ac269e243939ef6ce3104932c14c4718e7c812b4249a5bb3484c9dd4913ddeb90e567a61e2990de9d28d1dbdad40997f040d7f2daa597aaf8a9184af0a74') - -prepare() { - # allow compilation with openssl 1.1 - patch -Np1 -d $pkgname-$pkgver -i ../vde2-2.3.2-openssl-1.1.patch - # Fix format-security build errors - patch -Np1 -d $pkgname-$pkgver -i ../vde2-2.3.2-format-security.patch -} - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/vde2 \ - --enable-experimental \ - --disable-python - # NOTE: build can not be parallelized - make -j1 -} - -package() { - make DESTDIR="$pkgdir" install -C $pkgname-$pkgver - install -Dm 644 vde-{config,connection}.sample -t "$pkgdir/etc/vde/" - install -Dm 644 {dhcpd.conf,iptables.rules}.sample -t "$pkgdir/usr/share/vde2/" - # install slirpvde license - install -Dm 644 $pkgname-$pkgver/COPYING.slirpvde -t "$pkgdir/usr/share/licenses/$pkgname/" -} Copied: vde2/repos/extra-x86_64/PKGBUILD (from rev 446124, vde2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-20 09:17:30 UTC (rev 446125) @@ -0,0 +1,42 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Sergej Pupykin + +_name=vde-2 +pkgname=vde2 +pkgver=2.3.3 +pkgrel=1 +pkgdesc="Virtual Distributed Ethernet for emulators like qemu" +arch=(x86_64) +url="https://github.com/virtualsquare/vde-2" +license=(GPL2 LGPL2.1) +depends=(bash glibc) +makedepends=(libpcap wolfssl) +provides=(libvdehist.so libvdemgmt.so libvdeplug.so libvdesnmp.so) +source=($pkgname-$pkgver.tar.gz::https://github.com/virtualsquare/$_name/archive/refs/tags/v$pkgver.tar.gz) +options=(debug) +sha512sums=('d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387') +b2sums=('e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348') + +prepare() { + cd $_name-$pkgver + autoreconf -fiv +} + +build() { + cd $_name-$pkgver + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/$pkgname \ + --enable-experimental + make V=1 +} + +package() { + depends+=(libpcap.so libwolfssl.so) + + make DESTDIR="$pkgdir" install -C $_name-$pkgver + install -vDm 644 $_name-$pkgver/{README,Changelog,doc/{README.*,*-HOWTO}} -t "$pkgdir/usr/share/doc/$pkgname/" +} Deleted: dhcpd.conf.sample =================================================================== --- dhcpd.conf.sample 2022-05-20 09:17:20 UTC (rev 446124) +++ dhcpd.conf.sample 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,12 +0,0 @@ -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; -} Deleted: iptables.rules.sample =================================================================== --- iptables.rules.sample 2022-05-20 09:17:20 UTC (rev 446124) +++ iptables.rules.sample 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,5 +0,0 @@ -*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 Deleted: vde-config.sample =================================================================== --- vde-config.sample 2022-05-20 09:17:20 UTC (rev 446124) +++ vde-config.sample 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,35 +0,0 @@ -# Set options vde_switch program -# To activate this vde profile add it to /etc/conf.d/vde - -# Global options -VDE_NUMPORTS="32" # Number of ports (default 32) -VDE_HUB="no" # [yes|no] Make the switch act as a hub -VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol -VDE_MAC="" # Set the Switch MAC address -VDE_PRIORITY="" # Set the priority for FST (MAC extension) -VDE_HASHSIZE="" # Hash table size - -# Options from datasock module -VDE_SOCK="/var/run/vde/sample.sock" # control directory pathname -VDE_SOCK_MODE="660" # Standard access mode for comm sockets (octal) -VDE_SOCK_GROUP="root" # Group owner for comm sockets - -# Options from consmgmt module -VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt" # path of the management UNIX socket -VDE_MANAGEMENT_SOCK_MODE="660" # management UNIX socket access mode (octal) - -# Other options to parse to vde_switch -VDE_OPTIONS="" - -# VDE with internet support -# You can use either tuntap method or slirpvde method. - -# Options from tuntap module -VDE_TAP="" # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1"). - -# slirpvde daemon support -SLIRP="no" # [yes|no] enable/disable SLIRP daemon support -SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE -SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) -# other options to parse to slirpvde -SLIRP_OPTIONS="" Deleted: vde-connection.sample =================================================================== --- vde-connection.sample 2022-05-20 09:17:20 UTC (rev 446124) +++ vde-connection.sample 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,6 +0,0 @@ -# You can add vde switch connections below -# just without the # at the beginning: -# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock -# or if hosts are different use this syntax: -# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock - Deleted: vde2-2.3.2-format-security.patch =================================================================== --- vde2-2.3.2-format-security.patch 2022-05-20 09:17:20 UTC (rev 446124) +++ vde2-2.3.2-format-security.patch 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,31 +0,0 @@ -diff -ruN a/src/common/cmdparse.c b/src/common/cmdparse.c ---- a/src/common/cmdparse.c 2011-11-23 17:41:14.000000000 +0100 -+++ b/src/common/cmdparse.c 2022-04-07 20:03:30.871180660 +0200 -@@ -284,13 +284,13 @@ - int i; - for (i=0;i<argc;i++) { - if (i) fprintf(mf," "); -- fprintf(mf,argv[i]); -+ fprintf(mf, "%s", argv[i]); - } - } else { - int num=atoi(t); - while (*t >='0' && *t <= '9') t++; - if (num < argc) -- fprintf(mf,argv[num]); -+ fprintf(mf, "%s", argv[num]); - } - } else - fprintf(mf,"%c",*t); -diff -ruN a/src/vde_switch/plugins/iplog.c b/src/vde_switch/plugins/iplog.c ---- a/src/vde_switch/plugins/iplog.c 2011-11-23 17:41:16.000000000 +0100 -+++ b/src/vde_switch/plugins/iplog.c 2022-04-07 20:03:30.871180660 +0200 -@@ -214,7 +214,7 @@ - ctime_r(&ntime,stime); - writev(logfilefd,iov,3); - } else if (logfilefd != -1) -- syslog(LOG_INFO, msg); -+ syslog(LOG_INFO, "%s", msg); - DBGOUT(D_LOGIP_NEWIP,"%s",msg); - } - } Deleted: vde2-2.3.2-openssl-1.1.patch =================================================================== --- vde2-2.3.2-openssl-1.1.patch 2022-05-20 09:17:20 UTC (rev 446124) +++ vde2-2.3.2-openssl-1.1.patch 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,92 +0,0 @@ ---- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 -+++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 -@@ -22,7 +22,7 @@ - exit(1); - } - --static EVP_CIPHER_CTX ctx; -+static EVP_CIPHER_CTX *ctx; - static int ctx_initialized = 0; - static int encryption_disabled = 0; - static int nfd; -@@ -30,6 +30,10 @@ - static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; - static int verbose = 0; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) -+#endif -+ - void vc_printlog(int priority, const char *format, ...) - { - va_list arg; -@@ -103,19 +107,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in encrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in encrypt final\n"); - olen = -1; -@@ -124,7 +130,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset(ctx); - return olen; - } - -@@ -138,19 +144,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in decrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in decrypt final\n"); - olen = -1; -@@ -159,7 +167,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset (ctx); - return olen; - } - Deleted: vde2.install =================================================================== --- vde2.install 2022-05-20 09:17:20 UTC (rev 446124) +++ vde2.install 2022-05-20 09:17:30 UTC (rev 446125) @@ -1,9 +0,0 @@ -post_install() { - echo "vde config files should be placed in /etc/vde, sample files are provided." - echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." - echo "Merge those examples, if needed to the according config files." -} - -post_upgrade() { - post_install $1 -}