openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package coreemu

--- coreemu.changes.orig
+++ coreemu.changes
@@ -1,4 +1,80 @@
 -------------------------------------------------------------------
+Fri Mar 19 07:09:29 UTC 2021 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 7.5.0
+  core-daemon
+  * fixed issue setting mobility loop value properly.
+  * fixed issue that some states would not properly remove session
+    directories.
+  * fixed issues with sdt integration for mobility movement and
+    layer creation.
+  core-pygui
+  * added multiple canvas support.
+  * added support to hide nodes and restore them visually.
+  * update to assign full netmasks to wireless connected nodes
+    by default.
+  * update to display services and action controls for nodes
+    during runtime.
+  * fixed issues with custom nodes.
+  * fixed issue auto assigning macs, avoiding duplication.
+  * fixed issue joining session with different netmasks.
+  * fixed issues when deleting a session from the sessions dialog.
+  * fixed issue not sending all service customization data core-cli
+  * added delete session command.
+- Update to version 7.4.0
+  Installation
+  * fixed issue for automated install assuming ID_LIKE is always
+    present in /etc/os-release.
+  gRPC API
+  * fixed issue stopping session and not properly going to data
+    collect state.
+  * fixed issue to have start session properly create a directory
+    before configuration state.
+  core-pygui
+  * fixed issue handling deletion of wired link to a switch.
+  * avoid saving edge metadata to xml when values are default.
+  * fixed issue editing node mac addresses.
+  * added support for configuring interface names.
+  * fixed issue with potential node names to allow hyphens and
+    remove under bars.
+  * fixed issue changing distributed nodes back to local.
+  core-daemon
+  * fixed issue to properly handle deleting links from a network
+    to network node.
+  * updated xml to support writing and reading link buffer
+    configurations.
+  * reverted change and removed mac learning from wlan, due to
+    promiscuous like behavior.
+  * fixed issue creating control interfaces when starting services
+  * fixed deadlock issue when clearing a session using sdt.
+  * #116 - fixed issue for wlans handling multiple mobility
+    scripts at once.
+  * #539 - fixed issue in udp tlv api.
+
+-------------------------------------------------------------------
+Thu Nov  5 19:20:16 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 7.2.1
+  lots of changes, see /usr/share/doc/packages/coreemu/CHANGELOG.md
+
+-------------------------------------------------------------------
+Wed Mar 27 19:23:27 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 5.2.1
+  * Added source NAT service
+  * Fixed DHCP service for Ubuntu 18.04
+  * properly remove session on delete TLV API call
+  * updated default gnome terminal command for nodes to be Ubuntu
+    18.04 compatible
+  * updates to service validation, will retry on failure and better
+    exception logging
+  * TLV link message data fix
+  * fix to avoid clearing out default services
+  * removed wireless_link_all API from EmuSession
+  * updated default WLAN bandwidth to 54Mbps
+  * fix to saving RJ45 to session XML files
+
+-------------------------------------------------------------------
 Tue Nov 13 19:28:22 UTC 2018 - mardnh@gmx.de
 
 - Update to version 5.2
--- coreemu.spec.orig
+++ coreemu.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package coreemu
 #
-# Copyright (c) 2016-2018, Martin Hauke <mardnh@gmx.de>
+# Copyright (c) 2016-2021, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,48 +16,66 @@
 #
 
 Name:           coreemu
-Version:        5.2
+Version:        7.5.0
 Release:        0
 Summary:        Common Open Research Emulator for use with network namespaces
 License:        BSD-2-Clause
 Group:          System/Emulators/PC
-Url:            http://www.nrl.navy.mil/itd/ncs/products/core
-#Source:         http://downloads.pf.itd.nrl.navy.mil/core/source/core-%{version}.tar.gz
+URL:            https://www.nrl.navy.mil/itd/ncs/products/core
 Source:         https://github.com/coreemu/core/archive/release-%{version}.tar.gz
-Patch1:		coreemu-systemddir.diff
-#Patch2:		coreemu-fix-desktop-file.diff
-#Patch3:		coreemu-remove-shebang.diff
+Source1:        core-daemon.service
 BuildRequires:  ImageMagick
 BuildRequires:  autoconf
 BuildRequires:  automake
-#
 BuildRequires:  bridge-utils
 BuildRequires:  ebtables
+BuildRequires:  ethtool
 BuildRequires:  fdupes
 BuildRequires:  help2man
 BuildRequires:  iproute2
-BuildRequires:  pkg-config
-BuildRequires:  python2-Sphinx
-BuildRequires:  python2-sphinxcontrib-apidoc
-BuildRequires:  python2-idna
-BuildRequires:  python2-devel
-#
-BuildRequires:  systemd
+BuildRequires:  openvswitch
+BuildRequires:  pkgconfig
+BuildRequires:  procps
+BuildRequires:  python-dephell-rpm-macros
+#
+BuildRequires:  python38-dephell
+#
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-grpcio-tools
+BuildRequires:  python3-pip
+BuildRequires:  python3-poetry
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-sphinxcontrib-apidoc
 BuildRequires:  pkgconfig(libev)
-#
+# SECTION test requirements
+BuildRequires:  python3-pytest
+BuildRequires:  python3-mock
+BuildRequires:  python3-netaddr
+BuildRequires:  python3-Fabric
+BuildRequires:  python3-Mako
+BuildRequires:  python3-lxml
+BuildRequires:  python3-pyproj
+# /SECTION
+Requires:       python3-grpcio
+Requires:       python3-pyproj
+Requires:       python3-netaddr
+Requires:       python3-Fabric
+Requires:       python3-Mako
+Requires:       python3-lxml
 Requires:       bridge-utils
 Requires:       ebtables
 Requires:       iproute2
 Requires:       tcl
 Requires:       tk
 Requires:       tkimg
