sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (0f2255be9db042d5789229c1b360e89cc4256876)

From: Thomas Orgis <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (0f2255be9db042d5789229c1b360e89cc4256876)
Date: Wed, 17 Apr 2024 17:31:34 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 3 +++
emulators/qemu/DEPENDS | 6 ++++++
emulators/qemu/DETAILS | 1 +
emulators/qemu/HISTORY | 4 ++++
emulators/qemu/archs | 1 -
net/libnftnl/DETAILS | 4 ++--
net/libnftnl/HISTORY | 3 +++
net/libslirp/CONFIGURE | 2 ++
net/libslirp/DEPENDS | 2 ++
net/libslirp/DETAILS | 15 +++++++++++++++
net/libslirp/HISTORY | 3 +++
net/nftables/DEPENDS | 2 +-
net/nftables/DETAILS | 4 ++--
net/nftables/HISTORY | 3 +++
14 files changed, 47 insertions(+), 6 deletions(-)

New commits:
commit 0f2255be9db042d5789229c1b360e89cc4256876
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nftables: version 1.0.9

commit 2ea61ed578a09e9722fc04f19b337c9d6f9fd9ee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libnftnl: version 1.2.6

commit 937cc50ab1e7bfa96add5419fbc40b4ddaca431c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qemu: fix -net user via libslirp dependency, ++PATCHLEVEL

This was silently dropped from the spell as libslirp was
separated out.

commit d4c1070da0910236bb5dd5589b66ea41f88fce5e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libslirp: new spell (needed for qemu user networking)

diff --git a/ChangeLog b/ChangeLog
index 6db24e4..32a8a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2024-04-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * net/libslirp: support for network emulation
+
2024-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* xorg.gpg: update "Matt Turner <mattst88 AT gmail.com>"

diff --git a/emulators/qemu/DEPENDS b/emulators/qemu/DEPENDS
index 2e4648b..e6829f7 100755
--- a/emulators/qemu/DEPENDS
+++ b/emulators/qemu/DEPENDS
@@ -52,6 +52,7 @@ if is_depends_enabled "$SPELL" sdl2; then
'for SDL Image support for icons'
fi &&

+
optional_depends ncurses \
"--enable-curses" \
"--disable-curses" \
@@ -181,6 +182,11 @@ optional_depends DEVICE-MANAGER \
--disable-libudev \
'to enumerate host devices with libudev' &&

+suggest_depends libslirp \
+ --enable-slirp \
+ --disable-slirp \
+ 'for simple networking (-net user)' &&
+
suggest_depends bridge-utils \
'' \
'' \
diff --git a/emulators/qemu/DETAILS b/emulators/qemu/DETAILS
index 5a8859c..a89361b 100755
--- a/emulators/qemu/DETAILS
+++ b/emulators/qemu/DETAILS
@@ -1,5 +1,6 @@
SPELL=qemu
VERSION=8.2.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
diff --git a/emulators/qemu/HISTORY b/emulators/qemu/HISTORY
index e5e0cc1..f6f9123 100644
--- a/emulators/qemu/HISTORY
+++ b/emulators/qemu/HISTORY
@@ -1,3 +1,7 @@
+2024-04-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: add libslirp usage to re-enable user networking
+ * DETAILS: ++PATCHLEVEL to make cast pick up the change
+
2024-03-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 8.2.2

diff --git a/emulators/qemu/archs b/emulators/qemu/archs
index c6c70fa..4b19818 100644
--- a/emulators/qemu/archs
+++ b/emulators/qemu/archs
@@ -37,7 +37,6 @@ ppc-linux-user ppc-user on
ppc-softmmu ppc on
ppc64-linux-user ppc64-user on
ppc64-softmmu ppc64 on
-ppc64abi32-linux-user ppc64abi32-user on
ppc64le-linux-user ppc64le-user on
riscv32-linux-user riscv32-user on
riscv32-softmmu riscv32 on
diff --git a/net/libnftnl/DETAILS b/net/libnftnl/DETAILS
index 5a37496..2e0ae16 100755
--- a/net/libnftnl/DETAILS
+++ b/net/libnftnl/DETAILS
@@ -1,6 +1,6 @@
SPELL=libnftnl
- VERSION=1.1.8
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.2.6
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=https://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.sig
diff --git a/net/libnftnl/HISTORY b/net/libnftnl/HISTORY
index 22e3cc8..d3245aa 100644
--- a/net/libnftnl/HISTORY
+++ b/net/libnftnl/HISTORY
@@ -1,3 +1,6 @@
+2024-04-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.2.6
+
2021-01-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.1.8

