diff --git a/libs/ell/Makefile b/libs/ell/Makefile new file mode 100644 index 0000000000..b94430e8c6 --- /dev/null +++ b/libs/ell/Makefile @@ -0,0 +1,49 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=ell +PKG_VERSION:=0.83 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/ell/ell.git +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_MIRROR_HASH:=a590b3ef07f05aa62e8cf4081a07fbb1f835eb6d77e945d7b39afdb1746f4c7a + +PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING + +PKG_INSTALL:=1 + +PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/ell + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Embedded Linux Library + URL:=https://patchwork.kernel.org/project/ell/ +endef + +define Package/ell/description + ELL (Embedded Linux Library) provides core, low-level functionality for system daemons. + It integrates with standard libc functionality and replaces some parts of it with more optimal implementations. +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ell $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libell.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ell.pc $(1)/usr/lib/pkgconfig/ +endef + +define Package/ell/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libell.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,ell)) diff --git a/net/daed/Makefile b/net/daed/Makefile index e64b8fe3ed..f50da4a3ad 100644 --- a/net/daed/Makefile +++ b/net/daed/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=daed -PKG_VERSION=0.6.0 +PKG_VERSION:=1.27.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/daeuniverse/daed.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=0063975b373c0375bf44c8d28818f861127a97917e4e5ff416b59590ce7cffde +PKG_MIRROR_HASH:=f848f70c6f1fb4fb43d6bfe14de81a5653ff6fa5e65ba0fd1f5970af97ed8739 PKG_LICENSE:=AGPL-3.0-only MIT PKG_LICENSE_FILES:=LICENSE wing/LICENSE @@ -81,7 +81,7 @@ define Download/daed-web URL:=https://github.com/daeuniverse/daed/releases/download/v$(PKG_VERSION) URL_FILE:=web.zip FILE:=$(WEB_FILE) - HASH:=f8a5f28643c990408f7b6d324b4cc8b5e7445e6255689a5f10f5545be033c1ad + HASH:=da8755fb2cabfab392854e807e385b12d9e9842d6c8b5e347284d1ae0e582bfc endef define Build/Prepare @@ -103,7 +103,7 @@ endef DAE_CFLAGS:= \ -O2 -Wall -Werror \ - -DMAX_MATCH_SET_LEN=64 \ + -DMAX_MATCH_SET_LEN=1024 \ -I$(BPF_HEADERS_DIR)/tools/lib \ -I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/asm/mach-generic @@ -117,7 +117,7 @@ define Build/Compile export \ $(GO_GENERAL_BUILD_CONFIG_VARS) \ $(GO_PKG_BUILD_CONFIG_VARS) \ - $(GO_PKG_BUILD_VARS); \ + $(GO_PKG_BUILD_VARS) ; \ go generate ./... ; \ cd dae-core ; \ export \ diff --git a/net/mptcpd/Makefile b/net/mptcpd/Makefile new file mode 100644 index 0000000000..cd2d2a36bb --- /dev/null +++ b/net/mptcpd/Makefile @@ -0,0 +1,66 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=mptcpd +PKG_VERSION:=0.14 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/multipath-tcp/mptcpd/releases/download/v$(PKG_VERSION) +PKG_HASH:=8dced65705bbce1ff0d336541b5b9bffd7f8c7731ef19ac0aaadd70a8ac54c82 + +PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=COPYING + +PKG_BUILD_DEPENDS:=USE_MUSL:argp-standalone +PKG_BUILD_PARALLEL:=1 +PKG_CHECK_FORMAT_SECURITY:=0 +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +CONFIGURE_ARGS += --with-kernel=upstream + +define Package/mptcpd/Default + SECTION:=net + CATEGORY:=Network + DEPENDS:=+ell + URL:=https://github.com/multipath-tcp/mptcpd +endef + +define Package/mptcpd + $(call Package/mptcpd/Default) + TITLE:=Multipath TCP Daemon +endef + +define Package/mptcpize + $(call Package/mptcpd/Default) + TITLE:=Multipath TCP wrapper +endef + +define Package/mptcpd/conffiles +/etc/mptcpd/mptcpd.conf +endef + +define Package/mptcpd/install + $(INSTALL_DIR) $(1)/etc/mptcpd + $(CP) $(PKG_INSTALL_DIR)/etc/mptcpd/mptcpd.conf $(1)/etc/mptcpd + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mptcpd $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib/mptcpd + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmptcpd.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mptcpd/*.so $(1)/usr/lib/mptcpd + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mptcpd.init $(1)/etc/init.d/mptcpd +endef + +define Package/mptcpize/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mptcpize $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib/mptcpize + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mptcpize/libmptcpwrap.so* $(1)/usr/lib/mptcpize +endef + +$(eval $(call BuildPackage,mptcpd)) +$(eval $(call BuildPackage,mptcpize)) diff --git a/net/mptcpd/files/mptcpd.init b/net/mptcpd/files/mptcpd.init new file mode 100644 index 0000000000..2f39989233 --- /dev/null +++ b/net/mptcpd/files/mptcpd.init @@ -0,0 +1,11 @@ +#!/bin/sh /etc/rc.common + +USE_PROCD=1 +START=10 + +start_service() { + procd_open_instance + procd_set_param command /usr/bin/mptcpd + procd_set_param respawn + procd_close_instance +} diff --git a/net/mptcpd/patches/120-no-format-security.patch b/net/mptcpd/patches/120-no-format-security.patch new file mode 100644 index 0000000000..7418f9b460 --- /dev/null +++ b/net/mptcpd/patches/120-no-format-security.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -333,7 +333,7 @@ AS_IF([test "x$enable_stack_protection" + # Format string vulnerabilities + # -Wformat=2 implies: + # -Wformat -Wformat-nonliteral -Wformat-security -Wformat-y2k +-AX_APPEND_COMPILE_FLAGS([-Wformat=2]) ++# AX_APPEND_COMPILE_FLAGS([-Wformat=2]) + + # Position Independent Execution (PIE) + AX_APPEND_COMPILE_FLAGS([-fPIE], [EXECUTABLE_CFLAGS])