From af2e580970cdd80faaba38b45a8f1b04bdcc78fe Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Tue, 22 Nov 2022 19:07:28 +0000
Subject: [PATCH] Drop socat from config

We have been stripping this out on the K3s side for a while, no point in building it.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 buildroot/config |  2 +-
 scripts/package  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildroot/config b/buildroot/config
index 6c6df85..bc0019a 100644
--- a/buildroot/config
+++ b/buildroot/config
@@ -3791,7 +3791,7 @@ BR2_PACKAGE_IPTABLES_NFTABLES=y
 #
 # snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9
 #
-BR2_PACKAGE_SOCAT=y
+# BR2_PACKAGE_SOCAT is not set
 # BR2_PACKAGE_SOCKETCAND is not set
 # BR2_PACKAGE_SOFTETHER is not set
 # BR2_PACKAGE_SPAWN_FCGI is not set
diff --git a/scripts/package b/scripts/package
index a5470d5..668195b 100755
--- a/scripts/package
+++ b/scripts/package
@@ -9,12 +9,12 @@ mkdir -p \
 pushd /usr/src
 
 # copy binaries
-cp -d buildroot/output/target/usr/sbin/*tables*                         "/source/artifacts/${BUILDARCH}/bin/"
-cp buildroot/output/target/usr/sbin/{conntrack,ethtool,ipset}           "/source/artifacts/${BUILDARCH}/bin/"
-cp buildroot/output/target/usr/bin/{find,nsenter,pigz,socat,coreutils}  "/source/artifacts/${BUILDARCH}/bin/"
-cp buildroot/output/target/usr/bin/{slirp4netns,fuse-overlayfs}         "/source/artifacts/${BUILDARCH}/bin/"
-cp buildroot/output/target/sbin/{blkid,ip,losetup}                      "/source/artifacts/${BUILDARCH}/bin/"
-cp buildroot/output/target/bin/busybox                                  "/source/artifacts/${BUILDARCH}/bin/"
+cp -d buildroot/output/target/usr/sbin/*tables*                  "/source/artifacts/${BUILDARCH}/bin/"
+cp buildroot/output/target/usr/sbin/{conntrack,ethtool,ipset}    "/source/artifacts/${BUILDARCH}/bin/"
+cp buildroot/output/target/usr/bin/{find,nsenter,pigz,coreutils} "/source/artifacts/${BUILDARCH}/bin/"
+cp buildroot/output/target/usr/bin/{slirp4netns,fuse-overlayfs}  "/source/artifacts/${BUILDARCH}/bin/"
+cp buildroot/output/target/sbin/{blkid,ip,losetup}               "/source/artifacts/${BUILDARCH}/bin/"
+cp buildroot/output/target/bin/busybox                           "/source/artifacts/${BUILDARCH}/bin/"
 
 cp -r /source/iptables-detect/*.sh "/source/artifacts/${BUILDARCH}/xtables-bin/"