From 9a412068d930dcb7495bdf31b16969e678bba327 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 9 Jul 2013 19:38:20 +0100 Subject: [PATCH 01/45] Update to 0.2.1 release --- libvirt-sandbox.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 35afaac..5a02544 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -14,7 +14,7 @@ Name: libvirt-sandbox -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools @@ -22,17 +22,18 @@ License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libvirt-gobject-devel >= 0.0.9 +BuildRequires: libvirt-gobject-devel >= 0.1.7 BuildRequires: gobject-introspection-devel -BuildRequires: libselinux-devel BuildRequires: glibc-static BuildRequires: /usr/bin/pod2man BuildRequires: intltool +BuildRequires: glib2-devel >= 2.32.0 Requires: rpm-python -Requires: glib2-devel >= 2.32.0 # For virsh lxc-enter-namespace command Requires: libvirt-client >= %{libvirt_version} Requires: systemd >= 198 +Requires: pygobject3-base +Requires: libselinux-python %package libs Group: Development/Libraries @@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue Jul 9 2013 Daniel P. Berrange - 0.2.1-1 +- Update to 0.2.1 release + * Tue May 7 2013 Daniel P. Berrange - 0.2.0-1 - Update to 0.2.0 release diff --git a/sources b/sources index d8a0a14..7c33340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -538b3eb2bef4f82eecd8a42a0581ea6c libvirt-sandbox-0.2.0.tar.gz +f43c8aca1f138fc6340c198be765c600 libvirt-sandbox-0.2.1.tar.gz From 0ccec6dd08536f5d9b9855153c7915a66fc416bb Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 1 Aug 2013 12:23:24 +0100 Subject: [PATCH 02/45] Update to 0.5.0 release --- libvirt-sandbox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 5a02544..3817488 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -14,7 +14,7 @@ Name: libvirt-sandbox -Version: 0.2.1 +Version: 0.5.0 Release: 1%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools @@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Aug 1 2013 Daniel P. Berrange - 0.5.0-1 +- Update to 0.5.0 release + * Tue Jul 9 2013 Daniel P. Berrange - 0.2.1-1 - Update to 0.2.1 release diff --git a/sources b/sources index 7c33340..7c4df00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f43c8aca1f138fc6340c198be765c600 libvirt-sandbox-0.2.1.tar.gz +7ad2d1353bb08a1c2496fc9badcc8049 libvirt-sandbox-0.5.0.tar.gz From 4d408d0e84c74d916c1f42402b9402869d4cb72c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 1 Oct 2013 16:17:10 +0100 Subject: [PATCH 03/45] Fix compat with 3.11 kernels & allow mac addr choice Signed-off-by: Daniel P. Berrange --- .gitignore | 2 + 0001-Always-set-earlyprintk-kernel-arg.patch | 32 +++ ...n-t-overmount-root-in-QEMU-sandboxes.patch | 27 ++ ...trcmp-test-in-mount-options-for-QEMU.patch | 28 ++ ...Force-9p-version-to-version-9p2000.u.patch | 48 ++++ ...rt-for-configuring-NIC-mac-addresses.patch | 267 ++++++++++++++++++ 0006-S-is-not-supported-by-virt-sandbox.patch | 25 ++ libvirt-sandbox.spec | 19 +- update-patches.pl | 110 ++++++++ 9 files changed, 557 insertions(+), 1 deletion(-) create mode 100644 0001-Always-set-earlyprintk-kernel-arg.patch create mode 100644 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch create mode 100644 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch create mode 100644 0004-Force-9p-version-to-version-9p2000.u.patch create mode 100644 0005-Add-support-for-configuring-NIC-mac-addresses.patch create mode 100644 0006-S-is-not-supported-by-virt-sandbox.patch create mode 100755 update-patches.pl diff --git a/.gitignore b/.gitignore index f727ee0..251f703 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ x86_64/ *.src.rpm .build*.log +*~ + diff --git a/0001-Always-set-earlyprintk-kernel-arg.patch b/0001-Always-set-earlyprintk-kernel-arg.patch new file mode 100644 index 0000000..3714075 --- /dev/null +++ b/0001-Always-set-earlyprintk-kernel-arg.patch @@ -0,0 +1,32 @@ +From 2babb5499c41054e0c9e5f8712f57a2cc716cfb2 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Mon, 30 Sep 2013 15:13:06 +0100 +Subject: [PATCH] Always set earlyprintk kernel arg + +If the initrd fails and prints to stderr, this goes to /dev/null +unless earlyprintk is enabled. We always want to see initrd +errors, so we should always have earlyprintk set. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit b14ce17bb357d5b7f99562c91dafb521f6985b40) +--- + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +index c94a641..18ebcea 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +@@ -207,10 +207,10 @@ static gchar *gvir_sandbox_builder_machine_cmdline(GVirSandboxConfig *config G_G + gchar *tmp; + + /* Now kernel args */ +- g_string_append(str, " console=ttyS0"); ++ g_string_append(str, " console=ttyS0 earlyprintk=ttyS0"); + if (getenv("LIBVIRT_SANDBOX_DEBUG") && + g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2")) +- g_string_append(str, " debug loglevel=10 earlyprintk=ttyS0"); ++ g_string_append(str, " debug loglevel=10"); + else + g_string_append(str, " quiet loglevel=0"); + diff --git a/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch b/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch new file mode 100644 index 0000000..9d4821e --- /dev/null +++ b/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch @@ -0,0 +1,27 @@ +From e593f55e0634b95e045fdff7ab2ddbbf6ce84b41 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:51:34 +0100 +Subject: [PATCH] Don't overmount '/root' in QEMU sandboxes + +If the user wants to replace '/root' they can do that +explicitly. Don't overmount it ourselves. This fixes +an inconsistency between LXC & QEMU setups. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit 6ae67143e69f435b564164bfa67a174be7bc9702) +--- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index f09c6d9..079f83f 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -284,7 +284,6 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) + /* Main special filesystems */ + mount_other("/dev", "tmpfs", 0755); + mount_other_opts("/dev/pts", "devpts", "gid=5,mode=620,ptmxmode=000", 0755); +- mount_other("/root", "tmpfs", 0755); + mount_other("/sys", "sysfs", 0755); + mount_other("/proc", "proc", 0755); + //mount_other("/selinux", "selinuxfs", 0755); diff --git a/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch b/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch new file mode 100644 index 0000000..cb967c4 --- /dev/null +++ b/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch @@ -0,0 +1,28 @@ +From 2a742067eac4db8b2c33809bbb9a9423123f971a Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:52:36 +0100 +Subject: [PATCH] Fix inverted strcmp test in mount options for QEMU + +The QEMU init binary intended to set nosuid & nodev on any +tmpfs filesystem. Due to a backwards strcmp test, it set +those flaws on everything except tmpfs. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit 8234b949106190f7df4c5b500c1520611eb8a603) +--- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index 079f83f..b7e4c6f 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -382,7 +382,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) + else + mount_mkfile(target, 644); + } else { +- if (strcmp(type, "tmpfs")) ++ if (strcmp(type, "tmpfs") == 0) + flags |= MS_NOSUID | MS_NODEV; + + mount_mkdir(target, 0755); diff --git a/0004-Force-9p-version-to-version-9p2000.u.patch b/0004-Force-9p-version-to-version-9p2000.u.patch new file mode 100644 index 0000000..3edc4c1 --- /dev/null +++ b/0004-Force-9p-version-to-version-9p2000.u.patch @@ -0,0 +1,48 @@ +From 9df128272ac576bf9194ae4374c0e678884e76bf Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:54:10 +0100 +Subject: [PATCH] Force 9p version to version=9p2000.u + +With 9p version=9p2000.L, we tickle two bugs in QEMU's code. + +One breaks most calls with ENODEV on FS_IOC_GETVERSION ioctls. + +The other breaks xattr checks due to inverted errno. + +In addition with 9p2000.L we see extra permission checks +on dirs, which prevents the guest from over-mounting dirs +like /root that are restricted on the user running QEMU. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit f4087aa0e993f59772d3bda53038888af7f43b5e) +--- + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 2 +- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +index 18ebcea..d78d755 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +@@ -278,7 +278,7 @@ static gboolean gvir_sandbox_builder_machine_write_mount_cfg(GVirSandboxConfig * + if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_BIND(mconfig)) { + source = g_strdup_printf("sandbox:mount%zu", nHostBind++); + fstype = "9p"; +- options = g_strdup("trans=virtio"); ++ options = g_strdup("trans=virtio,version=9p2000.u"); + } else if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_IMAGE(mconfig)) { + source = g_strdup_printf("vd%c", (char)('a' + nHostImage++)); + fstype = "ext3"; +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index b7e4c6f..f72148a 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -165,7 +165,7 @@ mount_9pfs(const char *src, const char *dst, int mode, int readonly) + if (readonly) + flags |= MS_RDONLY; + +- if (mount(src, dst, "9p", flags, "trans=virtio") < 0) { ++ if (mount(src, dst, "9p", flags, "trans=virtio,version=9p2000.u") < 0) { + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot mount %s on %s (9p): %s\n", + __func__, src, dst, strerror(errno)); + exit_poweroff(); diff --git a/0005-Add-support-for-configuring-NIC-mac-addresses.patch b/0005-Add-support-for-configuring-NIC-mac-addresses.patch new file mode 100644 index 0000000..bfca3a5 --- /dev/null +++ b/0005-Add-support-for-configuring-NIC-mac-addresses.patch @@ -0,0 +1,267 @@ +From 1120aff4808a433bfee38ddc8e5068f899ef2b12 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 9 Jul 2013 12:19:05 +0100 +Subject: [PATCH] Add support for configuring NIC mac addresses + +Allow config of NIC mac addresses via a 'mac' parameter on +the command line eg + + virt-sandbox -c qemu:///session -N mac=02:04:05:05:05:06 /bin/sh + +(and also for virt-sandbox-service) + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit e799f01b5ddb2c5182f6f2a668638292d1bbcbb8) +--- + bin/virt-sandbox-service-create.pod | 5 +++ + bin/virt-sandbox.c | 5 +++ + .../libvirt-sandbox-builder-container.c | 7 +++- + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 6 +++- + libvirt-sandbox/libvirt-sandbox-config-network.c | 40 ++++++++++++++++++++++ + libvirt-sandbox/libvirt-sandbox-config-network.h | 4 +++ + libvirt-sandbox/libvirt-sandbox-config.c | 10 ++++++ + libvirt-sandbox/libvirt-sandbox.sym | 2 ++ + 8 files changed, 77 insertions(+), 2 deletions(-) + +diff --git a/bin/virt-sandbox-service-create.pod b/bin/virt-sandbox-service-create.pod +index 942c919..8e3b114 100644 +--- a/bin/virt-sandbox-service-create.pod ++++ b/bin/virt-sandbox-service-create.pod +@@ -91,6 +91,11 @@ where 'source' is the name of any libvirt virtual network. + Set the name of the network to connect the interface to. C + is the name of any libvirt virtual network. See also B + ++=item mac=NN:NN:NN:NN:NN:NN ++ ++Set the MAC address of the network interface, where each NN is a pair ++of hex digits. ++ + =item address=IP-ADDRESS/PREFIX%BROADCAST + + Configure the network interface with the static IPv4 or IPv6 address +diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c +index f1db8c1..883e6c0 100644 +--- a/bin/virt-sandbox.c ++++ b/bin/virt-sandbox.c +@@ -352,6 +352,11 @@ where 'source' is the name of any libvirt virtual network. + Set the name of the network to connect the interface to. C + is the name of any libvirt virtual network. See also B + ++=item mac=NN:NN:NN:NN:NN:NN ++ ++Set the MAC address of the network interface, where each NN is a pair ++of hex digits. ++ + =item address=IP-ADDRESS/PREFIX%BROADCAST + + Configure the network interface with the static IPv4 or IPv6 address +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-sandbox/libvirt-sandbox-builder-container.c +index d4e9bda..9fa870d 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-container.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c +@@ -323,7 +323,7 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil + + tmp = networks = gvir_sandbox_config_get_networks(config); + while (tmp) { +- const gchar *source; ++ const gchar *source, *mac; + GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + + iface = gvir_config_domain_interface_network_new(); +@@ -333,6 +333,11 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil + else + gvir_config_domain_interface_network_set_source(iface, "default"); + ++ mac = gvir_sandbox_config_network_get_mac(network); ++ if (mac) ++ gvir_config_domain_interface_set_mac(GVIR_CONFIG_DOMAIN_INTERFACE(iface), ++ mac); ++ + gvir_config_domain_add_device(domain, + GVIR_CONFIG_DOMAIN_DEVICE(iface)); + g_object_unref(iface); +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +index d78d755..2ad30ab 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +@@ -542,7 +542,7 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde + + tmp = networks = gvir_sandbox_config_get_networks(config); + while (tmp) { +- const gchar *source; ++ const gchar *source, *mac; + GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + + source = gvir_sandbox_config_network_get_source(network); +@@ -554,6 +554,10 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde + iface = GVIR_CONFIG_DOMAIN_INTERFACE(gvir_config_domain_interface_user_new()); + } + ++ mac = gvir_sandbox_config_network_get_mac(network); ++ if (mac) ++ gvir_config_domain_interface_set_mac(iface, mac); ++ + gvir_config_domain_interface_set_model(iface, + "virtio"); + +diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c +index 173ac36..0283f8a 100644 +--- a/libvirt-sandbox/libvirt-sandbox-config-network.c ++++ b/libvirt-sandbox/libvirt-sandbox-config-network.c +@@ -44,6 +44,7 @@ struct _GVirSandboxConfigNetworkPrivate + { + gboolean dhcp; + gchar *source; ++ gchar *mac; + GList *routes; + GList *addrs; + }; +@@ -55,6 +56,7 @@ enum { + PROP_0, + PROP_DHCP, + PROP_SOURCE, ++ PROP_MAC, + }; + + enum { +@@ -81,6 +83,10 @@ static void gvir_sandbox_config_network_get_property(GObject *object, + g_value_set_string(value, priv->source); + break; + ++ case PROP_MAC: ++ g_value_set_string(value, priv->mac); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +@@ -105,6 +111,11 @@ static void gvir_sandbox_config_network_set_property(GObject *object, + priv->source = g_value_dup_string(value); + break; + ++ case PROP_MAC: ++ g_free(priv->mac); ++ priv->mac = g_value_dup_string(value); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +@@ -117,6 +128,7 @@ static void gvir_sandbox_config_network_finalize(GObject *object) + GVirSandboxConfigNetworkPrivate *priv = config->priv; + + g_free(priv->source); ++ g_free(priv->mac); + g_list_foreach(priv->addrs, (GFunc)g_object_unref, NULL); + g_list_foreach(priv->routes, (GFunc)g_object_unref, NULL); + +@@ -155,6 +167,18 @@ static void gvir_sandbox_config_network_class_init(GVirSandboxConfigNetworkClass + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + ++ g_object_class_install_property(object_class, ++ PROP_MAC, ++ g_param_spec_string("mac", ++ "MAC", ++ "MAC address", ++ NULL, ++ G_PARAM_READABLE | ++ G_PARAM_WRITABLE | ++ G_PARAM_STATIC_NAME | ++ G_PARAM_STATIC_NICK | ++ G_PARAM_STATIC_BLURB)); ++ + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkPrivate)); + } + +@@ -198,6 +222,22 @@ const gchar *gvir_sandbox_config_network_get_source(GVirSandboxConfigNetwork *co + } + + ++void gvir_sandbox_config_network_set_mac(GVirSandboxConfigNetwork *config, ++ const gchar *mac) ++{ ++ GVirSandboxConfigNetworkPrivate *priv = config->priv; ++ g_free(priv->mac); ++ priv->mac = g_strdup(mac); ++} ++ ++ ++const gchar *gvir_sandbox_config_network_get_mac(GVirSandboxConfigNetwork *config) ++{ ++ GVirSandboxConfigNetworkPrivate *priv = config->priv; ++ return priv->mac; ++} ++ ++ + void gvir_sandbox_config_network_set_dhcp(GVirSandboxConfigNetwork *config, + gboolean dhcp) + { +diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.h b/libvirt-sandbox/libvirt-sandbox-config-network.h +index 1c588ef..9ad8577 100644 +--- a/libvirt-sandbox/libvirt-sandbox-config-network.h ++++ b/libvirt-sandbox/libvirt-sandbox-config-network.h +@@ -65,6 +65,10 @@ void gvir_sandbox_config_network_set_source(GVirSandboxConfigNetwork *config, + const gchar *network); + const gchar *gvir_sandbox_config_network_get_source(GVirSandboxConfigNetwork *config); + ++void gvir_sandbox_config_network_set_mac(GVirSandboxConfigNetwork *config, ++ const gchar *mac); ++const gchar *gvir_sandbox_config_network_get_mac(GVirSandboxConfigNetwork *config); ++ + void gvir_sandbox_config_network_set_dhcp(GVirSandboxConfigNetwork *config, + gboolean dhcp); + gboolean gvir_sandbox_config_network_get_dhcp(GVirSandboxConfigNetwork *config); +diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c +index 10082bb..6f7c6ff 100644 +--- a/libvirt-sandbox/libvirt-sandbox-config.c ++++ b/libvirt-sandbox/libvirt-sandbox-config.c +@@ -888,6 +888,9 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, + } else if (g_str_has_prefix(param, "source=")) { + gvir_sandbox_config_network_set_source(net, + param + strlen("source=")); ++ } else if (g_str_has_prefix(param, "mac=")) { ++ gvir_sandbox_config_network_set_mac(net, ++ param + strlen("mac=")); + } else if (g_str_has_prefix(param, "address=")) { + GVirSandboxConfigNetworkAddress *addr; + GInetAddress *primaryaddr; +@@ -1618,6 +1621,11 @@ static GVirSandboxConfigNetwork *gvir_sandbox_config_load_config_network(GKeyFil + gvir_sandbox_config_network_set_source(config, str1); + g_free(str1); + ++ str1 = g_key_file_get_string(file, key, "mac", NULL); ++ if (str1) ++ gvir_sandbox_config_network_set_mac(config, str1); ++ g_free(str1); ++ + g_free(key); + key = NULL; + +@@ -1941,6 +1949,8 @@ static void gvir_sandbox_config_save_config_network(GVirSandboxConfigNetwork *co + g_key_file_set_boolean(file, key, "dhcp", gvir_sandbox_config_network_get_dhcp(config)); + if (gvir_sandbox_config_network_get_source(config)) + g_key_file_set_string(file, key, "source", gvir_sandbox_config_network_get_source(config)); ++ if (gvir_sandbox_config_network_get_mac(config)) ++ g_key_file_set_string(file, key, "mac", gvir_sandbox_config_network_get_mac(config)); + g_key_file_set_uint64(file, key, "addresses", j); + g_key_file_set_uint64(file, key, "routes", k); + g_free(key); +diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym +index 716de66..09f863d 100644 +--- a/libvirt-sandbox/libvirt-sandbox.sym ++++ b/libvirt-sandbox/libvirt-sandbox.sym +@@ -55,11 +55,13 @@ LIBVIRT_SANDBOX_0.2.0 { + gvir_sandbox_config_network_add_route; + gvir_sandbox_config_network_get_type; + gvir_sandbox_config_network_get_dhcp; ++ gvir_sandbox_config_network_get_mac; + gvir_sandbox_config_network_get_source; + gvir_sandbox_config_network_get_routes; + gvir_sandbox_config_network_get_addresses; + gvir_sandbox_config_network_new; + gvir_sandbox_config_network_set_dhcp; ++ gvir_sandbox_config_network_set_mac; + gvir_sandbox_config_network_set_source; + + gvir_sandbox_config_network_address_get_type; diff --git a/0006-S-is-not-supported-by-virt-sandbox.patch b/0006-S-is-not-supported-by-virt-sandbox.patch new file mode 100644 index 0000000..e311a27 --- /dev/null +++ b/0006-S-is-not-supported-by-virt-sandbox.patch @@ -0,0 +1,25 @@ +From 4d073041f96975fc8acfb459958844339da57ea7 Mon Sep 17 00:00:00 2001 +From: Dan Walsh +Date: Thu, 15 Aug 2013 07:56:46 -0400 +Subject: [PATCH] -S is not supported by virt-sandbox + +-S option has been removed from virt-sandbox, should be removed from man page. + +(cherry picked from commit 43f348a9a8d96dfa145a7883bed9fc6b1deca683) +--- + bin/virt-sandbox.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c +index 883e6c0..7e299ef 100644 +--- a/bin/virt-sandbox.c ++++ b/bin/virt-sandbox.c +@@ -263,8 +263,6 @@ virt-sandbox - Run cmd under a virtual machine sandbox + + virt-sandbox [OPTIONS...] COMMAND [CMDARG1 [CMDARG2 [...]]] + +-virt-sandbox [OPTIONS...] -S +- + =head1 DESCRIPTION + + Run the C application within a tightly confined virtual machine. The diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 35afaac..d8b2501 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -15,12 +15,18 @@ Name: libvirt-sandbox Version: 0.2.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz +Patch1: 0001-Always-set-earlyprintk-kernel-arg.patch +Patch2: 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch +Patch3: 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch +Patch4: 0004-Force-9p-version-to-version-9p2000.u.patch +Patch5: 0005-Add-support-for-configuring-NIC-mac-addresses.patch +Patch6: 0006-S-is-not-supported-by-virt-sandbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gobject-devel >= 0.0.9 BuildRequires: gobject-introspection-devel @@ -67,6 +73,12 @@ the libvirt sandbox %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build @@ -129,6 +141,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue May 7 2013 Daniel P. Berrange - 0.2.0-2 +- Fix booting QEMU sandboxes with Linux 3.11 kernel +- Remove bogus -S arg from man page (rhbz #997024) +- Allow mac addr to be specified (rhbz #977537) + * Tue May 7 2013 Daniel P. Berrange - 0.2.0-1 - Update to 0.2.0 release diff --git a/update-patches.pl b/update-patches.pl new file mode 100755 index 0000000..d758c2c --- /dev/null +++ b/update-patches.pl @@ -0,0 +1,110 @@ +#!/usr/bin/perl +# +# Update the local patches and RPM spec with patches from +# an upstream tree with matching branch name. +# +# For example +# +# - Checkout upstream GIT repo for libvirt-sandbox +# - Create a branch name matching current RHEL (eg rhel-6.4) +# - Populate the branch by cherry-picking patches from master +# +# This script will then +# +# - Setup the upstream GIT repo as a remote named 'upstream' +# - Extract version number from RPM spec +# - Look for a tag 'v$VERSION' in upstream GIT +# - Run 'git format-patches v$VERSION..upstream/rhel-6.4' +# - Re-write the RPM spec to update all PatchNNN and %patchNNN lines +# +# The only manual step required is to fill in the changelog +# + + +use strict; +use warnings; + +my $gitupstream = "git://libvirt.org/libvirt-sandbox.git"; +my $rpmspec = "libvirt-sandbox.spec"; + +open SPEC, "$rpmspec" or die "cannot read $rpmspec: $!"; +my @spec = ; +close SPEC; + +my $version; + +foreach my $line (@spec) { + if ($line =~ /^Version:\s*(\S+)\s*$/) { + $version = $1; + } +} + +die "cannot find Version: line in RPM spec" + unless $version; + +my $gittag = "v" . $version; +my $gitbranch = $gittag . "-maint"; + +my $haveupstream; + +open GIT, "-|", "git", "remote" or die "cannot run git remote: $!"; +while () { + if (/upstream/) { + $haveupstream = 1; + } +} + +close GIT; + +unless ($haveupstream) { + `git remote add upstream $gitupstream`; +} + +`git fetch upstream`; + + +$haveupstream = 0; + +open GIT, "-|", "git", "branch", "-a" or die "cannot find git branch -a: $!"; +while () { + if (m,upstream/$gitbranch,) { + $haveupstream = 1; + } +} +close GIT; + +die "cannot find upstream/$gitbranch" unless $haveupstream; + +`git format-patch --no-signature -N $gittag..upstream/$gitbranch`; + +opendir DH, "." or die "cannot read current directory: $!"; + +my @patches + = grep { + /^\d\d\d.*\.patch/ + } readdir(DH); + +closedir DH; + +@patches = sort @patches; + +open SPEC, ">$rpmspec" or die "cannot update $rpmspec: $!"; + +foreach my $line (@spec) { + print SPEC $line unless $line =~ /(Patch|%patch)/; + + my $i; + if ($line =~ /Source0/) { + for ($i = 0 ; $i <= $#patches ; $i++) { + printf SPEC "Patch%d: %s\n", $i+1, $patches[$i]; + } + } elsif ($line =~ /%setup/) { + for ($i = 0 ; $i <= $#patches ; $i++) { + printf SPEC "%%patch%d -p1\n", $i+1; + } + } +} + +close SPEC or die "cannot save $rpmspec: $!"; + +`git add *.patch $rpmspec`; From d00b5087e0a2323c0b5dfdaaa61deadda9205e41 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 1 Oct 2013 16:34:35 +0100 Subject: [PATCH 04/45] Fix boot with Linux 3.11 kernel Signed-off-by: Daniel P. Berrange --- .gitignore | 1 + 0001-Always-set-earlyprintk-kernel-arg.patch | 32 +++++ ...n-t-overmount-root-in-QEMU-sandboxes.patch | 27 +++++ ...trcmp-test-in-mount-options-for-QEMU.patch | 28 +++++ ...Force-9p-version-to-version-9p2000.u.patch | 48 ++++++++ 0005-S-is-not-supported-by-virt-sandbox.patch | 25 ++++ libvirt-sandbox.spec | 15 ++- update-patches.pl | 110 ++++++++++++++++++ 8 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 0001-Always-set-earlyprintk-kernel-arg.patch create mode 100644 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch create mode 100644 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch create mode 100644 0004-Force-9p-version-to-version-9p2000.u.patch create mode 100644 0005-S-is-not-supported-by-virt-sandbox.patch create mode 100755 update-patches.pl diff --git a/.gitignore b/.gitignore index f727ee0..578ba21 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ x86_64/ *.src.rpm .build*.log +*~ diff --git a/0001-Always-set-earlyprintk-kernel-arg.patch b/0001-Always-set-earlyprintk-kernel-arg.patch new file mode 100644 index 0000000..90fb2b5 --- /dev/null +++ b/0001-Always-set-earlyprintk-kernel-arg.patch @@ -0,0 +1,32 @@ +From 3f8e0892b012f6f94296d99ed5ac3340d53c7e4b Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Mon, 30 Sep 2013 15:13:06 +0100 +Subject: [PATCH] Always set earlyprintk kernel arg + +If the initrd fails and prints to stderr, this goes to /dev/null +unless earlyprintk is enabled. We always want to see initrd +errors, so we should always have earlyprintk set. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit b14ce17bb357d5b7f99562c91dafb521f6985b40) +--- + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +index 6b9b506..fd945c7 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +@@ -204,10 +204,10 @@ static gchar *gvir_sandbox_builder_machine_cmdline(GVirSandboxConfig *config G_G + gchar *tmp; + + /* Now kernel args */ +- g_string_append(str, " console=ttyS0"); ++ g_string_append(str, " console=ttyS0 earlyprintk=ttyS0"); + if (getenv("LIBVIRT_SANDBOX_DEBUG") && + g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2")) +- g_string_append(str, " debug loglevel=10 earlyprintk=ttyS0"); ++ g_string_append(str, " debug loglevel=10"); + else + g_string_append(str, " quiet loglevel=0"); + diff --git a/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch b/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch new file mode 100644 index 0000000..be9ff8b --- /dev/null +++ b/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch @@ -0,0 +1,27 @@ +From 03f5a7eca1dd77a00cf51c9675ebfb6d5d2a1164 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:51:34 +0100 +Subject: [PATCH] Don't overmount '/root' in QEMU sandboxes + +If the user wants to replace '/root' they can do that +explicitly. Don't overmount it ourselves. This fixes +an inconsistency between LXC & QEMU setups. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit 6ae67143e69f435b564164bfa67a174be7bc9702) +--- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index f09c6d9..079f83f 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -284,7 +284,6 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) + /* Main special filesystems */ + mount_other("/dev", "tmpfs", 0755); + mount_other_opts("/dev/pts", "devpts", "gid=5,mode=620,ptmxmode=000", 0755); +- mount_other("/root", "tmpfs", 0755); + mount_other("/sys", "sysfs", 0755); + mount_other("/proc", "proc", 0755); + //mount_other("/selinux", "selinuxfs", 0755); diff --git a/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch b/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch new file mode 100644 index 0000000..4858976 --- /dev/null +++ b/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch @@ -0,0 +1,28 @@ +From 031ffd3124ece5e14e210bde5b437032f5bf2913 Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:52:36 +0100 +Subject: [PATCH] Fix inverted strcmp test in mount options for QEMU + +The QEMU init binary intended to set nosuid & nodev on any +tmpfs filesystem. Due to a backwards strcmp test, it set +those flaws on everything except tmpfs. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit 8234b949106190f7df4c5b500c1520611eb8a603) +--- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index 079f83f..b7e4c6f 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -382,7 +382,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) + else + mount_mkfile(target, 644); + } else { +- if (strcmp(type, "tmpfs")) ++ if (strcmp(type, "tmpfs") == 0) + flags |= MS_NOSUID | MS_NODEV; + + mount_mkdir(target, 0755); diff --git a/0004-Force-9p-version-to-version-9p2000.u.patch b/0004-Force-9p-version-to-version-9p2000.u.patch new file mode 100644 index 0000000..41a3455 --- /dev/null +++ b/0004-Force-9p-version-to-version-9p2000.u.patch @@ -0,0 +1,48 @@ +From b20c8945af5a5ce248c2acd895be2812965fd6bd Mon Sep 17 00:00:00 2001 +From: "Daniel P. Berrange" +Date: Tue, 1 Oct 2013 13:54:10 +0100 +Subject: [PATCH] Force 9p version to version=9p2000.u + +With 9p version=9p2000.L, we tickle two bugs in QEMU's code. + +One breaks most calls with ENODEV on FS_IOC_GETVERSION ioctls. + +The other breaks xattr checks due to inverted errno. + +In addition with 9p2000.L we see extra permission checks +on dirs, which prevents the guest from over-mounting dirs +like /root that are restricted on the user running QEMU. + +Signed-off-by: Daniel P. Berrange +(cherry picked from commit f4087aa0e993f59772d3bda53038888af7f43b5e) +--- + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 2 +- + libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +index fd945c7..db5ceaa 100644 +--- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c ++++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c +@@ -274,7 +274,7 @@ static gboolean gvir_sandbox_builder_machine_write_mount_cfg(GVirSandboxConfig * + if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_BIND(mconfig)) { + source = g_strdup_printf("sandbox:mount%zu", nHostBind++); + fstype = "9p"; +- options = g_strdup("trans=virtio"); ++ options = g_strdup("trans=virtio,version=9p2000.u"); + } else if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_IMAGE(mconfig)) { + source = g_strdup_printf("vd%c", (char)('a' + nHostImage++)); + fstype = "ext3"; +diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +index b7e4c6f..f72148a 100644 +--- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c ++++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c +@@ -165,7 +165,7 @@ mount_9pfs(const char *src, const char *dst, int mode, int readonly) + if (readonly) + flags |= MS_RDONLY; + +- if (mount(src, dst, "9p", flags, "trans=virtio") < 0) { ++ if (mount(src, dst, "9p", flags, "trans=virtio,version=9p2000.u") < 0) { + fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot mount %s on %s (9p): %s\n", + __func__, src, dst, strerror(errno)); + exit_poweroff(); diff --git a/0005-S-is-not-supported-by-virt-sandbox.patch b/0005-S-is-not-supported-by-virt-sandbox.patch new file mode 100644 index 0000000..b6c46b2 --- /dev/null +++ b/0005-S-is-not-supported-by-virt-sandbox.patch @@ -0,0 +1,25 @@ +From 2844b51b153cd326246a1ba155be1df743034f2d Mon Sep 17 00:00:00 2001 +From: Dan Walsh +Date: Thu, 15 Aug 2013 07:56:46 -0400 +Subject: [PATCH] -S is not supported by virt-sandbox + +-S option has been removed from virt-sandbox, should be removed from man page. + +(cherry picked from commit 43f348a9a8d96dfa145a7883bed9fc6b1deca683) +--- + bin/virt-sandbox.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c +index b51465d..f6c011b 100644 +--- a/bin/virt-sandbox.c ++++ b/bin/virt-sandbox.c +@@ -263,8 +263,6 @@ virt-sandbox - Run cmd under a virtual machine sandbox + + virt-sandbox [OPTIONS...] COMMAND [CMDARG1 [CMDARG2 [...]]] + +-virt-sandbox [OPTIONS...] -S +- + =head1 DESCRIPTION + + Run the C application within a tightly confined virtual machine. The diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 3817488..5e4c26a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -15,12 +15,17 @@ Name: libvirt-sandbox Version: 0.5.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz +Patch1: 0001-Always-set-earlyprintk-kernel-arg.patch +Patch2: 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch +Patch3: 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch +Patch4: 0004-Force-9p-version-to-version-9p2000.u.patch +Patch5: 0005-S-is-not-supported-by-virt-sandbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gobject-devel >= 0.1.7 BuildRequires: gobject-introspection-devel @@ -68,6 +73,11 @@ the libvirt sandbox %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build @@ -130,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue Oct 1 2013 Daniel P. Berrange - 0.5.0-2 +- Fix boot with Linux 3.11 kernel + * Thu Aug 1 2013 Daniel P. Berrange - 0.5.0-1 - Update to 0.5.0 release diff --git a/update-patches.pl b/update-patches.pl new file mode 100755 index 0000000..d758c2c --- /dev/null +++ b/update-patches.pl @@ -0,0 +1,110 @@ +#!/usr/bin/perl +# +# Update the local patches and RPM spec with patches from +# an upstream tree with matching branch name. +# +# For example +# +# - Checkout upstream GIT repo for libvirt-sandbox +# - Create a branch name matching current RHEL (eg rhel-6.4) +# - Populate the branch by cherry-picking patches from master +# +# This script will then +# +# - Setup the upstream GIT repo as a remote named 'upstream' +# - Extract version number from RPM spec +# - Look for a tag 'v$VERSION' in upstream GIT +# - Run 'git format-patches v$VERSION..upstream/rhel-6.4' +# - Re-write the RPM spec to update all PatchNNN and %patchNNN lines +# +# The only manual step required is to fill in the changelog +# + + +use strict; +use warnings; + +my $gitupstream = "git://libvirt.org/libvirt-sandbox.git"; +my $rpmspec = "libvirt-sandbox.spec"; + +open SPEC, "$rpmspec" or die "cannot read $rpmspec: $!"; +my @spec = ; +close SPEC; + +my $version; + +foreach my $line (@spec) { + if ($line =~ /^Version:\s*(\S+)\s*$/) { + $version = $1; + } +} + +die "cannot find Version: line in RPM spec" + unless $version; + +my $gittag = "v" . $version; +my $gitbranch = $gittag . "-maint"; + +my $haveupstream; + +open GIT, "-|", "git", "remote" or die "cannot run git remote: $!"; +while () { + if (/upstream/) { + $haveupstream = 1; + } +} + +close GIT; + +unless ($haveupstream) { + `git remote add upstream $gitupstream`; +} + +`git fetch upstream`; + + +$haveupstream = 0; + +open GIT, "-|", "git", "branch", "-a" or die "cannot find git branch -a: $!"; +while () { + if (m,upstream/$gitbranch,) { + $haveupstream = 1; + } +} +close GIT; + +die "cannot find upstream/$gitbranch" unless $haveupstream; + +`git format-patch --no-signature -N $gittag..upstream/$gitbranch`; + +opendir DH, "." or die "cannot read current directory: $!"; + +my @patches + = grep { + /^\d\d\d.*\.patch/ + } readdir(DH); + +closedir DH; + +@patches = sort @patches; + +open SPEC, ">$rpmspec" or die "cannot update $rpmspec: $!"; + +foreach my $line (@spec) { + print SPEC $line unless $line =~ /(Patch|%patch)/; + + my $i; + if ($line =~ /Source0/) { + for ($i = 0 ; $i <= $#patches ; $i++) { + printf SPEC "Patch%d: %s\n", $i+1, $patches[$i]; + } + } elsif ($line =~ /%setup/) { + for ($i = 0 ; $i <= $#patches ; $i++) { + printf SPEC "%%patch%d -p1\n", $i+1; + } + } +} + +close SPEC or die "cannot save $rpmspec: $!"; + +`git add *.patch $rpmspec`; From c99826c3cf4ab5166da222a03e7b37c253e3b360 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 3 Oct 2013 11:35:13 +0100 Subject: [PATCH 05/45] Add fully versioned dep between libvirt-sandbox & libvirt-sandbox-libs Signed-off-by: Daniel P. Berrange --- libvirt-sandbox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 5e4c26a..9878271 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -15,7 +15,7 @@ Name: libvirt-sandbox Version: 0.5.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -39,6 +39,7 @@ Requires: libvirt-client >= %{libvirt_version} Requires: systemd >= 198 Requires: pygobject3-base Requires: libselinux-python +Requires: %{name}-libs = %{version}-%{release} %package libs Group: Development/Libraries @@ -140,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Oct 3 2013 Daniel P. Berrange - 0.5.0-3 +- Add fully versioned dep between libvirt-sandbox & libvirt-sandbox-libs + * Tue Oct 1 2013 Daniel P. Berrange - 0.5.0-2 - Fix boot with Linux 3.11 kernel From 076511b35392a3a13a404c20e8e23539ca5894aa Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 18 Nov 2013 17:15:46 +0000 Subject: [PATCH 06/45] Update to 0.5.1 release Signed-off-by: Daniel P. Berrange --- 0001-Always-set-earlyprintk-kernel-arg.patch | 32 ------------- ...n-t-overmount-root-in-QEMU-sandboxes.patch | 27 ----------- ...trcmp-test-in-mount-options-for-QEMU.patch | 28 ----------- ...Force-9p-version-to-version-9p2000.u.patch | 48 ------------------- 0005-S-is-not-supported-by-virt-sandbox.patch | 25 ---------- libvirt-sandbox.spec | 33 +++++-------- 6 files changed, 12 insertions(+), 181 deletions(-) delete mode 100644 0001-Always-set-earlyprintk-kernel-arg.patch delete mode 100644 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch delete mode 100644 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch delete mode 100644 0004-Force-9p-version-to-version-9p2000.u.patch delete mode 100644 0005-S-is-not-supported-by-virt-sandbox.patch diff --git a/0001-Always-set-earlyprintk-kernel-arg.patch b/0001-Always-set-earlyprintk-kernel-arg.patch deleted file mode 100644 index 90fb2b5..0000000 --- a/0001-Always-set-earlyprintk-kernel-arg.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3f8e0892b012f6f94296d99ed5ac3340d53c7e4b Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Mon, 30 Sep 2013 15:13:06 +0100 -Subject: [PATCH] Always set earlyprintk kernel arg - -If the initrd fails and prints to stderr, this goes to /dev/null -unless earlyprintk is enabled. We always want to see initrd -errors, so we should always have earlyprintk set. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit b14ce17bb357d5b7f99562c91dafb521f6985b40) ---- - libvirt-sandbox/libvirt-sandbox-builder-machine.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c -index 6b9b506..fd945c7 100644 ---- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c -+++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c -@@ -204,10 +204,10 @@ static gchar *gvir_sandbox_builder_machine_cmdline(GVirSandboxConfig *config G_G - gchar *tmp; - - /* Now kernel args */ -- g_string_append(str, " console=ttyS0"); -+ g_string_append(str, " console=ttyS0 earlyprintk=ttyS0"); - if (getenv("LIBVIRT_SANDBOX_DEBUG") && - g_str_equal(getenv("LIBVIRT_SANDBOX_DEBUG"), "2")) -- g_string_append(str, " debug loglevel=10 earlyprintk=ttyS0"); -+ g_string_append(str, " debug loglevel=10"); - else - g_string_append(str, " quiet loglevel=0"); - diff --git a/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch b/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch deleted file mode 100644 index be9ff8b..0000000 --- a/0002-Don-t-overmount-root-in-QEMU-sandboxes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 03f5a7eca1dd77a00cf51c9675ebfb6d5d2a1164 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Tue, 1 Oct 2013 13:51:34 +0100 -Subject: [PATCH] Don't overmount '/root' in QEMU sandboxes - -If the user wants to replace '/root' they can do that -explicitly. Don't overmount it ourselves. This fixes -an inconsistency between LXC & QEMU setups. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit 6ae67143e69f435b564164bfa67a174be7bc9702) ---- - libvirt-sandbox/libvirt-sandbox-init-qemu.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -index f09c6d9..079f83f 100644 ---- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c -+++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -@@ -284,7 +284,6 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) - /* Main special filesystems */ - mount_other("/dev", "tmpfs", 0755); - mount_other_opts("/dev/pts", "devpts", "gid=5,mode=620,ptmxmode=000", 0755); -- mount_other("/root", "tmpfs", 0755); - mount_other("/sys", "sysfs", 0755); - mount_other("/proc", "proc", 0755); - //mount_other("/selinux", "selinuxfs", 0755); diff --git a/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch b/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch deleted file mode 100644 index 4858976..0000000 --- a/0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 031ffd3124ece5e14e210bde5b437032f5bf2913 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Tue, 1 Oct 2013 13:52:36 +0100 -Subject: [PATCH] Fix inverted strcmp test in mount options for QEMU - -The QEMU init binary intended to set nosuid & nodev on any -tmpfs filesystem. Due to a backwards strcmp test, it set -those flaws on everything except tmpfs. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit 8234b949106190f7df4c5b500c1520611eb8a603) ---- - libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -index 079f83f..b7e4c6f 100644 ---- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c -+++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -@@ -382,7 +382,7 @@ main(int argc ATTR_UNUSED, char **argv ATTR_UNUSED) - else - mount_mkfile(target, 644); - } else { -- if (strcmp(type, "tmpfs")) -+ if (strcmp(type, "tmpfs") == 0) - flags |= MS_NOSUID | MS_NODEV; - - mount_mkdir(target, 0755); diff --git a/0004-Force-9p-version-to-version-9p2000.u.patch b/0004-Force-9p-version-to-version-9p2000.u.patch deleted file mode 100644 index 41a3455..0000000 --- a/0004-Force-9p-version-to-version-9p2000.u.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b20c8945af5a5ce248c2acd895be2812965fd6bd Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Tue, 1 Oct 2013 13:54:10 +0100 -Subject: [PATCH] Force 9p version to version=9p2000.u - -With 9p version=9p2000.L, we tickle two bugs in QEMU's code. - -One breaks most calls with ENODEV on FS_IOC_GETVERSION ioctls. - -The other breaks xattr checks due to inverted errno. - -In addition with 9p2000.L we see extra permission checks -on dirs, which prevents the guest from over-mounting dirs -like /root that are restricted on the user running QEMU. - -Signed-off-by: Daniel P. Berrange -(cherry picked from commit f4087aa0e993f59772d3bda53038888af7f43b5e) ---- - libvirt-sandbox/libvirt-sandbox-builder-machine.c | 2 +- - libvirt-sandbox/libvirt-sandbox-init-qemu.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c -index fd945c7..db5ceaa 100644 ---- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c -+++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c -@@ -274,7 +274,7 @@ static gboolean gvir_sandbox_builder_machine_write_mount_cfg(GVirSandboxConfig * - if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_BIND(mconfig)) { - source = g_strdup_printf("sandbox:mount%zu", nHostBind++); - fstype = "9p"; -- options = g_strdup("trans=virtio"); -+ options = g_strdup("trans=virtio,version=9p2000.u"); - } else if (GVIR_SANDBOX_IS_CONFIG_MOUNT_HOST_IMAGE(mconfig)) { - source = g_strdup_printf("vd%c", (char)('a' + nHostImage++)); - fstype = "ext3"; -diff --git a/libvirt-sandbox/libvirt-sandbox-init-qemu.c b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -index b7e4c6f..f72148a 100644 ---- a/libvirt-sandbox/libvirt-sandbox-init-qemu.c -+++ b/libvirt-sandbox/libvirt-sandbox-init-qemu.c -@@ -165,7 +165,7 @@ mount_9pfs(const char *src, const char *dst, int mode, int readonly) - if (readonly) - flags |= MS_RDONLY; - -- if (mount(src, dst, "9p", flags, "trans=virtio") < 0) { -+ if (mount(src, dst, "9p", flags, "trans=virtio,version=9p2000.u") < 0) { - fprintf(stderr, "libvirt-sandbox-init-qemu: %s: cannot mount %s on %s (9p): %s\n", - __func__, src, dst, strerror(errno)); - exit_poweroff(); diff --git a/0005-S-is-not-supported-by-virt-sandbox.patch b/0005-S-is-not-supported-by-virt-sandbox.patch deleted file mode 100644 index b6c46b2..0000000 --- a/0005-S-is-not-supported-by-virt-sandbox.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2844b51b153cd326246a1ba155be1df743034f2d Mon Sep 17 00:00:00 2001 -From: Dan Walsh -Date: Thu, 15 Aug 2013 07:56:46 -0400 -Subject: [PATCH] -S is not supported by virt-sandbox - --S option has been removed from virt-sandbox, should be removed from man page. - -(cherry picked from commit 43f348a9a8d96dfa145a7883bed9fc6b1deca683) ---- - bin/virt-sandbox.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c -index b51465d..f6c011b 100644 ---- a/bin/virt-sandbox.c -+++ b/bin/virt-sandbox.c -@@ -263,8 +263,6 @@ virt-sandbox - Run cmd under a virtual machine sandbox - - virt-sandbox [OPTIONS...] COMMAND [CMDARG1 [CMDARG2 [...]]] - --virt-sandbox [OPTIONS...] -S -- - =head1 DESCRIPTION - - Run the C application within a tightly confined virtual machine. The diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 9878271..5327778 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -1,37 +1,31 @@ # -*- rpm-spec -*- -%define with_tcg 1 -%define with_kvm 1 +%define with_qemu 1 # RHEL does not provide the 9p.ko kernel module # nor the virtio-9p KVM backend driver. %if 0%{?rhel} -%define with_tcg 0 -%define with_kvm 0 +%define with_qemu 0 %endif %define libvirt_version 1.0.2 Name: libvirt-sandbox -Version: 0.5.0 -Release: 3%{?dist}%{?extra_release} +Version: 0.5.1 +Release: 1%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz -Patch1: 0001-Always-set-earlyprintk-kernel-arg.patch -Patch2: 0002-Don-t-overmount-root-in-QEMU-sandboxes.patch -Patch3: 0003-Fix-inverted-strcmp-test-in-mount-options-for-QEMU.patch -Patch4: 0004-Force-9p-version-to-version-9p2000.u.patch -Patch5: 0005-S-is-not-supported-by-virt-sandbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gobject-devel >= 0.1.7 BuildRequires: gobject-introspection-devel BuildRequires: glibc-static BuildRequires: /usr/bin/pod2man BuildRequires: intltool +BuildRequires: libselinux-devel BuildRequires: glib2-devel >= 2.32.0 Requires: rpm-python # For virsh lxc-enter-namespace command @@ -45,13 +39,12 @@ Requires: %{name}-libs = %{version}-%{release} Group: Development/Libraries Summary: libvirt application sandbox framework libraries # So we get the full libvirtd daemon, not just client libs -%ifarch %{ix86} x86_64 -%if %{with_kvm} +%if %{with_qemu} + %ifarch %{ix86} x86_64 Requires: libvirt-daemon-kvm >= %{libvirt_version} -%endif -%endif -%if %{with_tcg} + %else Requires: libvirt-daemon-qemu >= %{libvirt_version} + %endif %endif Requires: libvirt-daemon-lxc >= %{libvirt_version} @@ -74,11 +67,6 @@ the libvirt sandbox %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build @@ -141,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Mon Nov 18 2013 Daniel P. Berrange - 0.5.1-1 +- Update to 0.5.0 release + * Thu Oct 3 2013 Daniel P. Berrange - 0.5.0-3 - Add fully versioned dep between libvirt-sandbox & libvirt-sandbox-libs From b809b166e33d5079b97472c2bad9d0f7f4297b27 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 19 Nov 2013 10:54:51 +0000 Subject: [PATCH 07/45] Actually add 0.5.1 to sources file. Signed-off-by: Daniel P. Berrange --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 7c4df00..d64a98d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ad2d1353bb08a1c2496fc9badcc8049 libvirt-sandbox-0.5.0.tar.gz +2b647f95b72be0d3d1cf3336c40914dc libvirt-sandbox-0.5.1.tar.gz From 95c6bbed3a498ae700a5b6d73ab51fedb134b0fc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:58:18 -0500 Subject: [PATCH 08/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 5327778..dec44fa 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.5.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Nov 18 2013 Daniel P. Berrange - 0.5.1-1 - Update to 0.5.0 release From c8ecb7adf4710973390c4f6c67512940888a63e7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 22 Jul 2014 20:00:19 +0200 Subject: [PATCH 09/45] Rebuilt for gobject-introspection 1.41.4 --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index dec44fa..10e1a13 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.5.1 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue Jul 22 2014 Kalev Lember - 0.5.1-3 +- Rebuilt for gobject-introspection 1.41.4 + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8bfa51ef02fcec7674facca64caa2069037aef7b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 06:41:02 +0000 Subject: [PATCH 10/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 10e1a13..6d68d0f 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.5.1 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 22 2014 Kalev Lember - 0.5.1-3 - Rebuilt for gobject-introspection 1.41.4 From c703c02f374e7fc0f4b07c73661ce344eb53cd9b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 17:32:50 +0000 Subject: [PATCH 11/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 6d68d0f..827e0a6 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.5.1 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From a75db29eed4824c2a06ea4c9806cabaac07e9841 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 1 Jul 2015 15:29:35 +0100 Subject: [PATCH 12/45] Update to 0.6.0 release --- libvirt-sandbox.spec | 13 +++++++++---- sources | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 827e0a6..1bed03a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,21 +12,23 @@ Name: libvirt-sandbox -Version: 0.5.1 -Release: 5%{?dist}%{?extra_release} +Version: 0.6.0 +Release: 1%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libvirt-gobject-devel >= 0.1.7 +BuildRequires: libvirt-gobject-devel >= 0.2.1 BuildRequires: gobject-introspection-devel BuildRequires: glibc-static BuildRequires: /usr/bin/pod2man BuildRequires: intltool BuildRequires: libselinux-devel BuildRequires: glib2-devel >= 2.32.0 +BuildRequires: xz-devel >= 5.0.0, xz-static +BuildRequires: zlib-devel >= 1.2.0, zlib-static Requires: rpm-python # For virsh lxc-enter-namespace command Requires: libvirt-client >= %{libvirt_version} @@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Wed Jul 1 2015 Daniel P. Berrange - 0.6.0-1 +- Update to 0.6.0 release + * Wed Jun 17 2015 Fedora Release Engineering - 0.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -142,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Mon Nov 18 2013 Daniel P. Berrange - 0.5.1-1 -- Update to 0.5.0 release +- Update to 0.5.1 release * Thu Oct 3 2013 Daniel P. Berrange - 0.5.0-3 - Add fully versioned dep between libvirt-sandbox & libvirt-sandbox-libs diff --git a/sources b/sources index d64a98d..b05625d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b647f95b72be0d3d1cf3336c40914dc libvirt-sandbox-0.5.1.tar.gz +546eb0caaa79d50a723adf58f32da87f libvirt-sandbox-0.6.0.tar.gz From 5b06983cb41216aa955e2f0e77d807859f3d7c44 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:07:27 +0000 Subject: [PATCH 13/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 1bed03a..116861b 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jul 1 2015 Daniel P. Berrange - 0.6.0-1 - Update to 0.6.0 release From dc050fe7b03f655a79ee39a51cfdb98a474cf55c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:40:08 +0000 Subject: [PATCH 14/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 116861b..3aff2c1 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 0.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 30188eeb35a7036b797df038de3432e7628222e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:57:06 +0000 Subject: [PATCH 15/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 3aff2c1..82889ed 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3db3cb989c0da9e58a489765ce491464c27d690d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:29:27 +0000 Subject: [PATCH 16/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 82889ed..ea48b9f 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From ffa7f4012cde258b4f43c0c62f507684a292d4fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:39:56 +0000 Subject: [PATCH 17/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index ea48b9f..67d29b6 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 221b85da9edc89e7d5d406d54764b356346d8e23 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:44:18 +0100 Subject: [PATCH 18/45] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- libvirt-sandbox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 67d29b6..4ba86cd 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -19,7 +19,6 @@ Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gobject-devel >= 0.2.1 BuildRequires: gobject-introspection-devel BuildRequires: glibc-static From a884fa5f551530768258180e521e73474fb2e196 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:17:53 +0100 Subject: [PATCH 19/45] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libvirt-sandbox.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 4ba86cd..befa341 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -84,9 +84,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig From f97479764629b5dc753b66634aa54a32033f52d7 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 26 Mar 2018 22:32:52 +0200 Subject: [PATCH 20/45] Update Python 2 dependency declarations to new packaging standards --- libvirt-sandbox.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index befa341..822b04c 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -13,7 +13,7 @@ Name: libvirt-sandbox Version: 0.6.0 -Release: 6%{?dist}%{?extra_release} +Release: 7%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -28,12 +28,12 @@ BuildRequires: libselinux-devel BuildRequires: glib2-devel >= 2.32.0 BuildRequires: xz-devel >= 5.0.0, xz-static BuildRequires: zlib-devel >= 1.2.0, zlib-static -Requires: rpm-python +Requires: python2-rpm # For virsh lxc-enter-namespace command Requires: libvirt-client >= %{libvirt_version} Requires: systemd >= 198 -Requires: pygobject3-base -Requires: libselinux-python +Requires: python2-gobject-base +Requires: python2-libselinux Requires: %{name}-libs = %{version}-%{release} %package libs @@ -127,6 +127,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Mon Mar 26 2018 Iryna Shcherbina - 0.6.0-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2ac2f535cd14b3e345b1c14575cd57d4cee94736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 8 Jun 2018 11:43:29 +0100 Subject: [PATCH 21/45] Update to 0.8.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- libvirt-sandbox.spec | 25 +++++++++---------------- sources | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 822b04c..a7800da 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -10,10 +10,9 @@ %define libvirt_version 1.0.2 - Name: libvirt-sandbox -Version: 0.6.0 -Release: 7%{?dist}%{?extra_release} +Version: 0.8.0 +Release: 1%{?dist} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -28,12 +27,10 @@ BuildRequires: libselinux-devel BuildRequires: glib2-devel >= 2.32.0 BuildRequires: xz-devel >= 5.0.0, xz-static BuildRequires: zlib-devel >= 1.2.0, zlib-static -Requires: python2-rpm -# For virsh lxc-enter-namespace command -Requires: libvirt-client >= %{libvirt_version} -Requires: systemd >= 198 -Requires: python2-gobject-base -Requires: python2-libselinux +%if 0%{fedora} > 27 +BuildRequires: libtirpc-devel +BuildRequires: rpcgen +%endif Requires: %{name}-libs = %{version}-%{release} %package libs @@ -89,15 +86,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %files %defattr(-,root,root,-) -%{_datadir}/bash-completion/completions/virt-sandbox-service -%config(noreplace) %{_sysconfdir}/cron.daily/virt-sandbox-service.logrotate -%dir %{_sysconfdir}/libvirt-sandbox/services %{_bindir}/virt-sandbox -%{_bindir}/virt-sandbox-service -%{_libexecdir}/virt-sandbox-service-util %{_mandir}/man1/virt-sandbox.1* -%{_mandir}/man1/virt-sandbox-service.1* -%{_mandir}/man1/virt-sandbox-service-*.1* %files libs -f %{name}.lang %defattr(-,root,root,-) @@ -127,6 +117,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Jun 8 2018 Daniel P. Berrangé - 0.8.0-1 +- Update to 0.8.0 release + * Mon Mar 26 2018 Iryna Shcherbina - 0.6.0-7 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index b05625d..ecadc58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -546eb0caaa79d50a723adf58f32da87f libvirt-sandbox-0.6.0.tar.gz +SHA512 (libvirt-sandbox-0.8.0.tar.gz) = 633368b6b41c520ae678b850e4c6c96cc3220adcfda9a9a36ad67d50f10b1d18e40a2d92e76a8d99a63e7e24a1f9cf3153eca0acf4745bd48c381289974476d2 From c5fcf7dd5cb95bdecef4035c2200d23ce53d9b7b Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:48:54 -0500 Subject: [PATCH 22/45] Remove needless use of %defattr --- libvirt-sandbox.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index a7800da..cf32573 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -85,12 +85,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %postun libs -p /sbin/ldconfig %files -%defattr(-,root,root,-) %{_bindir}/virt-sandbox %{_mandir}/man1/virt-sandbox.1* %files libs -f %{name}.lang -%defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog NEWS %dir %{_sysconfdir}/libvirt-sandbox %dir %{_sysconfdir}/libvirt-sandbox/scratch @@ -102,7 +100,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_libdir}/girepository-1.0/LibvirtSandbox-1.0.typelib %files devel -%defattr(-,root,root,-) %doc examples/virt-sandbox.pl %doc examples/virt-sandbox.py %doc examples/virt-sandbox.js From 8070f47a1af9aeccae7b4d458c17bab28fc1351d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:02:01 +0000 Subject: [PATCH 23/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index cf32573..1e27904 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: libvirt application sandbox framework Group: Development/Tools License: LGPLv2+ @@ -114,6 +114,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 8 2018 Daniel P. Berrangé - 0.8.0-1 - Update to 0.8.0 release From 6b71b874718eb02493b7c0bd1c36a8f2a73c4fcc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:14 +0100 Subject: [PATCH 24/45] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libvirt-sandbox.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 1e27904..3861241 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -81,8 +81,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %find_lang %{name} -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files %{_bindir}/virt-sandbox From 7472e7fabdaaab57135d4b1dc94501cf623294cf Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 25/45] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libvirt-sandbox.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 3861241..4439a4c 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -14,7 +14,6 @@ Name: libvirt-sandbox Version: 0.8.0 Release: 2%{?dist} Summary: libvirt application sandbox framework -Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz @@ -34,7 +33,6 @@ BuildRequires: rpcgen Requires: %{name}-libs = %{version}-%{release} %package libs -Group: Development/Libraries Summary: libvirt application sandbox framework libraries # So we get the full libvirtd daemon, not just client libs %if %{with_qemu} @@ -47,7 +45,6 @@ Requires: libvirt-daemon-qemu >= %{libvirt_version} Requires: libvirt-daemon-lxc >= %{libvirt_version} %package devel -Group: Development/Libraries Summary: libvirt application sandbox framework development files Requires: %{name}-libs = %{version}-%{release} From 34ac695632cfa67573eeba02c5eb24b121b8fba4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:31:15 +0000 Subject: [PATCH 26/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 4439a4c..a258268 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -110,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 400cd9eda78068ec47d2c23fe6517bb997517272 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:41:43 +0000 Subject: [PATCH 27/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index a258268..f9b4708 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -110,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0a49df8a68b255bb75b32f3000c1a8ddb0a3333c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 10:44:39 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index f9b4708..2c0cda1 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -110,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f76038659890a825840b70ad7d61b40224caf1ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:52:40 +0000 Subject: [PATCH 29/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 2c0cda1..d4f26b1 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -110,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From afd0576c923eca88f4db3aff5c65d44b400ad3e5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 20:32:52 +0000 Subject: [PATCH 30/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libvirt-sandbox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index d4f26b1..97352a6 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -17,6 +17,7 @@ Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: libvirt-gobject-devel >= 0.2.1 BuildRequires: gobject-introspection-devel BuildRequires: glibc-static From f73ff40a5dab7281e7b4701e1aad031263bd22c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:17:30 +0000 Subject: [PATCH 31/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 97352a6..9f3d311 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.8.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f0eac0f2b4d363b5aa9c357ca2d536b059e26a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:42:25 +0000 Subject: [PATCH 32/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 9f3d311..7708008 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d274f8c4b92c2c7a38e6f8e7e1d38ee1c3032152 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:35:29 +0000 Subject: [PATCH 33/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 7708008..7bfb33a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c3a7e789f0def3fe65b62c1c15408a95ea491fa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:21:45 +0000 Subject: [PATCH 34/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 7bfb33a..b312ea8 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 184cde83807507f226a1e22f68b712daf861b85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:47:06 +0000 Subject: [PATCH 35/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index b312ea8..75b22d1 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.8.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.8.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7a218301c7659390f709909b6e29812df2e2f49e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:29:18 +0000 Subject: [PATCH 36/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 75b22d1..16e121a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.8.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e025f12af8c8b220185d8cbd2365a84ff7d014ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:42:06 +0000 Subject: [PATCH 37/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 16e121a..8c2bc2a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.8.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.8.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 86884e42fdbdc49799c8bac2c69e142e80195a6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:56:23 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 8c2bc2a..6f4dc8a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.8.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.8.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 68ebfe7da43b01012e4a2ae7f03475c856c2feff Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Fri, 29 Mar 2024 21:40:55 -0500 Subject: [PATCH 39/45] Rebuild to ensure backdoored XZ libs arn't present --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 6f4dc8a..10e662f 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Sat Mar 30 2024 Jonathan Wright - 0.8.0-15 +- Rebuild to ensure backdoored XZ libs arn't present + * Thu Jan 25 2024 Fedora Release Engineering - 0.8.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 875d3fe56b7f3b85d0973b1456daba9e0a429bd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:27:05 +0000 Subject: [PATCH 40/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 10e662f..31a88b2 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: libvirt application sandbox framework License: LGPLv2+ URL: http://libvirt.org/ @@ -111,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.8.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Mar 30 2024 Jonathan Wright - 0.8.0-15 - Rebuild to ensure backdoored XZ libs arn't present From f1c4c4aae7e3b1a8e5089cb2356931a399430ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 10:18:04 +0200 Subject: [PATCH 41/45] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- libvirt-sandbox.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 31a88b2..ba3abfb 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,9 +12,10 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: libvirt application sandbox framework -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz BuildRequires: make @@ -111,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Mon Sep 02 2024 Miroslav Suchý - 0.8.0-17 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0.8.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d52a0112cb2194241c534c82092c8626ff9b0e84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 14:56:01 +0000 Subject: [PATCH 42/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index ba3abfb..12b2c39 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: libvirt application sandbox framework # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -112,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.8.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 0.8.0-17 - convert license to SPDX From 9944d9481c021abcb221d1cb89a9df622e22e8c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:33:26 +0000 Subject: [PATCH 43/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 12b2c39..60abab5 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: libvirt application sandbox framework # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -112,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.8.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.8.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 89d82cd46b38fba09057529af542623b7a375370 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 19:45:08 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 60abab5..80baacf 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: libvirt application sandbox framework # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -112,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.8.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 0.8.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4dc02dd3e7005909b124418b3f005ce013a5886d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 06:56:05 +0000 Subject: [PATCH 45/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- libvirt-sandbox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index 80baacf..18e423a 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -12,7 +12,7 @@ Name: libvirt-sandbox Version: 0.8.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: libvirt application sandbox framework # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -112,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 0.8.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 0.8.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild