Skip to content

Commit e62577a

Browse files
authored
Merge pull request #350 from KatharaFramework/develop
Kathará v3.7.9
2 parents 88f301f + e19f4f0 commit e62577a

30 files changed

+296
-191
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ body:
2222
attributes:
2323
label: Kathará Version
2424
description: "Please provide the Kathará version you are using (`kathara -v`)."
25-
placeholder: "3.7.8"
25+
placeholder: "3.7.9"
2626
validations:
2727
required: true
2828
- type: textarea

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We release patches for security vulnerabilities only for the last version:
66

77
| Version | Supported Versions |
88
|---------|--------------------|
9-
| 3.7.8 | :white_check_mark: |
9+
| 3.7.9 | :white_check_mark: |
1010

1111
## Reporting a Vulnerability
1212

docs/kathara-lrestart.1.ronn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kathara-lrestart(1) -- Restart a Kathara network scenario
55
## SYNOPSIS
66

77
`kathara lrestart` [`-h`] [`-F`] [`-l`]
8-
[`--noterminals` | `--terminals` | `--privileged`] [`-d` <DIRECTORY>]
8+
[`--noterminals` | `--terminals`] [`--privileged`] [`-d` <DIRECTORY>]
99
[`-o` [<OPTION> [<OPTION> ...]]] [`--xterm` <XTERM>]
1010
[`--no-hosthome` \| `--hosthome`] [`--no-shared` \| `--shared`] [`--exclude` <DEVICE_NAME> [<DEVICE_NAME> ...]]
1111
[<DEVICE_NAME> [<DEVICE_NAME> ...]]

docs/kathara-lstart.1.ronn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kathara-lstart(1) -- Start a Kathara network scenario
44

55
## SYNOPSIS
66

7-
`kathara lstart` [`-h`] [`--noterminals` \| `--terminals` \| `--privileged`]
7+
`kathara lstart` [`-h`] [`--noterminals` \| `--terminals`] [`--privileged`]
88
[`-d` <DIRECTORY>] [`-F`] [`-l`] [`-o` [<OPTION> [<OPTION> ...]]] [`--xterm` <XTERM>]
99
[`--print`] [`--no-hosthome` \| `--hosthome`] [`--no-shared` \| `--shared`] [`--exclude` <DEVICE_NAME> [<DEVICE_NAME> ...]]
1010
[<DEVICE_NAME> [<DEVICE_NAME> ...]]

docs/kathara-vstart.1.ronn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kathara-vstart(1) -- Start a new Kathara device
55
## SYNOPSIS
66

