diff --git a/patches/12.1.0.patch b/patches/12.1.0.patch deleted file mode 100644 index 6fde426..0000000 --- a/patches/12.1.0.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/debian/libvirt-daemon-driver-secret.dirs b/debian/libvirt-daemon-driver-secret.dirs -new file mode 100644 -index 000000000..251b35b27 ---- /dev/null -+++ b/debian/libvirt-daemon-driver-secret.dirs -@@ -0,0 +1 @@ -+var/lib/libvirt/secrets -diff --git a/debian/libvirt-daemon-driver-secret.install.in b/debian/libvirt-daemon-driver-secret.install.in -index 41e010514..866741a46 100644 ---- a/debian/libvirt-daemon-driver-secret.install.in -+++ b/debian/libvirt-daemon-driver-secret.install.in -@@ -1 +1,5 @@ - usr/lib/${DEB_HOST_MULTIARCH}/libvirt/connection-driver/libvirt_driver_secret.so -+etc/libvirt/secret.conf -+usr/lib/systemd/system/virt-secret-init-encryption.service -+usr/share/augeas/lenses/libvirt_secrets.aug -+usr/share/augeas/lenses/tests/test_libvirt_secrets.aug -diff --git a/debian/libvirt-daemon-driver-secret.postinst.in b/debian/libvirt-daemon-driver-secret.postinst.in -index bdd612ed3..f9f7b1009 100644 ---- a/debian/libvirt-daemon-driver-secret.postinst.in -+++ b/debian/libvirt-daemon-driver-secret.postinst.in -@@ -14,8 +14,19 @@ set -e - # for details, see https://www.debian.org/doc/debian-policy/ or - # the debian-policy package - -+add_statoverrides() -+{ -+ SECRET_DIR="/var/lib/libvirt/secrets" -+ -+ if ! dpkg-statoverride --list "${SECRET_DIR}" >/dev/null 2>&1; then -+ [ ! -e "${SECRET_DIR}" ] || chown root:root "${SECRET_DIR}" -+ [ ! -e "${SECRET_DIR}" ] || chmod 0700 "${SECRET_DIR}" -+ fi -+} -+ - case "$1" in - configure) -+ add_statoverrides - # Trigger daemon restart after installing a driver - dpkg-trigger libvirt-restart-libvirtd - ;; -diff --git a/debian/libvirt-l10n.install.in b/debian/libvirt-l10n.install.in -index 83f97c8d0..296e9ec2c 100644 ---- a/debian/libvirt-l10n.install.in -+++ b/debian/libvirt-l10n.install.in -@@ -45,4 +45,5 @@ usr/share/locale/tr/LC_MESSAGES/libvirt.mo - usr/share/locale/uk/LC_MESSAGES/libvirt.mo - usr/share/locale/vi/LC_MESSAGES/libvirt.mo - usr/share/locale/zh_CN/LC_MESSAGES/libvirt.mo -+usr/share/locale/zh_Hant/LC_MESSAGES/libvirt.mo - usr/share/locale/zh_TW/LC_MESSAGES/libvirt.mo -diff --git a/debian/libvirt0.symbols b/debian/libvirt0.symbols -index 8689527f6..c14e61c2c 100644 ---- a/debian/libvirt0.symbols -+++ b/debian/libvirt0.symbols -@@ -103,6 +103,7 @@ libvirt.so.0 libvirt0 #MINVER# - *@LIBVIRT_10.2.0 10.2.0 - *@LIBVIRT_11.2.0 11.2.0 - *@LIBVIRT_PRIVATE_12.0.0 12.0.0 -+ *@LIBVIRT_PRIVATE_12.1.0 12.1.0 - - libvirt-qemu.so.0 libvirt0 #MINVER# - *@LIBVIRT_QEMU_0.8.3 0.8.3 -@@ -122,3 +123,4 @@ libvirt-admin.so.0 libvirt0 #MINVER# - *@LIBVIRT_ADMIN_8.6.0 8.9.0 - *@LIBVIRT_ADMIN_11.2.0 11.2.0 - *@LIBVIRT_ADMIN_PRIVATE_12.0.0 12.0.0 -+ *@LIBVIRT_ADMIN_PRIVATE_12.1.0 12.1.0 diff --git a/patches/series b/patches/series index 9954f7b..72f8d08 100644 --- a/patches/series +++ b/patches/series @@ -4,4 +4,3 @@ control.in ch.dirs ch.install ch.links -12.1.0.patch diff --git a/prepare_source b/prepare_source index 079fdf1..57a2d98 100644 --- a/prepare_source +++ b/prepare_source @@ -1,14 +1,14 @@ # vim: ft=bash # commit sha from https://github.com/cyberus-technology/libvirt/commits/gardenlinux/ -LIBVIRT_COMMIT_SHA="db2f30fce426ff3f61de01874b2ee8a9aca43a7b" -version_increment="7" +LIBVIRT_COMMIT_SHA="6896f4dade77f4b73bab6a04a622ef1e1ddaa869" +version_increment="1" git_src_commit "$LIBVIRT_COMMIT_SHA" https://github.com/cyberus-technology/libvirt.git # debian specific things crd=$(mktemp -d) -git clone --branch debian/12.0.0-1 --single-branch https://salsa.debian.org/libvirt-team/libvirt.git "$crd" +git clone --branch debian/12.2.0-1 --single-branch https://salsa.debian.org/libvirt-team/libvirt.git "$crd" pushd "$crd" git branch cp -r debian "$dir/src/" @@ -20,6 +20,6 @@ sed "s/SED_MARKER_FOR_COMMIT_SHA/$LIBVIRT_COMMIT_SHA/"