[packages/vde2] - updated to 2.3.3; many parts obsolete, python modules gone
qboosh
qboosh at pld-linux.org
Sat Apr 5 19:13:11 CEST 2025
commit 3735f29357c18013d32db7c4bbf1a82aeb56b308
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 5 18:52:42 2025 +0200
- updated to 2.3.3; many parts obsolete, python modules gone
python3.patch | 7 ---
vde2-format.patch | 18 ------
vde2-openssl-1.1.patch | 94 ----------------------------
vde2-pathmax.patch | 12 ----
vde2.spec | 166 ++++++++-----------------------------------------
5 files changed, 25 insertions(+), 272 deletions(-)
---
diff --git a/vde2.spec b/vde2.spec
index c972aeb..3f02450 100644
--- a/vde2.spec
+++ b/vde2.spec
@@ -1,33 +1,25 @@
-#
-# Conditional build:
-%bcond_without python2 # CPython 2.x module
-%bcond_without python3 # CPython 3.x module
-
Summary: VDE2: Virtual Distributed Ethernet
Summary(pl.UTF-8): VDE2: wirtualny rozproszony ethernet
Name: vde2
-Version: 2.3.2
-Release: 8
-License: LGPL v2.1+ (libvdeplug), BSD (slirpvde), GPL v2+ (the rest)
+Version: 2.3.3
+Release: 1
+License: LGPL v2.1+ (libvdeplug), GPL v2+ (the rest)
Group: Networking/Utilities
-Source0: http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
-# Source0-md5: 46fbc5f97f03dc517aa3b2c9d9ea6628
+Source0: https://github.com/virtualsquare/vde-2/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: d73411e88975a9f7c9cb4c2b0ad32d15
Patch0: %{name}-pathmax.patch
-Patch1: %{name}-format.patch
-Patch2: %{name}-openssl-1.1.patch
-Patch3: python3.patch
-URL: http://sourceforge.net/projects/vde/
+Patch1: %{name}-pc.patch
+URL: https://github.com/virtualsquare/vde-2
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: libpcap-devel
-BuildRequires: libtool
-BuildRequires: openssl-devel
-%{?with_python2:BuildRequires: python-devel >= 1:2.5}
-%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
+BuildRequires: libtool >= 2:2
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 2.043
+BuildRequires: wolfssl-devel
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: vde < 2
+Obsoletes: python-vde2 < 2.3.3
+Obsoletes: python3-vde2 < 2.3.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# expects "prompt" symbol from user
@@ -79,36 +71,10 @@ Static VDE2 library.
%description static -l pl.UTF-8
Statyczna biblioteka VDE2.
-%package -n python-vde2
-Summary: Python interface to VDE2
-Summary(pl.UTF-8): Pythonowy interfejs do VDE2
-Group: Libraries/Python
-Requires: %{name}-libs = %{version}-%{release}
-
-%description -n python-vde2
-Python interface to VDE2.
-
-%description -n python-vde2 -l pl.UTF-8
-Pythonowy interfejs do VDE2.
-
-%package -n python3-vde2
-Summary: Python interface to VDE2
-Summary(pl.UTF-8): Pythonowy interfejs do VDE2
-Group: Libraries/Python
-Requires: %{name}-libs = %{version}-%{release}
-
-%description -n python3-vde2
-Python interface to VDE2.
-
-%description -n python3-vde2 -l pl.UTF-8
-Pythonowy interfejs do VDE2.
-
%prep
-%setup -q
+%setup -q -n vde-2-%{version}
%patch -P 0 -p1
%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
%build
%{__libtoolize}
@@ -116,70 +82,26 @@ Pythonowy interfejs do VDE2.
%{__autoconf}
%{__autoheader}
%{__automake}
-%define configuredir ..
-%if %{with python2}
-install -d build-py2
-cd build-py2
-%configure \
- PYTHON=%{__python} \
- --disable-silent-rules \
- --enable-kernel-switch
+%configure \
+ --disable-silent-rules
-%{__make} -j1 \
- pythondir=%{py_sitedir}
-cd ..
-%endif
-
-%if %{with python3}
-install -d build-py3
-cd build-py3
-%configure \
- PYTHON=%{__python3} \
- --disable-silent-rules \
- --enable-kernel-switch
-
-%{__make} -j1 \
- pythondir=%{py3_sitedir}
-cd ..
-%endif
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%if %{with python3}
-%{__make} -C build-py3 install \
- DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py3_sitedir}
-%endif
-
-%if %{with python2}
-%{__make} -C build-py2%{?with_python3:/src/lib/python} install \
- DESTDIR=$RPM_BUILD_ROOT \
- pythondir=%{py_sitedir}
-%endif
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvde*.la
# loadable modules
%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/libvdetap.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/vde2/vde_l3/*.la
-%if %{with python2}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/vdeplug_python.la
-%endif
-%if %{with python3}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/vdeplug_python.la
-%endif
# libs .la kept - no Requires/Libs.private
-cp -p src/slirpvde/README README.slirpvde
-
-%if %{with python2}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
-%endif
-%if %{with python3}
-%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
-%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
-%endif
+# tools removed in 2.3.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{slirpvde,unixterm,vde_cryptcab,vde_l3,vde_vxlan,vdekvm,vdeq,vdeqemu}.1*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vde_tunctl.8*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -189,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING.slirpvde Changelog README README.slirpvde
+%doc Changelog README
%dir %{_sysconfdir}/vde2
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vde2/vdecmd
%dir %{_sysconfdir}/vde2/libvdemgmt
@@ -198,52 +120,33 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vde2/libvdemgmt/openmachine.rc
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vde2/libvdemgmt/sendcmd.rc
%attr(755,root,root) %{_bindir}/dpipe
-%attr(755,root,root) %{_bindir}/kvde_switch
-%attr(755,root,root) %{_bindir}/slirpvde
%attr(755,root,root) %{_bindir}/unixcmd
-%attr(755,root,root) %{_bindir}/unixterm
%attr(755,root,root) %{_bindir}/vde_autolink
-%attr(755,root,root) %{_bindir}/vde_cryptcab
-%attr(755,root,root) %{_bindir}/vde_l3
%attr(755,root,root) %{_bindir}/vde_over_ns
%attr(755,root,root) %{_bindir}/vde_pcapplug
%attr(755,root,root) %{_bindir}/vde_plug
%attr(755,root,root) %{_bindir}/vde_plug2tap
+%attr(755,root,root) %{_bindir}/vde_router
%attr(755,root,root) %{_bindir}/vde_switch
%attr(755,root,root) %{_bindir}/vdecmd
-%attr(755,root,root) %{_bindir}/vdekvm
-%attr(755,root,root) %{_bindir}/vdeq
-%attr(755,root,root) %{_bindir}/vdeqemu
%attr(755,root,root) %{_bindir}/vdeterm
%attr(755,root,root) %{_bindir}/wirefilter
-%attr(755,root,root) %{_sbindir}/vde_tunctl
%attr(755,root,root) %{_libexecdir}/vdetap
%dir %{_libdir}/vde2
%attr(755,root,root) %{_libdir}/vde2/libvdetap.so
-%dir %{_libdir}/vde2/vde_l3
-%attr(755,root,root) %{_libdir}/vde2/vde_l3/bfifo.so
-%attr(755,root,root) %{_libdir}/vde2/vde_l3/pfifo.so
-%attr(755,root,root) %{_libdir}/vde2/vde_l3/tbf.so
%{_mandir}/man1/dpipe.1*
-%{_mandir}/man1/slirpvde.1*
%{_mandir}/man1/unixcmd.1*
-%{_mandir}/man1/unixterm.1*
%{_mandir}/man1/vde_autolink.1*
-%{_mandir}/man1/vde_cryptcab.1*
-%{_mandir}/man1/vde_l3.1*
%{_mandir}/man1/vde_over_ns.1*
%{_mandir}/man1/vde_pcapplug.1*
%{_mandir}/man1/vde_plug.1*
%{_mandir}/man1/vde_plug2tap.1*
+%{_mandir}/man1/vde_router.1*
%{_mandir}/man1/vde_switch.1*
%{_mandir}/man1/vdecmd.1*
-%{_mandir}/man1/vdekvm.1*
-%{_mandir}/man1/vdeq.1*
-%{_mandir}/man1/vdeqemu.1*
%{_mandir}/man1/vdetaplib.1*
%{_mandir}/man1/vdeterm.1*
%{_mandir}/man1/wirefilter.1*
-%{_mandir}/man8/vde_tunctl.8*
%files libs
%defattr(644,root,root,755)
@@ -262,10 +165,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libvdemgmt.so
%attr(755,root,root) %{_libdir}/libvdeplug.so
%attr(755,root,root) %{_libdir}/libvdesnmp.so
-%{_libdir}/libvdehist.la
-%{_libdir}/libvdemgmt.la
-%{_libdir}/libvdeplug.la
-%{_libdir}/libvdesnmp.la
%{_includedir}/libvdehist.h
%{_includedir}/libvdemgmt.h
%{_includedir}/libvdeplug.h
@@ -282,18 +181,3 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libvdemgmt.a
%{_libdir}/libvdeplug.a
%{_libdir}/libvdesnmp.a
-
-%if %{with python2}
-%files -n python-vde2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/vdeplug_python.so
-%{py_sitedir}/VdePlug.py[co]
-%endif
-
-%if %{with python3}
-%files -n python3-vde2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/vdeplug_python.so
-%{py3_sitedir}/VdePlug.py
-%{py3_sitedir}/__pycache__/VdePlug.cpython-*.py[co]
-%endif
diff --git a/python3.patch b/python3.patch
deleted file mode 100644
index d066655..0000000
--- a/python3.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- vde2-2.3.2.orig/src/lib/python/VdePlug.py 2011-11-23 17:41:17.000000000 +0100
-+++ vde2-2.3.2/src/lib/python/VdePlug.py 2023-07-23 23:38:52.517525533 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
-
- '''
-
diff --git a/vde2-format.patch b/vde2-format.patch
deleted file mode 100644
index 5603468..0000000
--- a/vde2-format.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- vde2-2.3.2/src/common/cmdparse.c.orig 2011-11-23 17:41:14.000000000 +0100
-+++ vde2-2.3.2/src/common/cmdparse.c 2012-10-26 23:25:47.215786024 +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 --git a/vde2-openssl-1.1.patch b/vde2-openssl-1.1.patch
deleted file mode 100644
index 82e121a..0000000
--- a/vde2-openssl-1.1.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://aur.archlinux.org/cgit/aur.git/plain/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=vde2-static
-
---- 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;
- }
-
diff --git a/vde2-pathmax.patch b/vde2-pathmax.patch
index 5be7c3e..d1871b8 100644
--- a/vde2-pathmax.patch
+++ b/vde2-pathmax.patch
@@ -1,15 +1,3 @@
-diff -urNp -x '*.orig' vde2-2.3.2.org/src/kvde_switch/consmgmt.h vde2-2.3.2/src/kvde_switch/consmgmt.h
---- vde2-2.3.2.org/src/kvde_switch/consmgmt.h 2011-11-23 17:41:17.000000000 +0100
-+++ vde2-2.3.2/src/kvde_switch/consmgmt.h 2021-10-03 20:37:26.243228873 +0200
-@@ -87,3 +87,7 @@ struct plugin {
- struct plugin *next;
- };
- #endif
-+
-+#ifndef PATH_MAX
-+#define PATH_MAX 1024
-+#endif
-diff -urNp -x '*.orig' vde2-2.3.2.org/src/vde_plug2tap.c vde2-2.3.2/src/vde_plug2tap.c
--- vde2-2.3.2.org/src/vde_plug2tap.c 2011-11-23 17:41:18.000000000 +0100
+++ vde2-2.3.2/src/vde_plug2tap.c 2021-10-03 20:37:26.243228873 +0200
@@ -51,6 +51,10 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vde2.git/commitdiff/3735f29357c18013d32db7c4bbf1a82aeb56b308
More information about the pld-cvs-commit
mailing list