From 8640ab9018f0fca1263158eafbbd994a97f2cb90 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sat, 19 Oct 2019 05:22:12 -0700
Subject: [PATCH] runc: fix version

---
 utils/runc/Makefile | 90 +++++++++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 24 deletions(-)

diff --git a/utils/runc/Makefile b/utils/runc/Makefile
index a3a6ab3e..81018e73 100644
--- a/utils/runc/Makefile
+++ b/utils/runc/Makefile
@@ -1,49 +1,91 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libnetwork
-PKG_RELEASE:=2
+PKG_NAME:=runc
+PKG_VERSION:=1.0.0-rc8+91-3e425f80
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-GO_PKG:=github.com/docker/libnetwork
-GO_PKG_BUILD_PKG:= \
-  $(GO_PKG)/cmd/proxy \
-  $(GO_PKG)/cmd/dnet
-
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/opencontainers/runc
+PKG_MIRROR_HASH:=361658b3c61b9c727091aa10ba693f234a64aae592bb683005244a22e2778cfc
+PKG_HASH:=efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700
+PKG_SOURCE_VERSION:=3e425f80a8c931f88e6d94a8c831b9d5aa481657
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://$(GO_PKG)
-PKG_SOURCE_VERSION:=45c710223c5fbf04dc3028b9a90b51892e36ca7f
 PKG_SOURCE_DATE:=2019-10-15
-PKG_MIRROR_HASH:=776d0f6e870ce4432cc09ba75f3b075ef29cd797dcf9d631d726df4a2b7cbf28
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/opencontainers/runc
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
 
-define Package/libnetwork
+define Package/runc/config
+config RUNC_SECCOMP
+	depends on PACKAGE_runc
+	bool "Enable support for seccomp in runc"
+	default DOCKER_SECCOMP
+	select KERNEL_SECCOMP
+	select PACKAGE_libseccomp
+	help
+	  Build runc with support for seccomp filters.
+	  Select libseccomp which also pulls-in the needed kernel features.
+endef
+
+define Package/runc
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=networking for containers
-  URL:=https://github.com/docker/libnetwork
-  DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm
+  TITLE:=runc container runtime
+  URL:=https://www.opencontainers.org/
+  DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm +RUNC_SECCOMP:libseccomp
+  MENU:=1
 endef
 
-define Package/libnetwork/description
-Libnetwork provides a native Go implementation for connecting containers.
-The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.
+define Package/runc/description
+runc is a CLI tool for spawning and running containers according to the OCI specification.
 endef
 
-define Package/libnetwork/install
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+GO_PKG_INSTALL_ALL:=1
+MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
+MAKE_VARS += \
+	GOPATH=$(GO_PKG_BUILD_DIR) \
+	GOCACHE=$(GO_PKG_CACHE_DIR) \
+	GOTMPDIR=$(GO_PKG_TMP_DIR) \
+	GOROOT_FINAL=$(GO_TARGET_ROOT) \
+	CC=$(TARGET_CC) \
+	CXX=$(TARGET_CXX) \
+	$(call GoPackage/Environment)
+MAKE_FLAGS += \
+	COMMIT=$(PKG_SOURCE_VERSION)
 
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnet $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/proxy $(1)/usr/bin/docker-proxy
+ifeq ($(ARCH),mips)
+MAKE_FLAGS += EXTRA_FLAGS='-buildmode=default'
+endif
+
+ifeq ($(CONFIG_RUNC_SECCOMP),y)
+MAKE_FLAGS += BUILDTAGS='seccomp'
+else
+MAKE_FLAGS += BUILDTAGS=''
+endif
+
+define Build/Compile
+	$(call Build/Compile/Default)
 endef
 
-$(eval $(call GoBinPackage,libnetwork))
-$(eval $(call BuildPackage,libnetwork))
+# Avoid installing binaries
+define Build/InstallDev
+	$(call Build/Compile/Default,clean)
+	$(call GoPackage/Build/InstallDev,$(1))
+endef
+
+define Package/runc/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(GO_PKG_BUILD_DIR)/src/$(GO_PKG)/runc $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,runc))
\ No newline at end of file