[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 2 commits: drop d/p/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch and thereby stop...

[Andrea Bolognani (@abologna)]

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


Commits:
55cfebd5 by Christian Ehrhardt at 2021-08-19T08:13:22+02:00
drop d/p/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch and thereby stop reverting the XDR-check for glibc >=2.31-14

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
8d2e0fef by Christian Ehrhardt at 2021-08-19T08:13:23+02:00
d/control: add libtirpc for rpc.h with glibc >=2.31-14

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -


3 changed files:

- debian/control
- − debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -16,6 +16,7 @@ Build-Depends:
  libapparmor-dev [linux-any],
  libattr1-dev [linux-any],
  libaudit-dev [linux-any],
+ libc6-dev (>= 2.31-14~),
  libcap-ng-dev [linux-any],
  libcurl4-gnutls-dev,
  libdevmapper-dev [linux-any],
@@ -39,6 +40,7 @@ Build-Depends:
  libselinux1-dev (>= 2.0.82) [linux-any],
  libssh-dev,
  libssh2-1-dev,
+ libtirpc-dev,
  libudev-dev [linux-any],
  libwireshark-dev (>= 1.11.3),
  libwiretap-dev,


=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch deleted
=====================================
@@ -1,51 +0,0 @@
-From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
-Date: Wed, 26 Aug 2020 10:52:17 +0200
-Subject: Revert "m4: virt-xdr: rewrite XDR check"
-
-This reverts commit d7147b3797380de2d159ce6324536f3e1f2d97e3.
-
-Reasoning:
-The build against libtirpc causes linking errors using the headers of
-libtirpc but calling into the compat functions of glibc as discussed
-here:
-https://www.redhat.com/archives/libvir-list/2020-August/msg00921.html
-
-Current glibc 2.31-0ubuntu1 and 2.31-3 for us are built with
---enable-obsolete-rpc which then leads to the wrong linking.
-
-What happens otherwise is a crash like:
-[582093.524644] libvirt_lxc[261446]: segfault at 0 ip 0000000000000000
-sp 00007ffdd2345598 error 14 in libvirt_lxc[5587e42aa000+8000]
-[582093.524650] Code: Bad RIP value.
-
-The reason is that due to bad linking (should link to 3.0 versions
-instead):
-$ eu-readelf -a /usr/lib/libvirt/libvirt_lxc  | grep xdr_uint64
-  0x0000000000026820  X86_64_JUMP_SLOT 000000000000000000      +0 xdr_uint64_t
-   99: 0000000000000000      0 FUNC    GLOBAL DEFAULT    UNDEF
-xdr_uint64_t GLIBC_2 2 5 (4)
-  [  1c02]  xdr_uint64_t
-
-It will use the headers and structs of libtirpc but then call ito glibc
-which breaks badly.
-
-As soon as we rebuild agains 2.32 which is about to arrive we can drop
-this revert and follow upstream as 2.32 dropped the option to enable
---enable-obsolete-rpc.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index b8d2d46..35109d3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -861,7 +861,7 @@ endforeach
- if host_machine.system() == 'windows'
-   xdr_dep = cc.find_library('portablexdr', required: false)
- elif host_machine.system() == 'linux'
--  xdr_dep = dependency('libtirpc', required: false)
-+  xdr_dep = cc.find_library('c', required: false)
- elif host_machine.system() in [ 'freebsd', 'darwin' ]
-   xdr_dep = cc.find_library('c', required: false)
- else


=====================================
debian/patches/series
=====================================
@@ -6,5 +6,4 @@ debian/Debianize-libvirtd.patch
 debian/Debianize-systemd-service-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/Set-defaults-for-zfs-tools.patch
-debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
 debian/Use-sensible-editor-by-default.patch



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/e92149dc790613074c7429cd934635fd0090a376...8d2e0fefdc0a48219f8403a08781a0e532e12990

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/e92149dc790613074c7429cd934635fd0090a376...8d2e0fefdc0a48219f8403a08781a0e532e12990
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/20210819/837a0e6b/attachment-0001.htm>