-#
-Recommends:	quagga
-#Recommends:	mgen
-#Recommends:	ipsec-tools
-#Recommends:	docker
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Recommends:     docker
+Recommends:     frr
+Recommends:     ipsec-tools
+Recommends:     mgen
+Recommends:     openvswitch
+Recommends:     quagga
+Suggests:       tcpdump
+Suggests:       wireshark
 
 %description
 The Common Open Research Emulator provides Python modules and a GUI for
@@ -65,29 +83,37 @@ building virtual networks using Linux ne
 
 %prep
 %setup -q -n core-release-%{version}
-%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
 
 %build
 ./bootstrap.sh
-export CFLAGS="-fno-strict-aliasing -Wno-error=int-in-bool-context %{optflags}"
-%configure --with-startup=systemd
-make %{?_smp_mflags}
+%configure \
+    --enable-docs=yes \
+    --enable-daemon=yes
+%make_build
+cd daemon
+%dephell_gensetup
+%python3_build
 
 %install
 %make_install
-%fdupes -s %{buildroot}
-
-# FIXME: set proper permissions
-chmod 644 %{buildroot}/%{_unitdir}/core-daemon.service
+cd daemon
+%python3_install
+install -d %{buildroot}%{_sysconfdir}/core/
+install -m0660 data/core.conf data/logging.conf %{buildroot}%{_sysconfdir}/core/
+install -m0755 scripts/core* %{buildroot}%{_bindir}/
+install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/core-daemon.service
 
-# compat rc-symlink   
+# compat rc-symlink
 install -d %{buildroot}/%{_sbindir}
-ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rccore-daemon
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rccore-daemon
 
 # Fix env-script-interpreter warnings
-find "%{buildroot}/%{_datadir}/core/examples/" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|g'
+#find scripts/ -iname "core*" | xargs sed -i 's|#!/usr/bin/env python3|#!/usr/bin/python3|g'
+
+# Delete examples from python sitelib
+# rm -R %{python3_sitelib}/examples
+
+%fdupes -s %{buildroot}
 
 %pre
 %service_add_pre core-daemon.service
@@ -101,37 +127,57 @@ find "%{buildroot}/%{_datadir}/core/exam
 %postun
 %service_del_postun core-daemon.service
 
+%check
+### FIXME
+#%# Don't run tests that require root/elevated privileges
+#%rm daemon/tests/test_distributed.py
+#%rm daemon/tests/test_core.py
+#%rm daemon/tests/test_grpc.py
+#%rm daemon/tests/test_gui.py
+#%rm daemon/tests/test_links.py
+#%rm daemon/tests/test_nodes.py
+#%rm daemon/tests/test_services.py
+#%rm daemon/tests/test_xml.py
+#%export PATH=$PATH:/usr/sbin/:%{buildroot}%{_bindir}
+#%cd daemon
+#%%pytest -k 'not (test_model_set or test_model_set_error or test_get_models)'
+
+#### TODO
+# * Servicefile testen
+# * alle Runtime-Abhängigkeiten testen - /bindir/core* mehr python zeugs
+# *    -> /usr/lib/python3.8/site-packages/core/
+# * besseres changelog
+#   - python3 change
+#   - verweis auf Changelog.md
+#   - run testsuite
+# * kann man python3-sitelib examples löschenn -> die muss ich unbeding löschen !!!
+# * beim bau der docs exception dass da python modul nicht gefunden wird
+#   -> [   31s] No module named 'core'
+       #[   31s] WARNING: autodoc: failed to import module 'api.grpc.mobility_pb2' from module 'core'; the following exception was raised:...
+# * warnings aus dem post-build-scripts raus
+
 %files
-%doc Changelog LICENSE README.md
-%{_mandir}/man1/*
+%license LICENSE
+%doc CHANGELOG.md README.md
 %dir %{_sysconfdir}/core
-%config %{_sysconfdir}/core/core.conf
-%config %{_sysconfdir}/core//logging.conf
-%config %{_sysconfdir}/core/perflogserver.conf
-#
-%{_unitdir}/core-daemon.service
-%dir %{_libexecdir}/core/
-%dir %{_libexecdir}/core/addons
-%{_libexecdir}/core/addons/ipsecservice.tcl
-%{_libexecdir}/core/*.tcl
-#
-%{_sbindir}/rccore-daemon
-#
-%{_bindir}/core-gui
-%{_bindir}/core-cleanup
-%{_bindir}/core-daemon
-%{_bindir}/core-manage
+%config(noreplace) %{_sysconfdir}/core/core.conf
+%config(noreplace) %{_sysconfdir}/core/logging.conf
+%{_bindir}/core-*
 %{_bindir}/coresendmsg
 %{_bindir}/netns
 %{_bindir}/vcmd
 %{_bindir}/vnoded
-#
+%{_sbindir}/rccore-daemon
+%{_unitdir}/core-daemon.service
+%dir %{_prefix}/lib/core
+%dir %{_prefix}/lib/core/addons
+%{_prefix}/lib/core/addons/ipsecservice.tcl
+%{_prefix}/lib/core/*.tcl
 %{_datadir}/core
-%dir %{_datadir}/corens3
-%{_datadir}/corens3/examples
 %{_datadir}/pixmaps/core-gui.xpm
 %{_datadir}/applications/core-gui.desktop
-#
-%{python2_sitelib}
+%{_mandir}/man1/*.1%{?ext_man}
+%{python3_sitelib}/core*
+%{python3_sitelib}/examples
 
 %changelog

Places

File project.diff of Package coreemu

Places