From 48d490fe5407bcdadcfdea10734a2a70e448346f Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 23 Mar 2020 10:16:35 +0100 Subject: [PATCH] patches: move upstream cherry picked to extra folder, like we did in the past Signed-off-by: Thomas Lamprecht --- .../0001-util-add-slirp_fmt-helpers.patch | 0 .../0002-tcp_emu-fix-unsafe-snprintf-usages.patch | 0 .../0003-ip_reass-Fix-use-after-free.patch | 0 debian/patches/series | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename debian/patches/{security => extra}/0001-util-add-slirp_fmt-helpers.patch (100%) rename debian/patches/{security => extra}/0002-tcp_emu-fix-unsafe-snprintf-usages.patch (100%) rename debian/patches/{security => extra}/0003-ip_reass-Fix-use-after-free.patch (100%) diff --git a/debian/patches/security/0001-util-add-slirp_fmt-helpers.patch b/debian/patches/extra/0001-util-add-slirp_fmt-helpers.patch similarity index 100% rename from debian/patches/security/0001-util-add-slirp_fmt-helpers.patch rename to debian/patches/extra/0001-util-add-slirp_fmt-helpers.patch diff --git a/debian/patches/security/0002-tcp_emu-fix-unsafe-snprintf-usages.patch b/debian/patches/extra/0002-tcp_emu-fix-unsafe-snprintf-usages.patch similarity index 100% rename from debian/patches/security/0002-tcp_emu-fix-unsafe-snprintf-usages.patch rename to debian/patches/extra/0002-tcp_emu-fix-unsafe-snprintf-usages.patch diff --git a/debian/patches/security/0003-ip_reass-Fix-use-after-free.patch b/debian/patches/extra/0003-ip_reass-Fix-use-after-free.patch similarity index 100% rename from debian/patches/security/0003-ip_reass-Fix-use-after-free.patch rename to debian/patches/extra/0003-ip_reass-Fix-use-after-free.patch diff --git a/debian/patches/series b/debian/patches/series index 908213c..1e82ac4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,6 @@ +extra/0001-util-add-slirp_fmt-helpers.patch +extra/0002-tcp_emu-fix-unsafe-snprintf-usages.patch +extra/0003-ip_reass-Fix-use-after-free.patch pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch @@ -36,6 +39,3 @@ pve/0036-mirror-add-check-for-bitmap-mode-without-bitmap.patch pve/0037-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch pve/0038-iotests-add-test-for-bitmap-mirror.patch pve/0039-mirror-move-some-checks-to-qmp.patch -security/0001-util-add-slirp_fmt-helpers.patch -security/0002-tcp_emu-fix-unsafe-snprintf-usages.patch -security/0003-ip_reass-Fix-use-after-free.patch