77
`kathara vstart` `-n` <DEVICE_NAME>
8-
[`-h`] [`--noterminals` | `--terminals` | `--privileged` | `--num_terms` <NUM_TERMS>]
8+
[`-h`] [`--noterminals` | `--terminals` | `--num_terms` <NUM_TERMS>] [`--privileged`]
99
[`--eth` <N:CD[/MAC_ADDR]> [<N:CD[/MAC_ADDR]> ...]]
1010
[`-e` [<EXEC_COMMANDS> [<EXEC_COMMANDS> ...]]] [`--mem` <MEM>]
1111
[`--cpus` <CPUS>] [`-i` <IMAGE>] [`--no-hosthome` \| `--hosthome`]

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
[project]
22
name = "kathara"
3-
version = "3.7.8"
3+
version = "3.7.9"
44
description = "A lightweight container-based network emulation tool."
55
readme = "README.md"
66
requires-python = ">=3.9"
7-
license = { file = "LICENSE" }
7+
license = 'gpl-3.0'
8+
license-files = ["LICENSE"]
89
keywords = ["NETWORK-EMULATION", "CONTAINERS", "NFV"]
910
authors = [
1011
{ name = "Kathara Framework", email = "contact@kathara.org" }
@@ -22,7 +23,6 @@ classifiers = [
2223
"Intended Audience :: Education",
2324
"Intended Audience :: Telecommunications Industry",
2425
"Topic :: Software Development :: Build Tools",
25-
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
2626
"Programming Language :: Python :: 3.9",
2727
"Programming Language :: Python :: 3.10",
2828
"Programming Language :: Python :: 3.11"

scripts/Linux-Deb/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22

3-
VERSION=3.7.8
3+
VERSION=3.7.9
44
DEBIAN_PACKAGE_VERSION=1
55
LAUNCHPAD_NAME=user
66
NO_BINARY_PACKAGES=pyroute2|pyuv|deepdiff
@@ -59,13 +59,13 @@ download-pip: copy-debian-folder
5959
cd Output/kathara-$(VERSION)/debian/pythonLibs_amd64 && /root/py-build-env/bin/pip download --platform manylinux2014_x86_64 --only-binary=:all: zstandard
6060
cd Output/kathara-$(VERSION)/debian/pythonLibs_amd64 && /root/py-build-env/bin/pip download --no-binary=:all: -r ../../requirements-no-binary.txt
6161
cd Output/kathara-$(VERSION)/debian/pythonLibs_amd64 && /root/py-build-env/bin/pip download --platform manylinux2014_x86_64 --platform x86_64 --only-binary=:all: -r ../../requirements-binary.txt
62-
cd Output/kathara-$(VERSION)/debian/pythonLibs_amd64 && /root/py-build-env/bin/pip download --no-binary=:all: nuitka
62+
cd Output/kathara-$(VERSION)/debian/pythonLibs_amd64 && /root/py-build-env/bin/pip download --no-binary=:all: nuitka==2.6.7
6363
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --platform manylinux2014_aarch64 --only-binary=:all: flit_core
6464
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --platform manylinux2014_aarch64 --only-binary=:all: wheel
6565
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --platform manylinux2014_aarch64 --only-binary=:all: zstandard
6666
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --no-binary=:all: -r ../../requirements-no-binary.txt
6767
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --platform manylinux2014_aarch64 --platform arm64 --only-binary=:all: -r ../../requirements-binary.txt
68-
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --no-binary=:all: nuitka
68+
cd Output/kathara-$(VERSION)/debian/pythonLibs_arm64 && /root/py-build-env/bin/pip download --no-binary=:all: nuitka==2.6.7
6969
rm Output/kathara-$(VERSION)/debian/pythonLibs_arm64/zstandard*.tar.gz
7070
rm Output/kathara-$(VERSION)/debian/pythonLibs_amd64/zstandard*.tar.gz
7171
rm -Rf Output/kathara-$(VERSION)/requirements-binary.txt Output/kathara-$(VERSION)/requirements-no-binary.txt

scripts/Linux-Deb/debian/changelog

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
kathara (__VERSION__-__DEBIAN_PACKAGE_VERSION____UBUNTU_VERSION__) __UBUNTU_VERSION__; urgency=low
22

3-
* WARNING: "ltest" command is deprecated. It will be removed in the next release! Please use the "kathara-lab-checker" tool as its replacement with enhanced functionalities.
4-
* Add "--topology" argument to "kathara linfo" that displays a list of collision domains and the devices connected to each of them
5-
* "kathara linfo" now displays a column with the connected interfaces of each device
6-
* "kathara exec" now returns the exact exit code of the command
7-
* API Improvements in the "Lab" object
8-
* (Docker) Fix "rp_filter" sysctl assigment on Docker Engine >= v27.0.0
9-
* (Docker) Add the possibility to specify "ulimits" in network scenario metadata (thanks to g4br-i)
10-
* (Docker) Fix compatibility with docker-io version numbers
11-
* (Kubernetes) Add the support to private image registries through the "docker.json" file (thanks to Giovanni Barbiero)
12-
* Minor bug fixes
3+
* (Docker) Fix user-defined interface-specific sysctls on Docker Engine >= v27.0.0
4+
* Open device terminals when "--privileged" flag is set
5+
* Assign device FQDN in "/etc/hosts" (if no "/etc/hosts" is passed by the user)
6+
* Fix TMUX issues
137

148
-- Kathara Team <contact@kathara.org> __DATE__

scripts/Linux-Pkg/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22

3-
VERSION=3.7.8
3+
VERSION=3.7.9
44
PACKAGE_VERSION=1
55
AUR_NAME=user
66
AUR_MAIL=contact@kathara.org

scripts/Linux-Pkg/kathara.spec

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# -*- mode: python ; coding: utf-8 -*-
2+
3+
block_cipher = None
4+
5+
6+
a = Analysis(['kathara.py'],
7+
pathex=['../src/'],
8+
binaries=[],
9+
datas=[],
10+
hiddenimports=['Kathara',
11+
'Kathara.cli',
12+
'Kathara.cli.command',
13+
'Kathara.cli.command.CheckCommand',
14+
'Kathara.cli.command.ConnectCommand',
15+
'Kathara.cli.command.ExecCommand',
16+
'Kathara.cli.command.LcleanCommand',
17+
'Kathara.cli.command.LinfoCommand',
18+
'Kathara.cli.command.ListCommand',
19+
'Kathara.cli.command.LrestartCommand',
20+
'Kathara.cli.command.LstartCommand',
21+
'Kathara.cli.command.LtestCommand',
22+
'Kathara.cli.command.LconfigCommand',
23+
'Kathara.cli.command.SettingsCommand',
24+
'Kathara.cli.command.VcleanCommand',
25+
'Kathara.cli.command.VconfigCommand',
26+
'Kathara.cli.command.VstartCommand',
27+
'Kathara.cli.command.WipeCommand',
28+
'Kathara.cli.ui',
29+
'Kathara.cli.ui.setting',
30+
'Kathara.cli.ui.setting.DockerOptionsHandler',
31+
'Kathara.cli.ui.setting.KubernetesOptionsHandler',
32+
'Kathara.manager',
33+
'Kathara.manager.Kathara',
34+
'Kathara.manager.docker',
35+
'Kathara.manager.docker.DockerManager',
36+
'Kathara.manager.kubernetes',
37+
'Kathara.manager.kubernetes.KubernetesManager',
38+
'Kathara.setting',
39+
'Kathara.setting.addon',
40+
'Kathara.setting.addon.DockerSettingsAddon',
41+
'Kathara.setting.addon.KubernetesSettingsAddon'
42+
],
43+
hookspath=[],
44+
runtime_hooks=[],
45+
excludes=[],
46+
win_no_prefer_redirects=False,
47+
win_private_assemblies=False,
48+
cipher=block_cipher,
49+
noarchive=False)
50+
pyz = PYZ(a.pure, a.zipped_data,
51+
cipher=block_cipher)
52+
exe = EXE(pyz,
53+
a.scripts,
54+
[],
55+
name='kathara',
56+
debug=False,
57+
bootloader_ignore_signals=False,
58+
strip=False,
59+
upx=True,
60+
upx_exclude=[],
61+
exclude_binaries=True,
62+
runtime_tmpdir=None,
63+
target_arch='x86',
64+
console=True)
65+
66+
col = COLLECT(exe,
67+
a.binaries,
68+
a.zipfiles,
69+
a.datas,
70+
strip=False,
71+
upx=True,
72+
upx_exclude=[],
73+
name='kathara'
74+
)

0 commit comments

Comments
 (0)