From 2573925ecbf115f50bb14b61494a03150e85ad6d Mon Sep 17 00:00:00 2001
From: luoyaoming <luoyaoming@kylinos.cn>
Date: Wed, 24 Apr 2024 09:25:12 +0800
Subject: [PATCH] delete debian/gbp.conf

---
 debian/gbp.conf                               |  2 --
 .../patches/0009-delete-debian-gbp.conf.patch | 20 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)
 delete mode 100644 debian/gbp.conf
 create mode 100644 debian/patches/0009-delete-debian-gbp.conf.patch

diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index cec628c..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-pristine-tar = True
diff --git a/debian/patches/0009-delete-debian-gbp.conf.patch b/debian/patches/0009-delete-debian-gbp.conf.patch
new file mode 100644
index 0000000..cb3fb39
--- /dev/null
+++ b/debian/patches/0009-delete-debian-gbp.conf.patch
@@ -0,0 +1,20 @@
+From: luoyaoming <luoyaoming@kylinos.cn>
+Date: Wed, 24 Apr 2024 09:25:12 +0800
+Subject: delete debian/gbp.conf
+
+---
+ pkg/cri/server/container_execsync.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go
+index b39c46c..8bb5b8f 100644
+--- a/pkg/cri/server/container_execsync.go
++++ b/pkg/cri/server/container_execsync.go
+@@ -19,6 +19,7 @@ package server
+ import (
+ 	"bytes"
+ 	"io"
++    "errors"
+ 	"syscall"
+ 	"time"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5077d60..eb0907e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ build-with-go1.18.patch
 0006-CVE-2022-24769-20.10.14-Moby-Docker-Engine.patch
 0007-CVE-2022-24778-CheckAuthorization-ManifestList-Manif.patch
 0008-CVE-2022-31030-Apache-containerd.patch
+0009-delete-debian-gbp.conf.patch