[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] d/control, d/rules: enable libssh

[Andrea Bolognani (@abologna)]

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


Commits:
4bafac5e by Christian Ehrhardt at 2021-08-11T11:04:29+02:00
d/control, d/rules: enable libssh

In Debian we nowadays only have libssh2 via
https://salsa.debian.org/libvirt-team/libvirt/-/blob/debian/master/debian/control#L41
https://salsa.debian.org/libvirt-team/libvirt/-/blob/debian/master/debian/rules#L111

But in Ubuntu this has to stay disabled due to not being in main
https://git.launchpad.net/ubuntu/+source/libvirt/commit/?h=ubuntu/impish-devel&id=6ef5c50d74b89e766ad3bf09e7ccc948a59b57d3

Fedora/Rhel builds always have libssh, and only newer have libssh2
https://gitlab.com/libvirt/libvirt/-/commit/11a2550c27176745a0f786abd5b99822931ca3c6
https://gitlab.com/libvirt/libvirt/-/commit/0f601d2f868f2017cdd16e0a7ca90a59e7d5e120#a546a23b2e505b8b9636351c964faa9d89e0b9eb_189_162

Related projects have even switched libssh2 -> libssh
https://gitlab.com/qemu-project/qemu/-/commit/b10d49d7619e4957b4b971f816661b57e5061d71

While not knowing the library one might think libssh2 is the newer libssh that
is wrong. It seems it provides some extra use cases for users. And furthermore
it seems safe to enable both.
That would Debian allow to provide both and Ubuntu to have at least some
libssh features.

LP: #1939416
Closes: #985969

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

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -38,6 +38,7 @@ Build-Depends:
  libsanlock-dev [linux-any],
  libsasl2-dev,
  libselinux1-dev (>= 2.0.82) [linux-any],
+ libssh-dev,
  libssh2-1-dev,
  libudev-dev [linux-any],
  libwireshark-dev (>= 1.11.3),


=====================================
debian/rules
=====================================
@@ -109,6 +109,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     -Dsasl=enabled \
     -Dyajl=enabled \
     -Dlibssh2=enabled \
+    -Dlibssh=enabled \
     $(WITH_POLKIT) \
     $(WITH_SANLOCK) \
     $(WITH_UDEV) \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/4bafac5e3903bbd020c753883984b97c9bde6a52

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/4bafac5e3903bbd020c753883984b97c9bde6a52
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/20210811/2c601c11/attachment.htm>