From patchwork Thu Sep 28 10:36:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7262 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rx9053yb1z3wl7 for ; Thu, 28 Sep 2023 10:37:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rx9031mYXz2SL; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rx90311YGz306Q; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rx902070kz2xHv for ; Thu, 28 Sep 2023 10:37:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rx9006SZMzlw; Thu, 28 Sep 2023 10:37:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695897425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/SBpRdh1YH0l0tSAAshQk7wh4yt+G0GIDry6siKummI=; b=pVrQWEwSDLivabKAqXsv2XanraCVyyHw50f+JFk0EShz8RCWR/owXLdHXrgbGu0r7um1Be 6G/zi7pC3onu74AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695897425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/SBpRdh1YH0l0tSAAshQk7wh4yt+G0GIDry6siKummI=; b=l4Xt5Vt/LO74gnPZpbU8NAHGuAlHTJrK7uhfeLdvRbohpWSAY/Yl7rbPj88NqbhDjgRKjT 4jKJuTIacVUh5V1ma5hs1DW/f9hUU17lqvxDYuIDZSKwXCYjd8AFU+1ax8JTr4W8XHn6ZS oiqL+ZceUmONbI6MdgJK1Y41U3BAwcr5Sd4oSGOov8ntn/1s7o2xWN2qjrK5VyCWYWqywi JCjXFfB+gpycnUlrFhCPeNE7qpr8ajKsvQPnVEqMiKS5w71jai+4rswEForR+61//9CfNu XXxqcEDjE6PvIj9mKbQUQoA998qjYXBVdbd8s4pK4LQzhBVm+iGqQs5lffzmLA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/3] qemu: Update to version 8.1.1 and add libslirp for net user backend Date: Thu, 28 Sep 2023 12:36:59 +0200 Message-ID: <20230928103702.2652442-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 8.0.3 to 8.1.1 - In CU179 the update of qemu caused at least one user to have a problem starting his qemu system as the qemu bundled slirp library used for the net user backend was removed in version 7.2. Unfortunately no user tested qemu in the CU179 Testing phase, or if they did they are not using the net user backend. - This patch adds the --enable-slirp option to configure and installs libslirp in a separate patch. - I can't test if this now works as I don't use qemu anywhere. - Changelog is too large to include here. 8.1 https://wiki.qemu.org/ChangeLog/8.1 Signed-off-by: Adolf Belka --- config/rootfiles/packages/qemu | 5 +++++ lfs/qemu | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e69e28322..efc0cbd2e 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -18,7 +18,12 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 +#usr/include/fdt.h +#usr/include/libfdt.h +#usr/include/libfdt_env.h usr/include/qemu-plugin.h +#usr/lib/libfdt.a +#usr/lib/pkgconfig/libfdt.pc usr/libexec/qemu-bridge-helper #usr/share/applications/qemu.desktop #usr/share/icons/hicolor/128x128/apps/qemu.png diff --git a/lfs/qemu b/lfs/qemu index 8af87e75e..1e46f14a1 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -27,7 +27,7 @@ include Config SUMMARY = Machine emulator and virtualizer # If you update the version also qemu-ga !!! -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 39 +PAK_VER = 40 -DEPS = alsa elfutils libusbredir spice libseccomp +DEPS = alsa elfutils libusbredir spice libseccomp libslirp SERVICES = @@ -61,7 +61,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 +$(DL_FILE)_BLAKE2 = 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340 install : $(TARGET) @@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-usb-redir \ --enable-seccomp \ --disable-docs \ - --disable-sdl + --disable-sdl \ + --enable-slirp cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From patchwork Thu Sep 28 10:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7263 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rx9065fmzz3wl7 for ; Thu, 28 Sep 2023 10:37:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rx9034Hwbz3q8; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rx9031WyCz30Hp; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rx9020HnNz2xbV for ; Thu, 28 Sep 2023 10:37:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rx9014jQHz1l6; Thu, 28 Sep 2023 10:37:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695897425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M33skPWY0uJpRRI7WBRv42VFc48kN1PmOfeLBgjdkXg=; b=x+/9mnNiVLnqfM6jUBWNURzOP/c63VreFG7X/qleewDyigeOMW3+ocuxtSAUZR8x9vOcNx Pg2b78uGctL2jzCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695897425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M33skPWY0uJpRRI7WBRv42VFc48kN1PmOfeLBgjdkXg=; b=uOr1suvP+9b+CMcCA6mak/ZtB+AUYvoc2qnQ/eMnGu8jJ4nO4O8JHk2huj7MgnnYwfaBZR AtYWPQoZi6lIih3SmlSyhmNafVg45k25xMPXKAWsCf0VS4u6hjycnzaJChgY4h6r4zpsXu oy3RWa4AmbaKxyaCSxMEY8loQho231wIrExN4CXFb10w6sANQqsDQmvhVjOZ7a/7kBWS9m f0QpfsbYNymdLRUrcO6x0RN+1Tt4B7kti7BuIAYuljCg2uQqyLXoo8u3q58E/k2uS6VJJN /M3ureW3J1e8MxTWffcF3ljewcSPYxm3uJyc5d70lAw/4IOjLN1QoPF3lLaSWQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] qemu-ga: Update to version 8.1.1 Date: Thu, 28 Sep 2023 12:37:00 +0200 Message-ID: <20230928103702.2652442-2-adolf.belka@ipfire.org> In-Reply-To: <20230928103702.2652442-1-adolf.belka@ipfire.org> References: <20230928103702.2652442-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 8.0.3 to 8.1.1 - Update of rootfile not required - Changelog 8.1 https://wiki.qemu.org/ChangeLog/8.1 Signed-off-by: Adolf Belka --- lfs/qemu-ga | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/qemu-ga b/lfs/qemu-ga index db5bf8db8..b05f43a76 100644 --- a/lfs/qemu-ga +++ b/lfs/qemu-ga @@ -26,11 +26,11 @@ include Config SUMMARY = Guest agent for QEMU -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-ga-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu-ga -PAK_VER = 5 +PAK_VER = 6 DEPS = From patchwork Thu Sep 28 10:37:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7264 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rx90822pQz3wl7 for ; Thu, 28 Sep 2023 10:37:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rx9035pFNz3sS; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rx9031qR2z30JY; Thu, 28 Sep 2023 10:37:07 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rx9024DHTz2xbV for ; Thu, 28 Sep 2023 10:37:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rx9016T0Tz3kj; Thu, 28 Sep 2023 10:37:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1695897426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6IUPNCDc+wR0rbIHp1sRtQeDu7AT5BHgLypdp2KsQGg=; b=cPIRX0ajK/WMO4QikMLtsmK3wcHyEhyIXiN5ZegnmiEJi0vxyHjiCdiACvvKavrcPGk2ti 7kVQqjBUMdye5wAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1695897426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6IUPNCDc+wR0rbIHp1sRtQeDu7AT5BHgLypdp2KsQGg=; b=AcEP0MhO8Wao0nbowDQfw4pi/MUnG8cK0Vz+IzMHnC41F5DA5R/TPv89uiPkX/lXhcMTUN frwux9/QPes/WnY7iDT9nwYS6/kxmJlb7Zov8rRDu5YRm2M534cgDV4SXvTBSIxHawZAUY n0wsgeW7mijmCoV+0eSiDS/cwJBOcng8GNPsMDevjkPvPjBlYaICqdiNBrB09USuc2VdOP AcGaGYOA9m5kq1GRVgIXe3EZrPajyVXwgC0kHVUZx+5ZzR9APpnuRDO8kN+c/z2Xgr6j7B fw1yOXss/LB7ckf4OCPxxAMGL3xJG5aFjvfo+JmBZj53M//XBB6amJkbvc6Uhw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/3] libslirp: Add the slirp library as this is required for the net user backend in qemu Date: Thu, 28 Sep 2023 12:37:01 +0200 Message-ID: <20230928103702.2652442-3-adolf.belka@ipfire.org> In-Reply-To: <20230928103702.2652442-1-adolf.belka@ipfire.org> References: <20230928103702.2652442-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Looking through some of the changelog and some mail list communications it looks like qemu decided they did noty want to maintain their own bundled version of libslirp when the majority of OS's had their own version now in place. Ubuntu 18.04 did not have libslirp but qemu stopped supporting that version from qemu-7.1 - So it looks like all OS's have a standard libslirp available now and qemu have taken the decision to no longer have their own version but to use the system version. That was always possible to do if use of the system version was explicitly defined but the default was to use the bundled version. - No evidence that libslirp is deprecated. - The last version of libslirp was released a year ago but it looks like every month or so there are a couple of commits merged. The last was a month ago. Signed-off-by: Adolf Belka --- config/rootfiles/packages/libslirp | 7 +++ lfs/libslirp | 92 ++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 100 insertions(+) create mode 100644 config/rootfiles/packages/libslirp create mode 100644 lfs/libslirp diff --git a/config/rootfiles/packages/libslirp b/config/rootfiles/packages/libslirp new file mode 100644 index 000000000..b50dad1ef --- /dev/null +++ b/config/rootfiles/packages/libslirp @@ -0,0 +1,7 @@ +#usr/include/slirp +#usr/include/slirp/libslirp-version.h +#usr/include/slirp/libslirp.h +#usr/lib/libslirp.so +usr/lib/libslirp.so.0 +usr/lib/libslirp.so.0.4.0 +#usr/lib/pkgconfig/slirp.pc diff --git a/lfs/libslirp b/lfs/libslirp new file mode 100644 index 000000000..cdbb7981f --- /dev/null +++ b/lfs/libslirp @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services. + + +VER = 4.7.0 + +THISAPP = libslirp-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libslirp +PAK_VER = 1 + +DEPS = + +SERVICES = + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = ccea2413c1dc6148e80851496955d5a991f37e359dc30946fd901627ce5d100b4ea065189b87dd79f574f15cac0e7468063d347efac9251f7180d3d291b1b2e5 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index acb692140..7cab222af 100755 --- a/make.sh +++ b/make.sh @@ -1494,6 +1494,7 @@ buildipfire() { lfsmake2 sdl2 lfsmake2 libusbredir lfsmake2 libseccomp + lfsmake2 libslirp lfsmake2 qemu lfsmake2 netsnmpd lfsmake2 nagios_nrpe