format patches

debian/patches/0002-disable-runhcs-option-in-cri-config.patch

@@ -8,7 +8,7 @@ Forwarded: not-needed
  1 file changed, 3 deletions(-)
 
 diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
-index 9ee88a6..a94315a 100644
+index 4ee0ae8..8c9fdb2 100644
 --- a/pkg/cri/server/helpers.go
 +++ b/pkg/cri/server/helpers.go
 @@ -40,7 +40,6 @@ import (
@@ -19,7 +19,7 @@ index 9ee88a6..a94315a 100644
  	imagedigest "github.com/opencontainers/go-digest"
  	"github.com/pelletier/go-toml"
  	"golang.org/x/net/context"
-@@ -366,8 +365,6 @@ func getRuntimeOptionsType(t string) interface{} {
+@@ -362,8 +361,6 @@ func getRuntimeOptionsType(t string) interface{} {
  		return &runcoptions.Options{}
  	case plugin.RuntimeLinuxV1:
  		return &runctypes.RuncOptions{}

debian/patches/0004-Disable-otelgrpc-telemetry.patch

@@ -21,7 +21,7 @@ index 8c6f1fe..dd8b1d3 100644
 -	_ "github.com/containerd/containerd/tracing/plugin"
  )
 diff --git a/services/server/server.go b/services/server/server.go
-index 857cc9c..b6ea8cf 100644
+index 28ce79a..5d21d84 100644
 --- a/services/server/server.go
 +++ b/services/server/server.go
 @@ -53,10 +53,8 @@ import (

debian/patches/0005-Revert-Use-insecure.NewCredentials-instead-of-grpc.W.patch

@@ -59,7 +59,7 @@ index b18f19f..e138ed4 100644
  		grpc.FailOnNonTempDialError(true),
  		grpc.WithConnectParams(connParams),
 diff --git a/integration/main_test.go b/integration/main_test.go
-index a62687c..fb8556e 100644
+index 40c0a67..53f1200 100644
 --- a/integration/main_test.go
 +++ b/integration/main_test.go
 @@ -47,7 +47,6 @@ import (
@@ -70,7 +70,7 @@ index a62687c..fb8556e 100644
  	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
  )
  
-@@ -507,10 +506,7 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
+@@ -546,10 +545,7 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
  	}
  	ctx, cancel := context.WithTimeout(context.Background(), timeout)
  	defer cancel()
@@ -133,7 +133,7 @@ index b172b94..d9bd813 100644
  		klog.Errorf("Connect remote runtime %s failed: %v", addr, err)
  		return nil, err
 diff --git a/services/server/server.go b/services/server/server.go
-index b6ea8cf..614591f 100644
+index 5d21d84..23442f3 100644
 --- a/services/server/server.go
 +++ b/services/server/server.go
 @@ -58,7 +58,6 @@ import (
@@ -144,7 +144,7 @@ index b6ea8cf..614591f 100644
  )
  
  const (
-@@ -540,7 +539,7 @@ func (pc *proxyClients) getClient(address string) (*grpc.ClientConn, error) {
+@@ -561,7 +560,7 @@ func (pc *proxyClients) getClient(address string) (*grpc.ClientConn, error) {
  		Backoff: backoffConfig,
  	}
  	gopts := []grpc.DialOption{

debian/patches/0008-Add-Debian-specific-CNI-bin-dir-to-ctr-run-command.patch

@@ -8,10 +8,10 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go
-index bf0ebfe..5c2b489 100644
+index 55cff7a..90e725d 100644
 --- a/cmd/ctr/commands/run/run.go
 +++ b/cmd/ctr/commands/run/run.go
-@@ -180,7 +180,7 @@ var Command = cli.Command{
+@@ -185,7 +185,7 @@ var Command = cli.Command{
  		}
  		var network gocni.CNI
  		if enableCNI {