[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 3 commits: changelog: Bump for 7.6.0-1

Guido Günther (@agx) gitlab at salsa.debian.org
Tue Aug 10 08:19:46 BST 2021 


Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
ac692b2e by Andrea Bolognani at 2021-08-08T18:56:01+02:00
changelog: Bump for 7.6.0-1

Gbp-Dch: Ignore

- - - - -
c65f76eb by Andrea Bolognani at 2021-08-08T18:56:35+02:00
patches: Refresh patches

Gbp-Dch: Ignore

- - - - -
e419a38a by Andrea Bolognani at 2021-08-09T22:07:26+02:00
symbols: Bump symbol versions

libvirt 7.6.0 doesn't introduce any new public symbols.

Two small existing issue are fixed in the process:

  * since libvirt 7.4.0 didn't introduce any new public symbols
    either, the entry for @LIBVIRT_7.4.0 should not exist;

  * instead of @LIBVIRT_ADMIN_PRIVATE_7.4.0, the entry should
    have been created for @LIBVIRT_ADMIN_PRIVATE_7.5.0.

Gbp-Dch: Ignore

- - - - -


9 changed files:

- debian/changelog
- debian/libvirt0.symbols
- debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
- debian/patches/debian/Set-defaults-for-zfs-tools.patch
- debian/patches/debian/Use-sensible-editor-by-default.patch
- debian/patches/debian/apparmor_profiles_local_include.patch
- debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
- debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
- debian/patches/forward/Skip-vircgrouptest.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libvirt (7.5.0-1) UNRELEASED; urgency=medium
+libvirt (7.6.0-1) UNRELEASED; urgency=medium
 
   * Team upload
 


=====================================
debian/libvirt0.symbols
=====================================
@@ -126,11 +126,10 @@ libvirt.so.0 libvirt0 #MINVER#
  *@LIBVIRT_5.10.0 6.0.0~rc1
  *@LIBVIRT_6.0.0 6.0.0~rc1
  *@LIBVIRT_6.10.0 7.0.0
- *@LIBVIRT_7.1.0 7.5.0
- *@LIBVIRT_7.2.0 7.5.0
- *@LIBVIRT_7.3.0 7.5.0
- *@LIBVIRT_7.4.0 7.5.0
- *@LIBVIRT_PRIVATE_7.5.0 7.5.0
+ *@LIBVIRT_7.1.0 7.6.0
+ *@LIBVIRT_7.2.0 7.6.0
+ *@LIBVIRT_7.3.0 7.6.0
+ *@LIBVIRT_PRIVATE_7.6.0 7.6.0
 
 libvirt-qemu.so.0 libvirt0 #MINVER#
  *@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -152,4 +151,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
  *@LIBVIRT_ADMIN_1.3.0 1.2.18
  *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
  *@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_7.4.0 7.5.0
+ *@LIBVIRT_ADMIN_PRIVATE_7.6.0 7.6.0


=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
=====================================
@@ -33,12 +33,14 @@ 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, 2 deletions(-)
+ 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
-@@ -1286,7 +1286,7 @@ endif
+@@ -861,7 +861,7 @@ endforeach
  if host_machine.system() == 'windows'
    xdr_dep = cc.find_library('portablexdr', required: false)
  elif host_machine.system() == 'linux'


=====================================
debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================
@@ -7,9 +7,11 @@ so we don't have to build-depend on a program in contrib
  meson.build | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
+diff --git a/meson.build b/meson.build
+index d4c142e..b8d2d46 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1945,18 +1945,15 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1953,18 +1953,15 @@ if conf.has('WITH_LIBVIRTD')
      foreach name : [ 'zfs', 'zpool' ]
        set_variable(
          '@0 at _prog'.format(name),


=====================================
debian/patches/debian/Use-sensible-editor-by-default.patch
=====================================
@@ -8,10 +8,10 @@ It is the reasonable default for Debian.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/vsh.c b/tools/vsh.c
-index badd37c..273486c 100644
+index 123284c..69b6d41 100644
 --- a/tools/vsh.c
 +++ b/tools/vsh.c
-@@ -2365,7 +2365,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
+@@ -2399,7 +2399,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
  
  /* Hard-code default editor used as a fallback if not configured by
   * VISUAL or EDITOR environment variables. */


=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -22,10 +22,10 @@ index 0c8b812..72278b5 100644
 +  # Site-specific additions and overrides. See local/README for details..
 +  #include <local/abstractions/libvirt-lxc>
 diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
-index 85c9e61..677a464 100644
+index 4156428..8a49b21 100644
 --- a/src/security/apparmor/libvirt-qemu
 +++ b/src/security/apparmor/libvirt-qemu
-@@ -243,3 +243,6 @@
+@@ -248,3 +248,6 @@
    # /sys/bus/nd/devices
    / r, # harmless on any lsb compliant system
    /sys/bus/nd/devices/{,**/} r,
@@ -33,10 +33,10 @@ index 85c9e61..677a464 100644
 +  # Site-specific additions and overrides. See local/README for details..
 +  #include <local/abstractions/libvirt-qemu>
 diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-index dd18c8a..be8b9ee 100644
+index ff1d46b..5a50823 100644
 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-@@ -69,5 +69,6 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
+@@ -71,5 +71,6 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
    /**.[iI][sS][oO] r,
    /**/disk{,.*} r,
  
@@ -44,10 +44,10 @@ index dd18c8a..be8b9ee 100644
    #include <local/usr.lib.libvirt.virt-aa-helper>
  }
 diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
-index bf4563e..d48cd36 100644
+index f2ab6ff..b0d6af8 100644
 --- a/src/security/apparmor/usr.sbin.libvirtd.in
 +++ b/src/security/apparmor/usr.sbin.libvirtd.in
-@@ -134,4 +134,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
+@@ -137,4 +137,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
  
     /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
    }


=====================================
debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index e56d43b..6212fcc 100644
+index 2120895..0f88864 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
-@@ -878,6 +878,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -865,6 +865,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
      virCommandAddEnvPass(cmd, "KRB5CCNAME");
      virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
      virCommandAddEnvPass(cmd, "SSH_ASKPASS");


=====================================
debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================
@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index a0cd0f1..7e7b268 100644
+index 00cd56e..4e29380 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1316,7 +1316,7 @@ void virWaitForDevices(void)
+@@ -1296,7 +1296,7 @@ void virWaitForDevices(void)
      if (!(udev = virFindFileInPath(UDEVADM)))
          return;
  


=====================================
debian/patches/forward/Skip-vircgrouptest.patch
=====================================
@@ -9,7 +9,7 @@ without sysfs mounted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 1baa71e..8e088f4 100644
+index 1060f60..6557f29 100644
 --- a/tests/vircgrouptest.c
 +++ b/tests/vircgrouptest.c
 @@ -20,7 +20,7 @@



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3ddc9e25be1c966ee3e88ffa6deee47b45b43a06...e419a38ab408c93da3a3ae805dd2321549e36cd4

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3ddc9e25be1c966ee3e88ffa6deee47b45b43a06...e419a38ab408c93da3a3ae805dd2321549e36cd4
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/20210810/9291d99c/attachment-0001.htm>

More information about the Pkg-libvirt-commits mailing list