bump version to 4.0.2-1

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

diff --git a/debian/changelog b/debian/changelog
index bf3dedc74bf9bf62d41ff06f717a088ed2ace71f..5a294f074a72d086a33138e460330cd12ae4e032 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxc-pve (4.0.2-1) pve; urgency=medium
+
+  * update teo lxc-4.0.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 20 Apr 2020 11:48:54 +0200
+

 lxc-pve (4.0.0-2) pve; urgency=medium
 
   * update to include devices cgroup fixes for cgroup isolation
 lxc-pve (4.0.0-2) pve; urgency=medium
 
   * update to include devices cgroup fixes for cgroup isolation

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 2ac87549679070ed6830de7591bb16f8d25bfebc..a5b9779a9e629da6cfdfecb4893f8215fe70b628 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 04922f2a329f7a8144efd38ac95aaf8c57c3f2fc Mon Sep 17 00:00:00 2001
+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: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Fri, 10 Feb 2017 09:13:40 +0100

-Subject: [PATCH lxc 1/3] 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.


@@ -23,6 +23,3 @@ index e3745dc2d..fbe46f1d7 100644
  Wants=lxc-net.service
  Documentation=man:lxc-autostart man:lxc
  
  Wants=lxc-net.service
  Documentation=man:lxc-autostart man:lxc
  

--- 
-2.20.1
-

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 d6181207f863efc111e8327245e27582758dc7eb..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 b27de3448f4e1254f8a91c9241877e8bb768b752 Mon Sep 17 00:00:00 2001
+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: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 9 Nov 2016 09:14:26 +0100

-Subject: [PATCH lxc 2/3] 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.


@@ -64,6 +64,3 @@ index 2606fb64c..3e61c62ea 100644
    # allow paths to be made slave, shared, private or unbindable
    # FIXME: This currently doesn't work due to the apparmor parser treating those as allowing all mounts.
  #  mount options=(rw,make-slave) -> **,
    # allow paths to be made slave, shared, private or unbindable
    # FIXME: This currently doesn't work due to the apparmor parser treating those as allowing all mounts.
  #  mount options=(rw,make-slave) -> **,

--- 
-2.20.1
-

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 4c7c83f1ac8236cf4cbd088d554b4e4fcf280fdf..ce8960efc4733bbfe5754987192a070f0f8d2a11 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 580f2f5423b975f2d6a19004139788758a34359f Mon Sep 17 00:00:00 2001
+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: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Tue, 13 Aug 2019 13:57:22 +0200

-Subject: [PATCH lxc 3/3] 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.


@@ -13,10 +13,10 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
  1 file changed, 2 insertions(+), 26 deletions(-)
 
 diff --git a/src/lxc/attach.c b/src/lxc/attach.c
  1 file changed, 2 insertions(+), 26 deletions(-)
 
 diff --git a/src/lxc/attach.c b/src/lxc/attach.c

-index 406b8ec74..0a82c0a5d 100644
+index bbf95bd5b..de3a98cf9 100644

 --- a/src/lxc/attach.c
 +++ b/src/lxc/attach.c
 --- a/src/lxc/attach.c
 +++ b/src/lxc/attach.c

-@@ -1454,12 +1454,8 @@ int lxc_attach_run_command(void *payload)
+@@ -1456,12 +1456,8 @@ int lxc_attach_run_command(void *payload)

  
  int lxc_attach_run_shell(void* payload)
  {
  
  int lxc_attach_run_shell(void* payload)
  {


@@ -29,7 +29,7 @@ index 406b8ec74..0a82c0a5d 100644
        int ret;
  
        /* Ignore payload parameter. */
        int ret;
  
        /* Ignore payload parameter. */

-@@ -1467,32 +1463,13 @@ int lxc_attach_run_shell(void* payload)
+@@ -1469,32 +1465,13 @@ int lxc_attach_run_shell(void* payload)

  
        uid = getuid();
  
  
        uid = getuid();
  


@@ -63,7 +63,7 @@ index 406b8ec74..0a82c0a5d 100644
        if (user_shell)
                execlp(user_shell, user_shell, (char *)NULL);
  
        if (user_shell)
                execlp(user_shell, user_shell, (char *)NULL);
  

-@@ -1502,8 +1479,7 @@ int lxc_attach_run_shell(void* payload)
+@@ -1504,8 +1481,7 @@ int lxc_attach_run_shell(void* payload)

        execlp("/bin/sh", "/bin/sh", (char *)NULL);
  
        SYSERROR("Failed to execute shell");
        execlp("/bin/sh", "/bin/sh", (char *)NULL);
  
        SYSERROR("Failed to execute shell");


@@ -73,6 +73,3 @@ index 406b8ec74..0a82c0a5d 100644
  
        return -1;
  }
  
        return -1;
  }

--- 
-2.20.1
-

diff --git a/lxc b/lxc
index 51c8368a374726485b7a99b7e4dff05f60b1872c..538337ee9dc5ca385cc8d9b6faaac1575c014a1b 160000 (submodule)
--- a/lxc
+++ b/lxc
@@ -1 +1 @@
-Subproject commit 51c8368a374726485b7a99b7e4dff05f60b1872c
+Subproject commit 538337ee9dc5ca385cc8d9b6faaac1575c014a1b