From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WLj4N4LW5Gap7wAAe85BDQ:P1 (envelope-from ) for ; Sat, 14 Sep 2024 00:19:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WLj4N4LW5Gap7wAAe85BDQ (envelope-from ) for ; Sat, 14 Sep 2024 02:19:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=srxKl2j9; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=s29768273 header.b="BI4Wh//v"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726273154; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=TS1FRzTYhEAIEVNOve4GbpzSYjcznIfDUIqf0IlIjTo=; b=WqPb5ZlUswPyA6bihPyHrblXdqSaldfTnjoVT9udk0eSbp4yYezjeJKo9qtAoslHBEkaGR N9E0mN91fCSx9lpQozzvQB+HMaXKBZM19fQVSSp7EI+CRwiBzE/NLILwFoGskSGaBFFwR+ 5/5uc/D6YfiA6y7OmvCvT4nesu8iF7z2Bp2x55VburaD58KVBxTe2UnYnntCfp3SoUF/1z GDdBa6IBPiDavfWyXyw//zAAiE2JKub12IBOunXCy6xSZvu9CeIKb7VBKJrmLbF9uWDvJL lsRxXP3yqfqsElI7HDaXlZq6XIoKLBZGFZ9lEFUDJdhUTkipMCT0eJYlIGgUfQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726273154; a=rsa-sha256; cv=none; b=QEEH+sjvD5Xp6Op68UGMKMzTTV6Bt40WhCR4pznOsaVCgdSl9R+JH4FiQprwTfCVuUBhpc eRqbp7tdjEJ9diT1l05JfwZcvvY8cxnS/s6QijXmIbNzQLYfEdxl6XW8BL+OzweW0KlHDH AcXtRAAt3z3P7yoMGJKHbX4nhYcoApXSu+UcLiaY3HhoxpVsT96I3tuUZWcMROlEs1gFI/ L2/Z7FiADHI+eBoPsdi5tv0UddrS8zeRTJ+HCiXFzPtS6mi5DcVdoIb4U4sbgde8OrefJD oZvJmeFXqOpqIHYM9DGUqxQHWcBSm3Ck11rRgtlakK6aSErl+XD9ESAdLKku8w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=srxKl2j9; dkim=fail ("headers rsa verify failed") header.d=web.de header.s=s29768273 header.b="BI4Wh//v"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B97DB82E1A for ; Sat, 14 Sep 2024 02:19:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spGV5-0002rR-NP; Fri, 13 Sep 2024 20:18:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1spGV3-0002rD-DL for bug-guix@gnu.org; Fri, 13 Sep 2024 20:18:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spGV3-000268-4X for bug-guix@gnu.org; Fri, 13 Sep 2024 20:18:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=TS1FRzTYhEAIEVNOve4GbpzSYjcznIfDUIqf0IlIjTo=; b=srxKl2j9npDfqTpJngtUIQIV0UEuB/SsuC5z6JXWozUBF4K22gsvrSm+K7SJhvIIVKHQanfyOJgFGo7ocRzwuMNK0phQQIwflYDIMCKaEBZ9YU7go118Kry26N6R8cWkGMCcFEwXIy+ivEpEB+kFP3wWrk2Enhyjimy25rl1jyLCZqxRwJi7AD0TOckWcNA9UUWe4KX3LJjXV9/79nIGlQIl7TQW22YHKYHzL/2wKl9OvuPWRBURunc7aCZmYeO8dbeNr7FOvgnW9QSSxVq4nUtNmxPD+gxtWVLog1zzqiZrZwO8WbbqxpAqwyl508DYZsV+b1YTyq4Adbps3yAhTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1spGVC-0003S4-DC for bug-guix@gnu.org; Fri, 13 Sep 2024 20:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#72976: [PATCH v8] gnu: lxc: Update to 6.0.1 References: In-Reply-To: Resent-From: Jakob Kirsch Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 14 Sep 2024 00:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72976 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 72976@debbugs.gnu.org Cc: Jakob Kirsch Received: via spool by 72976-submit@debbugs.gnu.org id=B72976.172627308613176 (code B ref 72976); Sat, 14 Sep 2024 00:19:02 +0000 Received: (at 72976) by debbugs.gnu.org; 14 Sep 2024 00:18:06 +0000 Received: from localhost ([127.0.0.1]:44444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spGUH-0003QR-NL for submit@debbugs.gnu.org; Fri, 13 Sep 2024 20:18:06 -0400 Received: from mout.web.de ([212.227.17.11]:37715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spGUF-0003Ps-Cw for 72976@debbugs.gnu.org; Fri, 13 Sep 2024 20:18:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1726273066; x=1726877866; i=jakob.kirsch@web.de; bh=TS1FRzTYhEAIEVNOve4GbpzSYjcznIfDUIqf0IlIjTo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=BI4Wh//vKC0euRw3k9lqC2G0Ik8EcxlxUAJnM4u96/kC4v3Gsb7PW52NriYcZ9qD 9MH1J+ouVipnTe9LhzSSMtLnm6jKtQJg4MXtoSHrfp8jLU+uvstm3jVIX8wtyfS7o I6hPVsJt4Xw4HpeQM/U6f/b30FqKNaxQjtSXNvIRzWqF/xGXSds8G7In+inVUd96+ wvBC3JSd2NqDkrmLcsAtNVE3d7r0L7YgMsp4qmhn/yFDAPWRX3qjlTBAGmxUh6Yjm gtVNjEN/qYSHq6meOxVC1Y3lcy/Ojv+ADA88ik5AzEg6UKRWjwI3ezWxh2+PoZAT+ A7nLOpCNH6tWK7kOCg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from kernelpanicroom.fritz.box ([134.19.22.45]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MRF3W-1sasMn3avE-00QsDH; Sat, 14 Sep 2024 02:17:45 +0200 Date: Sat, 14 Sep 2024 02:17:34 +0200 Message-ID: <9d974d413d49d76c07e382e0681cb36e9d37dcb7.1726273047.git.jakob.kirsch@web.de> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:+KE0kvbkGy8A9nImz661dDYBldaMo7l8P3yllrzU86lbphFnbYJ AOh5OOYbDz1GEkH4g4YB/DI2gCI7KG//N/JN06UiOjfHx+j1qgpitsrW5H/OlHc8hGpe7Hp PlsPonpiZYHDog53AyYZskBNefJyxu6ejb9nOEjk/Vi/d7SEWTz5lbCDPHV9yUdA6K9MiUR CxTO2EdGW2H6CjTDXjNbA== UI-OutboundReport: notjunk:1;M01:P0:i8iXK+V7gSQ=;KMNPuujXnNswCdUgn60CsXDzSJl KbLg+F3m0z8TZi+2hTh/G8mLDPhoE3CHUYu4BhNieGi/cX4EtqgNrGvhmjU8i/dKl4r48a8xw UoOzCC4g7vu/3TMjZmTyLERjqbh5JHxCkvArdOYnvfMFW3M0yH+jPgXaREivh1NxosrUCyc1Y LANEo05z5iN7SYu6YXn7xVCqAhbLXgtQnPsP+zvCzQSo2kV/aji0eDVS7rGQk55NARE2i73kf y2tm514gYTkL6IXVETXiOxOAVScoerbBYGRDXYGk159loCgUVChv4dQyRTtpEWteyBQ+8SGVv IHacNeGYu2LPSvpXnaLK6C2iX/4MDdZsRDdiY7kGifZ5cl0a4oM2I84V7cXYDu9WU1HWlwz4j vhweAUWNGtfX7ebbnxqwgGPM+f7cZUFmBxw9WbeuzdoLx3HUcu+T8Uk/bWHmsi9skPjSHMfG9 a31cS6+tqo5gDflnexqBleTGbDIeqDiZY2iPHyORQWiTxXHjyhvHu3MwZ+U9vq04ZE22N9wR3 Y9rQgTRyotAH+K4EbXcuvru1GXQDZ+JpC6RlMgkQAD4XqrlvC/jBXEjrYweTDZmYMfLqVTvb9 MQytbNPRAjunqxkMdkymwCyH0Q9nCTmjxIlrB6VB9Q7ATI3IvfPHFlBbD6Y0Yy5GEgp6iRkVd s9gbU3/zOJhOMnid9L3Ln3LS9kgxE4CpGapLVhPdrgD5qL0zUHmH+Us9uShT3x97LwMvEyDeS 8eoLXLGyDxpRKpQHwqeMcirpRSUynkdrixxRsQdR42xJ1APzTc3YJdVFa+aXNV1QyhVtKeyI3 MkDowD1ftTTxolHmpdUDfNKQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jakob Kirsch From: Jakob Kirsch via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.99 X-Migadu-Queue-Id: B97DB82E1A X-Spam-Score: -6.99 X-TUID: sJv8JzPGZa7o * gnu/packages/virtualization.scm (lxc): Update to 6.0.1. [build-system]: Change to meson-build-system. [inputs]: Add dbus. [arguments]: Replace "--docdir=3D..." with "-Ddoc-path=3D...". Replace "--sysconfdir=3D/etc" with "-Ddistrosysconfdir=3D/etc". Remove "--localstatedir=3D/var". Add "-Dinit-script=3Dsysvinit". Add "-Dinstall-state-dirs=3Dfalse". Add "-Dinstall-init-files=3Dfalse". Add "-Dspecfile=3Dfalse". Add "-Db_lto=3Dfalse". <#:phases>: No longer replace 'install. Add 'move-out Add 'move-in Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f =2D-- gnu/packages/virtualization.scm | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index b076d49985..eb586f2162 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -36,6 +36,7 @@ ;;; Copyright =C2=A9 2024 Raven Hallsby ;;; Copyright =C2=A9 2024 jgart ;;; Copyright =C2=A9 2024 Ashish SHUKLA +;;; Copyright =C2=A9 2024 Jakob Kirsch ;;; ;;; This file is part of GNU Guix. ;;; @@ -1350,7 +1351,7 @@ (define-public libosinfo (define-public lxc (package (name "lxc") - (version "4.0.12") + (version "6.0.1") (source (origin (method url-fetch) (uri (string-append @@ -1358,30 +1359,29 @@ (define-public lxc version ".tar.gz")) (sha256 (base32 - "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v")))= ) - (build-system gnu-build-system) + "1q3p3zzm338pmc97z6ly8cjginkyljxqbk1c37l2xa46vfy8zcyc")))= ) + (build-system meson-build-system) (native-inputs (list pkg-config docbook2x)) (inputs - (list gnutls libcap libseccomp libselinux)) + (list gnutls libcap libseccomp libselinux dbus)) (arguments (list #:configure-flags - #~(list (string-append "--docdir=3D" #$output "/share/doc/" + #~(list (string-append "-Ddoc-path=3D" #$output "/share/doc/" #$name "-" #$version) - "--sysconfdir=3D/etc" - "--localstatedir=3D/var") + "-Ddistrosysconfdir=3D/etc" + "-Dinit-script=3Dsysvinit" + "-Dinstall-state-dirs=3Dfalse" + "-Dinstall-init-files=3Dfalse" + "-Dspecfile=3Dfalse" + "-Db_lto=3Dfalse") #:phases #~(modify-phases %standard-phases - (replace 'install - (lambda _ - (invoke "make" "install" - (string-append "bashcompdir=3D" #$output - "/etc/bash_completion.d") - ;; Don't install files into /var and /etc. - "LXCPATH=3D/tmp/var/lib/lxc" - "localstatedir=3D/tmp/var" - "sysconfdir=3D/tmp/etc" - "sysconfigdir=3D/tmp/etc/default")))))) + ;; shrink-runpath doesn't like this file, so we'll move it= out of the way + (add-before 'shrink-runpath 'move-out + (lambda _ (rename-file (string-append #$output "/sbin/in= it.lxc.static") (string-append #$output "/init.lxc.static")))) + (add-after 'shrink-runpath 'move-in + (lambda _ (rename-file (string-append #$output "/init.lx= c.static") (string-append #$output "/sbin/init.lxc.static"))))))) (synopsis "Linux container tools") (home-page "https://linuxcontainers.org/") (description base-commit: 013bda5e2c53bcf1d9093286c3658b95f5e32c09 =2D- 2.46.0