[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 7 commits: changelog: Create entry for 7.0.0-1
Guido Günther
gitlab at salsa.debian.org
Mon Jan 25 16:34:13 GMT 2021
Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt
Commits:
4f75e626 by Andrea Bolognani at 2021-01-23T15:15:31+01:00
changelog: Create entry for 7.0.0-1
Gbp-Dch: Ignore
- - - - -
138f7885 by Andrea Bolognani at 2021-01-24T23:17:10+01:00
symbols: Bump symbol versions
libvirt 7.0.0 doesn't introduce any new public symbols, but
libvirt 6.10.0, which was never packaged for Debian, does.
Gbp-Dch: Ignore
- - - - -
86785cf8 by Andrea Bolognani at 2021-01-24T23:17:14+01:00
patches: Refresh patches
Gbp-Dch: Ignore
- - - - -
e1d6e927 by Andrea Bolognani at 2021-01-24T23:24:23+01:00
copyright: Update copyright
Gbp-Dch: Ignore
- - - - -
60303893 by Andrea Bolognani at 2021-01-24T23:24:23+01:00
maintscripts: Sort list of nwfilters
Keep the list sorted alphabetically.
Gbp-Dch: Ignore
- - - - -
66bde67a by Andrea Bolognani at 2021-01-24T23:54:24+01:00
maintscripts: Pass version when creating config from template
Up until this point we've just assumed either all configuration
files need to be created or none does, but as new versions of
libvirt are released and new configuration files are introduced
upstream, we need to be able to only create a subset during
upgrades.
Gbp-Dch: Ignore
- - - - -
561e347a by Andrea Bolognani at 2021-01-24T23:54:24+01:00
libvirt-daemon-config-nwfilter: Install new nwfilters
libvirt 6.10.0 introduces a few new IPv6-focused nwfilters,
so let's include them in the package.
- - - - -
18 changed files:
- debian/changelog
- debian/copyright
- debian/libvirt-daemon-config-network.postinst
- debian/libvirt-daemon-config-network.postrm
- debian/libvirt-daemon-config-nwfilter.install
- debian/libvirt-daemon-config-nwfilter.postinst
- debian/libvirt-daemon-config-nwfilter.postrm
- debian/libvirt-daemon-system.postrm
- debian/libvirt-daemon-system.preinst
- debian/libvirt0.symbols
- debian/patches/debian/Debianize-libvirt-guests.patch
- 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,3 +1,9 @@
+libvirt (7.0.0-1) UNRELEASED; urgency=medium
+
+ * Team upload
+
+ -- Andrea Bolognani <eof at kiyuko.org> Sat, 23 Jan 2021 15:14:51 +0100
+
libvirt (6.9.0-4) unstable; urgency=medium
* Team upload
=====================================
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-2020 Red Hat, Inc
+Copyright: 2005-2021 Red Hat, Inc
License: LGPL-2.1+
Comment: Among many source files this also includes many generated, test-data or binary files
@@ -13,6 +13,15 @@ Copyright: 2005-2019 Red Hat, Inc
2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
License: LGPL-2.1+
+Files: src/conf/domain_validate.*
+Copyright: 2020 IBM Corp.
+License: LGPL-2.1+
+
+Files: src/util/virsocket.c
+Copyright: 2020 Red Hat, Inc.
+ 2011-2020 Free Software Foundation, Inc.
+License: LGPL-2.1+
+
Files: src/util/virhash.c
Copyright: 2005-2014 Red Hat, Inc.
2000 Bjorn Reese and Daniel Veillard.
=====================================
debian/libvirt-daemon-config-network.postinst
=====================================
@@ -17,26 +17,33 @@ set -e
create_config_from_template() {
local config="$1"
local template="$2"
+ local lastver="$3"
- if [ "$3" != "--" ]; then
+ if [ "$4" != "--" ]; then
echo "create_config_from_template called with the wrong number of arguments" >&2
return 1
fi
- for _ in $(seq 1 3); do
+ for _ in $(seq 1 4); do
shift
done
- if [ -n "$2" ] && [ -e "$config.dpkg-backup" ]; then
- # If the package has been configured in the past and a backup config
- # is available use it, so that uninstalling the package and
- # subsequently reinstalling it results in the very same configuration
- mv -f "$config.dpkg-backup" "$config"
- return 0
- fi
-
- if [ -z "$2" ]; then
- # If we're installing from scratch, make a copy of the template in
- # the appropriate location and with the expected permissions
+ if [ -n "$2" ] && dpkg --compare-versions -- "$2" gt "$lastver"; then
+ # The package is already configured, and the version that's been
+ # configured is new enough to contain the config file
+ if [ -e "$config.dpkg-backup" ]; then
+ # The package had been configured in the past and has
+ # subsequently been removed without purging, so a backup of
+ # the config file is still present on the disk. Restore it
+ mv -f "$config.dpkg-backup" "$config"
+ return 0
+ else
+ # We're doing a regular upgrade. Don't change anything
+ return 0
+ fi
+ else
+ # We're either installing from scratch, or upgrading from a version
+ # that didn't have the config file yet. Make a copy of the template
+ # in the appropriate location and with the expected permissions
install -o root -g root -m 0600 "$template" "$config"
return 0
fi
@@ -83,6 +90,7 @@ case "$1" in
create_config_from_template \
"/etc/libvirt/qemu/networks/default.xml" \
"/usr/share/libvirt/networks/default.xml" \
+ "6.9.0-2~" \
-- \
"$@"
finish_conffile_transfer \
=====================================
debian/libvirt-daemon-config-network.postrm
=====================================
@@ -18,12 +18,13 @@ set -e
remove_config_from_template() {
local config="$1"
local template="$2"
+ local lastver="$3"
- if [ "$3" != "--" ]; then
+ if [ "$4" != "--" ]; then
echo "remove_config_from_template called with the wrong number of arguments" >&2
return 1
fi
- for _ in $(seq 1 3); do
+ for _ in $(seq 1 4); do
shift
done
@@ -47,6 +48,7 @@ case "$1" in
remove_config_from_template \
"/etc/libvirt/qemu/networks/default.xml" \
"/usr/share/libvirt/networks/default.xml" \
+ "6.9.0-2~" \
-- \
"$@"
=====================================
debian/libvirt-daemon-config-nwfilter.install
=====================================
@@ -1,8 +1,12 @@
usr/share/libvirt/nwfilter/allow-arp.xml
usr/share/libvirt/nwfilter/allow-dhcp-server.xml
usr/share/libvirt/nwfilter/allow-dhcp.xml
+usr/share/libvirt/nwfilter/allow-dhcpv6-server.xml
+usr/share/libvirt/nwfilter/allow-dhcpv6.xml
usr/share/libvirt/nwfilter/allow-incoming-ipv4.xml
+usr/share/libvirt/nwfilter/allow-incoming-ipv6.xml
usr/share/libvirt/nwfilter/allow-ipv4.xml
+usr/share/libvirt/nwfilter/allow-ipv6.xml
usr/share/libvirt/nwfilter/clean-traffic-gateway.xml
usr/share/libvirt/nwfilter/clean-traffic.xml
usr/share/libvirt/nwfilter/no-arp-ip-spoofing.xml
@@ -10,6 +14,8 @@ usr/share/libvirt/nwfilter/no-arp-mac-spoofing.xml
usr/share/libvirt/nwfilter/no-arp-spoofing.xml
usr/share/libvirt/nwfilter/no-ip-multicast.xml
usr/share/libvirt/nwfilter/no-ip-spoofing.xml
+usr/share/libvirt/nwfilter/no-ipv6-multicast.xml
+usr/share/libvirt/nwfilter/no-ipv6-spoofing.xml
usr/share/libvirt/nwfilter/no-mac-broadcast.xml
usr/share/libvirt/nwfilter/no-mac-spoofing.xml
usr/share/libvirt/nwfilter/no-other-l2-traffic.xml
=====================================
debian/libvirt-daemon-config-nwfilter.postinst
=====================================
@@ -17,26 +17,33 @@ set -e
create_config_from_template() {
local config="$1"
local template="$2"
+ local lastver="$3"
- if [ "$3" != "--" ]; then
+ if [ "$4" != "--" ]; then
echo "create_config_from_template called with the wrong number of arguments" >&2
return 1
fi
- for _ in $(seq 1 3); do
+ for _ in $(seq 1 4); do
shift
done
- if [ -n "$2" ] && [ -e "$config.dpkg-backup" ]; then
- # If the package has been configured in the past and a backup config
- # is available use it, so that uninstalling the package and
- # subsequently reinstalling it results in the very same configuration
- mv -f "$config.dpkg-backup" "$config"
- return 0
- fi
-
- if [ -z "$2" ]; then
- # If we're installing from scratch, make a copy of the template in
- # the appropriate location and with the expected permissions
+ if [ -n "$2" ] && dpkg --compare-versions -- "$2" gt "$lastver"; then
+ # The package is already configured, and the version that's been
+ # configured is new enough to contain the config file
+ if [ -e "$config.dpkg-backup" ]; then
+ # The package had been configured in the past and has
+ # subsequently been removed without purging, so a backup of
+ # the config file is still present on the disk. Restore it
+ mv -f "$config.dpkg-backup" "$config"
+ return 0
+ else
+ # We're doing a regular upgrade. Don't change anything
+ return 0
+ fi
+ else
+ # We're either installing from scratch, or upgrading from a version
+ # that didn't have the config file yet. Make a copy of the template
+ # in the appropriate location and with the expected permissions
install -o root -g root -m 0600 "$template" "$config"
return 0
fi
@@ -80,12 +87,12 @@ finish_conffile_transfer() {
NWFILTERS="
allow-arp
- allow-dhcp-server
allow-dhcp
+ allow-dhcp-server
allow-incoming-ipv4
allow-ipv4
- clean-traffic-gateway
clean-traffic
+ clean-traffic-gateway
no-arp-ip-spoofing
no-arp-mac-spoofing
no-arp-spoofing
@@ -95,8 +102,16 @@ NWFILTERS="
no-mac-spoofing
no-other-l2-traffic
no-other-rarp-traffic
- qemu-announce-self-rarp
qemu-announce-self
+ qemu-announce-self-rarp
+"
+NWFILTERS_7_0_0="
+ allow-dhcpv6
+ allow-dhcpv6-server
+ allow-incoming-ipv6
+ allow-ipv6
+ no-ipv6-multicast
+ no-ipv6-spoofing
"
case "$1" in
@@ -105,8 +120,19 @@ case "$1" in
create_config_from_template \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"/usr/share/libvirt/nwfilter/$nwfilter.xml" \
+ "6.9.0-2~" \
+ -- \
+ "$@"
+ done
+ for nwfilter in $NWFILTERS_7_0_0; do
+ create_config_from_template \
+ "/etc/libvirt/nwfilter/$nwfilter.xml" \
+ "/usr/share/libvirt/nwfilter/$nwfilter.xml" \
+ "7.0.0-1~" \
-- \
"$@"
+ done
+ for nwfilter in $NWFILTERS; do
finish_conffile_transfer \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"6.9.0-2~" \
=====================================
debian/libvirt-daemon-config-nwfilter.postrm
=====================================
@@ -18,12 +18,13 @@ set -e
remove_config_from_template() {
local config="$1"
local template="$2"
+ local lastver="$3"
- if [ "$3" != "--" ]; then
+ if [ "$4" != "--" ]; then
echo "remove_config_from_template called with the wrong number of arguments" >&2
return 1
fi
- for _ in $(seq 1 3); do
+ for _ in $(seq 1 4); do
shift
done
@@ -44,12 +45,12 @@ remove_config_from_template() {
NWFILTERS="
allow-arp
- allow-dhcp-server
allow-dhcp
+ allow-dhcp-server
allow-incoming-ipv4
allow-ipv4
- clean-traffic-gateway
clean-traffic
+ clean-traffic-gateway
no-arp-ip-spoofing
no-arp-mac-spoofing
no-arp-spoofing
@@ -59,8 +60,16 @@ NWFILTERS="
no-mac-spoofing
no-other-l2-traffic
no-other-rarp-traffic
- qemu-announce-self-rarp
qemu-announce-self
+ qemu-announce-self-rarp
+"
+NWFILTERS_7_0_0="
+ allow-dhcpv6
+ allow-dhcpv6-server
+ allow-incoming-ipv6
+ allow-ipv6
+ no-ipv6-multicast
+ no-ipv6-spoofing
"
case "$1" in
@@ -69,6 +78,15 @@ case "$1" in
remove_config_from_template \
"/etc/libvirt/nwfilter/$nwfilter.xml" \
"/usr/share/libvirt/nwfilter/$nwfilter.xml" \
+ "6.9.0-2~" \
+ -- \
+ "$@"
+ done
+ for nwfilter in $NWFILTERS_7_0_0; do
+ remove_config_from_template \
+ "/etc/libvirt/nwfilter/$nwfilter.xml" \
+ "/usr/share/libvirt/nwfilter/$nwfilter.xml" \
+ "7.0.0-1~" \
-- \
"$@"
done
=====================================
debian/libvirt-daemon-system.postrm
=====================================
@@ -47,12 +47,12 @@ abort_conffile_transfer() {
NWFILTERS="
allow-arp
- allow-dhcp-server
allow-dhcp
+ allow-dhcp-server
allow-incoming-ipv4
allow-ipv4
- clean-traffic-gateway
clean-traffic
+ clean-traffic-gateway
no-arp-ip-spoofing
no-arp-mac-spoofing
no-arp-spoofing
@@ -62,8 +62,8 @@ NWFILTERS="
no-mac-spoofing
no-other-l2-traffic
no-other-rarp-traffic
- qemu-announce-self-rarp
qemu-announce-self
+ qemu-announce-self-rarp
"
case "$1" in
=====================================
debian/libvirt-daemon-system.preinst
=====================================
@@ -50,12 +50,12 @@ prepare_conffile_transfer() {
NWFILTERS="
allow-arp
- allow-dhcp-server
allow-dhcp
+ allow-dhcp-server
allow-incoming-ipv4
allow-ipv4
- clean-traffic-gateway
clean-traffic
+ clean-traffic-gateway
no-arp-ip-spoofing
no-arp-mac-spoofing
no-arp-spoofing
@@ -65,8 +65,8 @@ NWFILTERS="
no-mac-spoofing
no-other-l2-traffic
no-other-rarp-traffic
- qemu-announce-self-rarp
qemu-announce-self
+ qemu-announce-self-rarp
"
case "$1" in
=====================================
debian/libvirt0.symbols
=====================================
@@ -125,7 +125,8 @@ libvirt.so.0 libvirt0 #MINVER#
*@LIBVIRT_5.8.0 6.0.0~rc1
*@LIBVIRT_5.10.0 6.0.0~rc1
*@LIBVIRT_6.0.0 6.0.0~rc1
- *@LIBVIRT_PRIVATE_6.9.0 6.9.0
+ *@LIBVIRT_6.10.0 7.0.0
+ *@LIBVIRT_PRIVATE_7.0.0 7.0.0
libvirt-qemu.so.0 libvirt0 #MINVER#
*@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -147,4 +148,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_6.9.0 6.9.0
+ *@LIBVIRT_ADMIN_PRIVATE_7.0.0 7.0.0
=====================================
debian/patches/debian/Debianize-libvirt-guests.patch
=====================================
@@ -9,7 +9,7 @@ Origin: vendor
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index d69df90..d4f962d 100644
+index 87f96af..38cdfbb 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -1,5 +1,17 @@
@@ -91,7 +91,7 @@ index d69df90..d4f962d 100644
if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 0765efe..1bda2ef 100644
+index 4f83eda..4b09bdb 100644
--- a/tools/libvirt-guests.sysconf
+++ b/tools/libvirt-guests.sysconf
@@ -10,7 +10,7 @@
=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
=====================================
@@ -37,10 +37,10 @@ this revert and follow upstream as 2.32 dropped the option to enable
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 604b597..fd49d18 100644
+index 899404b..81d617b 100644
--- a/meson.build
+++ b/meson.build
-@@ -1450,8 +1450,6 @@ endif
+@@ -1429,8 +1429,6 @@ endif
# use extra library as it's provided by libc directly.
if host_machine.system() == 'windows'
xdr_dep = cc.find_library('portablexdr', required: false)
=====================================
debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================
@@ -8,10 +8,10 @@ so we don't have to build-depend on a program in contrib
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
-index 365c16d..604b597 100644
+index b5164f6..899404b 100644
--- a/meson.build
+++ b/meson.build
-@@ -2023,18 +2023,15 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1984,18 +1984,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 ca92bcd..898f0e6 100644
+index badd37c..273486c 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
-@@ -2378,7 +2378,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc)
+@@ -2365,7 +2365,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
=====================================
@@ -11,10 +11,10 @@ Include local apparmor profile
4 files changed, 10 insertions(+)
diff --git a/src/security/apparmor/libvirt-lxc b/src/security/apparmor/libvirt-lxc
-index e556f2a..9d28353 100644
+index 0c8b812..72278b5 100644
--- a/src/security/apparmor/libvirt-lxc
+++ b/src/security/apparmor/libvirt-lxc
-@@ -112,3 +112,6 @@
+@@ -116,3 +116,6 @@
deny /sys/fs/cgrou[^p]*{,/**} wklx,
deny /sys/fs/cgroup?*{,/**} wklx,
deny /sys/fs?*{,/**} wklx,
@@ -22,10 +22,10 @@ index e556f2a..9d28353 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 a03e9e2..f055b63 100644
+index 85c9e61..677a464 100644
--- a/src/security/apparmor/libvirt-qemu
+++ b/src/security/apparmor/libvirt-qemu
-@@ -242,3 +242,6 @@
+@@ -243,3 +243,6 @@
# /sys/bus/nd/devices
/ r, # harmless on any lsb compliant system
/sys/bus/nd/devices/{,**/} r,
=====================================
debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -13,7 +13,7 @@ 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 fc9dd02..eb5a4b2 100644
+index e56d43b..6212fcc 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -878,6 +878,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
=====================================
debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================
@@ -10,7 +10,7 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 708c3cf..fdc25aa 100644
+index a0cd0f1..7e7b268 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1316,7 +1316,7 @@ void virWaitForDevices(void)
=====================================
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 6c1a766..5808ca2 100644
+index 1baa71e..8e088f4 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/706a794f3e59cce94908f24c7af145c53077ac34...561e347a3653144543763e30219c89e5e4498248
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/706a794f3e59cce94908f24c7af145c53077ac34...561e347a3653144543763e30219c89e5e4498248
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/20210125/b6461fd9/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list