diff --git a/net/libslirp/CONFIGURE b/net/libslirp/CONFIGURE
new file mode 100644
index 0000000..27199b7
--- /dev/null
+++ b/net/libslirp/CONFIGURE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}"/MESON_CONFIGURE
+
diff --git a/net/libslirp/DEPENDS b/net/libslirp/DEPENDS
new file mode 100755
index 0000000..2f0fc53
--- /dev/null
+++ b/net/libslirp/DEPENDS
@@ -0,0 +1,2 @@
+. "$GRIMOIRE"/MESON_DEPENDS &&
+depends glib2
diff --git a/net/libslirp/DETAILS b/net/libslirp/DETAILS
new file mode 100755
index 0000000..429cb14
--- /dev/null
+++ b/net/libslirp/DETAILS
@@ -0,0 +1,15 @@
+. ${GRIMOIRE}/MESON_FUNCTIONS
+ SPELL=libslirp
+ VERSION=4.7.0
+ SOURCE="${SPELL}-v${VERSION}.tar.bz2"
+
SOURCE_URL[0]=https://gitlab.freedesktop.org/slirp/${SPELL}/-/archive/v${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:01aee79997c37e3de50da1583671aa30a1bfb837d4c5c648194bbfdb350b7f8dc89653dbdb42530a409c0d0f4e40eb111cc3fe0b9f4890fd5a062446e92c0f62
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-v${VERSION}"
+ WEB_SITE="https://gitlab.freedesktop.org/slirp/libslirp/";
+ LICENSE[0]=BSD
+ ENTERED=20240417
+ SHORT="A general purpose TCP-IP emulator used by virtual machine
hypervisors to provide virtual networking services."
+cat << EOF
+A general purpose TCP-IP emulator used by virtual machine hypervisors to
+provide virtual networking services. This is what enables qemu -net user.
+EOF
diff --git a/net/libslirp/HISTORY b/net/libslirp/HISTORY
new file mode 100644
index 0000000..5436b86
--- /dev/null
+++ b/net/libslirp/HISTORY
@@ -0,0 +1,3 @@
+2024-04-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS: spell created
+
diff --git a/net/nftables/DEPENDS b/net/nftables/DEPENDS
index 8e75eb2..e22001e 100755
--- a/net/nftables/DEPENDS
+++ b/net/nftables/DEPENDS
@@ -1,5 +1,5 @@
. "$GRIMOIRE"/VDEPENDS &&
vdepends <<EOF
libmnl
- libnftnl >= 1.1.8
+ libnftnl >= 1.2.6
EOF
diff --git a/net/nftables/DETAILS b/net/nftables/DETAILS
index 60873a4..da0a6d6 100755
--- a/net/nftables/DETAILS
+++ b/net/nftables/DETAILS
@@ -1,6 +1,6 @@
SPELL=nftables
- VERSION=0.9.7
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.0.9
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL}.sig
diff --git a/net/nftables/HISTORY b/net/nftables/HISTORY
index ad52ca8..e0c0647 100644
--- a/net/nftables/HISTORY
+++ b/net/nftables/HISTORY
@@ -1,3 +1,6 @@
+2024-04-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.0.9
+
2021-01-06 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: made kernel check non-fatal
* DEPENDS: added version check for libnftnl

[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (0f2255be9db042d5789229c1b360e89cc4256876), Thomas Orgis, 04/17/2024