[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 7 commits: copyright: Update copyright years

Andrea Bolognani (@abologna) gitlab at salsa.debian.org
Sun Feb 4 10:33:36 GMT 2024 


Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
6b2a7bb5 by Andrea Bolognani at 2024-02-01T22:29:18+01:00
copyright: Update copyright years

I missed this when preparing 10.0.0-1.

Gbp-Dch: Ignore

- - - - -
9a4ad478 by Andrea Bolognani at 2024-02-01T22:57:38+01:00
patches: Add backport/scripts-Make-check-symfile.py-work-on-alpha.patch

Fixes compilation on alpha.

- - - - -
aa930a34 by Andrea Bolognani at 2024-02-01T22:58:26+01:00
patches: Add backport/apparmor-Add-user-session-path-for-PID-and-socket-files-u.patch

Fixes use of passt with qemu:///session and AppArmor enabled.

Closes: #1061678

- - - - -
88102817 by Andrea Bolognani at 2024-02-02T00:13:14+01:00
rules: Don't attempt to update git submodules

The operation could potentially try to use the network, and
more generally speaking it's not a good idea for the upstream
source to be modified outside of the blessed mechanisms.

- - - - -
bf4fab1a by Andrea Bolognani at 2024-02-02T00:13:15+01:00
rules: Don't run syntax-check tests

They're not useful, if not actively harmful, when building a
distro package. The upstream spec file disables them too.

- - - - -
947cc3df by Andrea Bolognani at 2024-02-04T10:53:40+01:00
salsa: Enable reprotest job

According to tests.reproducible-builds.org, libvirt is
reproducible these days, so it should be okay to enable
the corresponding the Salsa CI job.

Gbp-Dch: Ignore

- - - - -
d33cb9f9 by Andrea Bolognani at 2024-02-04T10:56:25+01:00
Document changes and release 10.0.0-2

- - - - -


8 changed files:

- debian/changelog
- debian/copyright
- + debian/patches/backport/apparmor-Add-user-session-path-for-PID-and-socket-files-u.patch
- + debian/patches/backport/scripts-Make-check-symfile.py-work-on-alpha.patch
- debian/patches/debian/apparmor_profiles_local_include.patch
- debian/patches/series
- debian/rules
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libvirt (10.0.0-2) unstable; urgency=medium
+
+  * [9a4ad47] patches: Add backport/scripts-Make-check-symfile[...]
+    - Fixes compilation on alpha
+  * [aa930a3] patches: Add backport/apparmor-Add-user-session-path[...]
+    - Fixes use of passt with qemu:///session and AppArmor enabled
+    - Closes: #1061678
+  * [8810281] rules: Don't attempt to update git submodules
+  * [bf4fab1] rules: Don't run syntax-check tests
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Sun, 04 Feb 2024 10:54:58 +0100
+
 libvirt (10.0.0-1) unstable; urgency=medium
 
   * [c80339d] New upstream version 10.0.0


=====================================
debian/copyright
=====================================
@@ -4,7 +4,7 @@ Source: https://libvirt.org/git/?p=libvirt.git
 Comment: in addition see the upstream maintainer AUTHORS file
 
 Files: *
-Copyright: 2005-2023 Red Hat, Inc
+Copyright: 2005-2024 Red Hat, Inc
 License: LGPL-2.1+
 Comment: Among many source files this also includes many generated, test-data or binary files
 


=====================================
debian/patches/backport/apparmor-Add-user-session-path-for-PID-and-socket-files-u.patch
=====================================
@@ -0,0 +1,46 @@
+From: Stefano Brivio <sbrivio at redhat.com>
+Date: Tue, 30 Jan 2024 19:15:51 +0100
+Subject: apparmor: Add user session path for PID and socket files used by
+ passt
+
+Commit 7a39b04d683f ("apparmor: Enable passt support") grants
+passt(1) read-write access to /{,var/}run/libvirt/qemu/passt/* if
+started by the libvirt daemon. That's the path where passt creates
+PID and socket files only if the guest is started by the root user.
+
+If the guest is started by another user, though, the path is more
+commonly /var/run/user/$UID/libvirt/qemu/run/passt: add it as
+read-write location. Otherwise, passt won't be able to start, as
+reported by Andreas.
+
+While at it, replace /{,var/}run/ in the existing rule by its
+corresponding tunable variable, @{run}.
+
+Fixes: 7a39b04d683f ("apparmor: Enable passt support")
+Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061678
+Reported-by: Andreas B. Mundt <andi at debian.org>
+Signed-off-by: Stefano Brivio <sbrivio at redhat.com>
+Reviewed-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Jim Fehlig <jfehlig at suse.com>
+(cherry picked from commit f95675fdbb42eee07fc4864d7c135dcb8b00c3a9)
+
+Forwarded: not-needed
+Origin: https://gitlab.com/libvirt/libvirt/-/commit/f95675fdbb42eee07fc4864d7c135dcb8b00c3a9
+---
+ src/security/apparmor/libvirt-qemu.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in
+index f40f471..8b92915 100644
+--- a/src/security/apparmor/libvirt-qemu.in
++++ b/src/security/apparmor/libvirt-qemu.in
+@@ -196,7 +196,8 @@
+     signal (receive) set=("term") peer=libvirtd,
+     signal (receive) set=("term") peer=virtqemud,
+ 
+-    owner /{,var/}run/libvirt/qemu/passt/* rw,
++    owner @{run}/user/[0-9]*/libvirt/qemu/run/passt/* rw,
++    owner @{run}/libvirt/qemu/passt/* rw,
+ 
+     include if exists <abstractions/passt>
+   }


=====================================
debian/patches/backport/scripts-Make-check-symfile.py-work-on-alpha.patch
=====================================
@@ -0,0 +1,58 @@
+From: Andrea Bolognani <abologna at redhat.com>
+Date: Sat, 20 Jan 2024 18:20:21 +0100
+Subject: scripts: Make check-symfile.py work on alpha
+
+The script expects each of the symbols that it looks for to
+be in one of three sections, which in nm(1) are described as
+follows:
+
+  T - The symbol is in the text (code) section.
+  B - The symbol is in the BSS data section. This section
+      typically contains zero-initialized or uninitialized
+      data, although the exact behavior is system dependent.
+  D - The symbol is in the initialized data section.
+
+When building on alpha, however, some of the symbols show up
+in one of two additional sections, specifically:
+
+  S - The symbol is in an uninitialized or zero-initialized
+      data section for small objects.
+  G - The symbol is in an initialized data section for small
+      objects.
+
+In other words, S is the same as B and G is the same as D,
+except with some optimization for small objects that for some
+reason is applied on alpha but not on other architectures.
+
+I have confirmed that, for all the symbols that the script
+complained about being missing on alpha, the section is the
+expected one, that is, symbols that are reported as B on x86
+are reported as S on alpha, and symbols that are reported as
+D on x86 are reported as G on alpha.
+
+Note that, while the B section doesn't seem to be used at all
+on alpha, at least in our case, the D section still is.
+
+Signed-off-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
+(cherry picked from commit 2757e91c2b28b704d9a0b586fb60012450110b1a)
+
+Forwarded: not-needed
+Origin: https://gitlab.com/libvirt/libvirt/-/commit/2757e91c2b28b704d9a0b586fb60012450110b1a
+---
+ scripts/check-symfile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/check-symfile.py b/scripts/check-symfile.py
+index 0f6e780..c2ee405 100755
+--- a/scripts/check-symfile.py
++++ b/scripts/check-symfile.py
+@@ -61,7 +61,7 @@ for elflib in elflibs:
+ 
+     for line in nm:
+         line = line.decode("utf-8")
+-        symmatch = re.search(r'''^\S+\s(?:[TBD])\s(\S+)\s*$''', line)
++        symmatch = re.search(r'''^\S+\s(?:[TBSDG])\s(\S+)\s*$''', line)
+         if symmatch is None:
+             continue
+ 


=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -27,10 +27,10 @@ index ffe4d8f..2973b00 100644
 +  include if exists <local/abstractions/libvirt-lxc>
  @END_APPARMOR_3@
 diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in
-index f40f471..a39ec62 100644
+index 8b92915..3a6b964 100644
 --- a/src/security/apparmor/libvirt-qemu.in
 +++ b/src/security/apparmor/libvirt-qemu.in
-@@ -277,4 +277,11 @@
+@@ -278,4 +278,11 @@
  
  @BEGIN_APPARMOR_3@
    include if exists <abstractions/libvirt-qemu.d>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
+backport/scripts-Make-check-symfile.py-work-on-alpha.patch
+backport/apparmor-Add-user-session-path-for-PID-and-socket-files-u.patch
 forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-libvirt-guests.patch
 debian/apparmor_profiles_local_include.patch


=====================================
debian/rules
=====================================
@@ -144,6 +144,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     --libexecdir=/usr/lib/libvirt \
     -Drunstatedir=/run \
     -Dinitconfdir=/etc/default \
+    -Dno_git=true \
     -Dpackager="$(DEB_VENDOR)" \
     -Dpackager_version="$(DEB_VERSION)" \
     $(WITH_DAEMONS) \
@@ -280,10 +281,16 @@ override_dh_auto_configure:
 # The default timeout for tests in Meson is 30s, which is not enough
 # for architectures with slow buildds: make the timeout 10 times
 # larger (5m) to account for those
+#
+# Additionally, disable the syntax-check tests, as failures there don't
+# indicate functional issues, plus they get tripped up by the fact that
+# there are additional files in debian/ that they don't expect
 override_dh_auto_test:
 	export LD_PRELOAD=""; \
 	export VIR_TEST_DEBUG=1; \
-	if ! dh_auto_test -- --timeout-multiplier 10; then \
+	if ! dh_auto_test -- --timeout-multiplier 10 \
+	                     --no-suite syntax-check; \
+	then \
 	    cat $(DEB_BUILDDIR)/meson-logs/testlog.txt; \
 	    exit 1; \
 	fi


=====================================
debian/salsa-ci.yml
=====================================
@@ -2,12 +2,6 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
 
-# libvirt is unfortunately not reproducible at the moment. Upstream work is
-# needed to resolve this issue, and until that happens it's better to keep the
-# reprotest job disabled and avoid pointlessly consuming resources
-variables:
-  SALSA_CI_DISABLE_REPROTEST: 1
-
 # The cross-build job is currently allowed to fail in the default
 # configuration, but we want to make sure libvirt remains cross-buildable and
 # so we mark it as required instead



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/59f7876200395f49ba914bbf4fb84d3f142e37a7...d33cb9f92464566c4cc827d50f31d9e7f87573d3

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/59f7876200395f49ba914bbf4fb84d3f142e37a7...d33cb9f92464566c4cc827d50f31d9e7f87573d3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20240204/7ada1a68/attachment-0001.htm>

More information about the Pkg-libvirt-commits mailing list