update patches to fix fuse bind mounting

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/patches/lxc/0001-add-check-for-statvfs.patch b/debian/patches/lxc/0001-add-check-for-statvfs.patch
new file mode 100644 (file)
index 0000000..8900f86
--- /dev/null
+++ b/debian/patches/lxc/0001-add-check-for-statvfs.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 1 Jul 2022 11:09:15 +0200
+Subject: [PATCH lxc] add check for statvfs
+
+we use HAVE_STATVFS in the code but this was not added to
+config.h
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 43362d37a..274511037 100644
+--- a/meson.build
++++ b/meson.build
+@@ -493,6 +493,7 @@ foreach tuple: [
+     ['sigdescr_np'],
+     ['signalfd'],
+     ['statx'],
++    ['statvfs'],
+     ['strlcat'],
+     ['strlcpy'],
+     ['unshare'],
+@@ -622,6 +623,7 @@ foreach ident: [
+     ['setns',             '''#include <sched.h>'''],
+     ['sigdescr_np',       '''#include <string.h>'''],
+     ['signalfd',          '''#include <sys/signalfd.h>'''],
++    ['statvfs',           '''#include <sys/statvfs.h>'''],
+     ['statx',             '''#include <sys/types.h>
+                              #include <sys/stat.h>
+                              #include <unistd.h>'''],

diff --git a/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch b/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
index 694a656373e8de316992502fc09c469ea55537e8..09e74ffe60e828cd383f084959c23d5a989e185a 100644 (file)
--- a/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
+++ b/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Fri, 10 Feb 2017 09:13:40 +0100
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Fri, 10 Feb 2017 09:13:40 +0100

-Subject: [PATCH] PVE: [Config] lxc.service: start after a potential
+Subject: [PATCH lxc] PVE: [Config] lxc.service: start after a potential

  syslog.service
 
 We could add this as a snippet from pve-container instead.
  syslog.service
 
 We could add this as a snippet from pve-container instead.

diff --git a/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch b/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
index ea82472fdc7528ce5276d6df3a6654be539151d5..cdcfaad52c19e49d03f52073a3a4af93618850c1 100644 (file)
--- a/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
+++ b/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 9 Nov 2016 09:14:26 +0100
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 9 Nov 2016 09:14:26 +0100

-Subject: [PATCH] PVE: [Config] deny rw mounting of /sys and /proc
+Subject: [PATCH lxc] PVE: [Config] deny rw mounting of /sys and /proc

 
 Note that we don't actually make use of this anymore, since
 we switched to the generated profiles which already do this.
 
 Note that we don't actually make use of this anymore, since
 we switched to the generated profiles which already do this.

diff --git a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
index 5a4f51c043119b2353fa8e862c40b7a41013cb69..b328b9f0ca276f5744bf45bc89f230a47cfb38d1 100644 (file)
--- a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
+++ b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Tue, 13 Aug 2019 13:57:22 +0200
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Tue, 13 Aug 2019 13:57:22 +0200

-Subject: [PATCH] PVE: [Config] attach: always use getent
+Subject: [PATCH lxc] PVE: [Config] attach: always use getent

 
 In debian buster, some libnss plugins (if installed) can
 cause getpwent to segfault instead of erroring out cleanly.
 
 In debian buster, some libnss plugins (if installed) can
 cause getpwent to segfault instead of erroring out cleanly.

diff --git a/debian/patches/series b/debian/patches/series
index ee20ef577770d723a2aaeff38ccc997e4dfb35ee..16a3cb37c2d17a04c71885a5b85a6263be4e0784 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+lxc/0001-add-check-for-statvfs.patch

 pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
 pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
 pve/0003-PVE-Config-attach-always-use-getent.patch
 pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch
 pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
 pve/0003-PVE-Config-attach-always-use-getent.patch