diff --git a/feeds/ucentral/poco/Makefile b/feeds/ucentral/poco/Makefile deleted file mode 100644 index 97a7831a7..000000000 --- a/feeds/ucentral/poco/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# -# Copyright (C) 2007-2016 OpenWrt.org -# Copyright (C) 2017 Daniel Engberg -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=poco -PKG_RELEASE:=2 -PKG_VERSION:=1.10.1 - -ifeq ($(BUILD_VARIANT),all) -_PKG_VERSION:=${PKG_VERSION}-all -PKG_HASH:=2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758 -else -_PKG_VERSION:=${PKG_VERSION} -PKG_HASH:=a0a5a03d87c585f1a43def33bfc52c0c34a528e43a7b13bc83841a7c00adde39 -endif - -PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) - -PKG_LICENSE:=BSL-1.0 -PKG_LICENSE_FILES:=LICENSE -PKG_CPE_ID:=cpe:/a:pocoproject:poco - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/poco - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Poco C++ libraries - URL:=https://www.pocoproject.org/ - DEPENDS:=+libstdcpp +libpthread +librt @!arc - MAINTAINER:=Jean-Michel Julien - VARIANT:=minimal -endef - -define Package/poco/description - POrtable COmponents, a modern and powerful open source C++ class libraries - and frameworks for building network and internet-based applications that - run on desktop, server and embedded systems. -endef - -define Package/poco-all - $(call Package/poco) - SECTION:=libs - CATEGORY:=Libraries - TITLE+=(Complete Edition) - DEPENDS+=+libopenssl - VARIANT:=all -endef - -define Package/poco-all/description - POrtable COmponents, a modern and powerful open source C++ class libraries - and frameworks for building network and internet-based applications that - run on desktop, server and embedded systems. The Complete Edition contains - all libraries. -endef - -CONFIGURE_ARGS += \ - --config=Linux \ - --no-tests \ - --no-samples \ - --no-fpenvironment \ - --no-sharedmemory \ - --no-wstring \ - --shared - -ifeq ($(BUILD_VARIANT),all) - CONFIGURE_ARGS += \ - --typical - POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings,Util,Data,DataSQLite,JWT} -else - CONFIGURE_ARGS += \ - --poquito \ - --minimal - POCO_LIBS={Foundation,XML,JSON,Net,Util} -endif - -define Package/poco/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ -endef - -define Package/poco-all/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake $(1)/usr/lib/ -endef - - -$(eval $(call BuildPackage,poco)) -$(eval $(call BuildPackage,poco-all)) diff --git a/feeds/ucentral/poco/patches/100-configure.patch b/feeds/ucentral/poco/patches/100-configure.patch deleted file mode 100644 index 01ceb6767..000000000 --- a/feeds/ucentral/poco/patches/100-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure -+++ b/configure -@@ -237,9 +237,9 @@ while [ $# -ge 1 ]; do - ;; - - *) -- showhelp -- exit 1 -- ;; -+# showhelp -+# exit 1 -+# ;; - esac - - shift diff --git a/feeds/ucentral/poco/patches/200-strerror.patch b/feeds/ucentral/poco/patches/200-strerror.patch deleted file mode 100644 index 0ff0ce5ed..000000000 --- a/feeds/ucentral/poco/patches/200-strerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Foundation/src/Error.cpp -+++ b/Foundation/src/Error.cpp -@@ -70,7 +70,7 @@ namespace Poco { - - #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); --#elif _GNU_SOURCE -+#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__)) - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); - #else - setMessage(strerror(err)); diff --git a/feeds/ucentral/poco/patches/300-fp-support-environments-without-hardware-floating-po.patch b/feeds/ucentral/poco/patches/300-fp-support-environments-without-hardware-floating-po.patch deleted file mode 100644 index b5daf3c18..000000000 --- a/feeds/ucentral/poco/patches/300-fp-support-environments-without-hardware-floating-po.patch +++ /dev/null @@ -1,122 +0,0 @@ -From: =?utf-8?q?Andr=C3=A9_Draszik?= -Date: Wed, 22 Mar 2017 11:07:16 +0000 -Subject: fp: support environments without hardware floating point - -| cd /Foundation && \ -| mipsel-poky-linux-musl-g++ -DFoundation_EXPORTS -DHAVE_PTHREAD_SETAFFINITY_NP -DHAVE_THREE_PARAM_SCHED_SETAFFINITY \ -| -DPCRE_STATIC -DPOCO_HAVE_FD_EPOLL -DPOCO_NO_AUTOMATIC_LIBS -DPOCO_OS_FAMILY_UNIX -DPOCO_UNBUNDLED \ -| -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_XOPEN_SOURCE=500 \ -| -I/usr/include -I/Foundation/include -I/Foundation/src \ -| -mel -mabi=32 -msoft-float -march=mips32r2 -mno-mips16 -minterlink-compressed -mtune=24kec -mdsp \ -| --sysroot= -O2 -pipe -g -feliminate-unused-debug-types \ -| -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security \ -| -fvisibility-inlines-hidden -mel -mabi=32 -msoft-float -march=mips32r2 -mno-mips16 -minterlink-compressed \ -| -mtune=24kec -mdsp --sysroot= -O2 -g -DNDEBUG -fPIC \ -| -o CMakeFiles/Foundation.dir/src/ArchiveStrategy.cpp.o \ -| -c /Foundation/src/ArchiveStrategy.cpp -| In file included from /Foundation/include/Poco/FPEnvironment.h:33:0, -| from /Foundation/include/Poco/NumericString.h:25, -| from /Foundation/include/Poco/NumberFormatter.h:24, -| from /Foundation/include/Poco/ArchiveStrategy.h:27, -| from /Foundation/src/ArchiveStrategy.cpp:17: -| /Foundation/include/Poco/FPEnvironment_C99.h:36:30: error: 'FE_DOWNWARD' was not declared in this scope -| FP_ROUND_DOWNWARD_IMPL = FE_DOWNWARD, -| ^~~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:37:30: error: 'FE_UPWARD' was not declared in this scope -| FP_ROUND_UPWARD_IMPL = FE_UPWARD, -| ^~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:39:30: error: 'FE_TOWARDZERO' was not declared in this scope -| FP_ROUND_TOWARDZERO_IMPL = FE_TOWARDZERO -| ^~~~~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:43:28: error: 'FE_DIVBYZERO' was not declared in this scope -| FP_DIVIDE_BY_ZERO_IMPL = FE_DIVBYZERO, -| ^~~~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:44:28: error: 'FE_INEXACT' was not declared in this scope -| FP_INEXACT_IMPL = FE_INEXACT, -| ^~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:45:28: error: 'FE_OVERFLOW' was not declared in this scope -| FP_OVERFLOW_IMPL = FE_OVERFLOW, -| ^~~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:46:28: error: 'FE_UNDERFLOW' was not declared in this scope -| FP_UNDERFLOW_IMPL = FE_UNDERFLOW, -| ^~~~~~~~~~~~ -| /Foundation/include/Poco/FPEnvironment_C99.h:47:28: error: 'FE_INVALID' was not declared in this scope -| FP_INVALID_IMPL = FE_INVALID -| ^~~~~~~~~~ - -The reason is that some (notably FPU-less) architectures, -including mips*-nf, don't define/implement some of the -floating point constants, even though fenv.h is -available. - -The key point is: - A fully standards conforming fenv.h does not have to - define any FE_* macros, and if it does define them, - then it defines macros only for the FP exceptions it - actually supports. - -See similar issue in boost: - https://svn.boost.org/trac/boost/ticket/11756 ---- - Foundation/include/Poco/FPEnvironment_C99.h | 36 +++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/Foundation/include/Poco/FPEnvironment_C99.h b/Foundation/include/Poco/FPEnvironment_C99.h -index 0b192f5..402e6af 100644 ---- a/Foundation/include/Poco/FPEnvironment_C99.h -+++ b/Foundation/include/Poco/FPEnvironment_C99.h -@@ -31,18 +31,54 @@ class FPEnvironmentImpl - protected: - enum RoundingModeImpl - { -+#if defined(FE_DOWNWARD) - FP_ROUND_DOWNWARD_IMPL = FE_DOWNWARD, -+#else -+ FP_ROUND_DOWNWARD_IMPL = 0, -+#endif -+#if defined(FE_UPWARD) - FP_ROUND_UPWARD_IMPL = FE_UPWARD, -+#else -+ FP_ROUND_UPWARD_IMPL = 0, -+#endif -+#if defined(FE_TONEAREST) - FP_ROUND_TONEAREST_IMPL = FE_TONEAREST, -+#else -+ FP_ROUND_TONEAREST_IMPL = 0, -+#endif -+#if defined(FE_TOWARDZERO) - FP_ROUND_TOWARDZERO_IMPL = FE_TOWARDZERO -+#else -+ FP_ROUND_TOWARDZERO_IMPL = 0 -+#endif - }; - enum FlagImpl - { -+#if defined(FE_DIVBYZERO) - FP_DIVIDE_BY_ZERO_IMPL = FE_DIVBYZERO, -+#else -+ FP_DIVIDE_BY_ZERO_IMPL = 0, -+#endif -+#if defined(FE_INEXACT) - FP_INEXACT_IMPL = FE_INEXACT, -+#else -+ FP_INEXACT_IMPL = 0, -+#endif -+#if defined(FE_OVERFLOW) - FP_OVERFLOW_IMPL = FE_OVERFLOW, -+#else -+ FP_OVERFLOW_IMPL = 0, -+#endif -+#if defined(FE_UNDERFLOW) - FP_UNDERFLOW_IMPL = FE_UNDERFLOW, -+#else -+ FP_UNDERFLOW_IMPL = 0, -+#endif -+#if defined(FE_INVALID) - FP_INVALID_IMPL = FE_INVALID -+#else -+ FP_INVALID_IMPL = 0 -+#endif - }; - FPEnvironmentImpl(); - FPEnvironmentImpl(const FPEnvironmentImpl& env); diff --git a/feeds/ucentral/ucentralgw/Makefile b/feeds/ucentral/ucentralgw/Makefile deleted file mode 100644 index 6d1ffda56..000000000 --- a/feeds/ucentral/ucentralgw/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=ucentralgw -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=git@github.com:Telecominfraproject/wlan-cloud-ucentralgw.git -PKG_SOURCE_DATE:=2021-03-28 -PKG_SOURCE_VERSION:=555b5fefc6337f6bc7eab9988b2d05fdc76b2381 -CMAKE_INSTALL:=1 - -PKG_LICENSE:=BSD-3-Clause -PKG_MAINTAINER:=John Crispin -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -CMAKE_SHARED_LDFLAGS="" - -define Package/ucentralgw - SECTION:=ucentral - CATEGORY:=uCentral - DEPENDS:=+libstdcpp +poco-all +boost +boost-system +libyaml-cpp +zlib - TITLE:= uCentral Gateway -endef - -define Package/mdadm/conffiles -/etc/ucentral/ -endef - -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -CMAKE_OPTIONS += \ - -DSMALL_BUILD=1 - -ifeq ($(ARCH),aarch64) - CMAKE_OPTIONS+=-DCMAKE_SYSTEM_PROCESSOR=aarch64 -endif - -define Package/lldpd/conffiles -/etc/ucentral/ -endef - -define Package/ucentralgw/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/libexec/ucentral/ - - $(CP) ./files/* $(1) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucentralgw $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/cert_scripts/* $(1)/usr/libexec/ucentral/ -endef - -$(eval $(call BuildPackage,ucentralgw)) diff --git a/feeds/ucentral/ucentralgw/files/etc/init.d/ucentralgw b/feeds/ucentral/ucentralgw/files/etc/init.d/ucentralgw deleted file mode 100755 index 9b93d29e2..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/init.d/ucentralgw +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=80 - -USE_PROCD=1 -PROG=/usr/bin/ucentralgw - -start_service() { - procd_open_instance - procd_set_param command "$PROG" - procd_append_param command --file /etc/ucentral/ucentral.properties - procd_set_param respawn 3600 5 0 - procd_add_mdns "ucentral" "tcp" "15002" "daemon=ucentralgw" - procd_close_instance -} diff --git a/feeds/ucentral/ucentralgw/files/etc/ucentral/ucentral.properties b/feeds/ucentral/ucentralgw/files/etc/ucentral/ucentral.properties deleted file mode 100644 index 8a8d78dbd..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/ucentral/ucentral.properties +++ /dev/null @@ -1,153 +0,0 @@ -# -# uCentral protocol server for devices. This is where you point -# all your devices. You can replace the * for address by the specific -# address of one of your interfaces -# -ucentral.websocket.host.0.backlog = 500 -ucentral.websocket.host.0.rootca = /etc/ucentral/certs/root.pem -ucentral.websocket.host.0.issuer = /etc/ucentral/certs/issuer.pem -ucentral.websocket.host.0.cert = /etc/ucentral/certs/websocket-cert.pem -ucentral.websocket.host.0.key = /etc/ucentral/certs/websocket-key.pem -ucentral.websocket.host.0.clientcas = /etc/ucentral/certs/clientcas.pem -ucentral.websocket.host.0.cas = /etc/ucentral/certs/cas -ucentral.websocket.host.0.address = * -ucentral.websocket.host.0.port = 15002 -ucentral.websocket.host.0.security = relaxed -ucentral.websocket.host.0.key.password = mypassword -ucentral.websocket.maxreactors = 20 - -# -# REST API access -# -ucentral.restapi.host.0.backlog = 100 -ucentral.restapi.host.0.security = relaxed -ucentral.restapi.host.0.rootca = /etc/ucentral/certs/restapi-ca.pem -ucentral.restapi.host.0.address = * -ucentral.restapi.host.0.port = 16001 -ucentral.restapi.host.0.cert = /etc/ucentral/certs/restapi-cert.pem -ucentral.restapi.host.0.key = /etc/ucentral/certs/restapi-key.pem -ucentral.restapi.host.0.key.password = mypassword - -# -# Used to upload files to the service. -# You should replace the 'name' vaalue with the IP address of your gateway or an FQDN -# that your devices can reach -# -ucentral.fileuploader.host.0.backlog = 100 -ucentral.fileuploader.host.0.rootca = /etc/ucentral/certs/restapi-ca.pem -ucentral.fileuploader.host.0.security = relaxed -ucentral.fileuploader.host.0.address = * -ucentral.fileuploader.host.0.name = 192.168.1.176 -ucentral.fileuploader.host.0.port = 16003 -ucentral.fileuploader.host.0.cert = /etc/ucentral/certs/restapi-cert.pem -ucentral.fileuploader.host.0.key = /etc/ucentral/certs/restapi-key.pem -ucentral.fileuploader.host.0.key.password = mypassword -ucentral.fileuploader.path = /etc/ucentral/uploads -ucentral.fileuploader.maxsize = 10000 - -# -# This section descrive how to do autoprovisioning -# When enabled, it will allow devices that are not in the system -# to be managed and serviced -# -ucentral.autoprovisioning = true -ucentral.autoprovisioning.type.0 = AP:ea8300,edge -ucentral.autoprovisioning.type.1 = IOT:ea8301,edge2 -ucentral.autoprovisioning.type.2 = AP:ea8302,edge6 -ucentral.service.key = /etc/ucentral/certs/websocket-key.pem - -# -# Kafka -# -ucentral.kafka.enable = false -ucentral.kafka.brokerlist = 127.0.0.1:9092 - -# -# This section select which form of persistence you need -# Only one selected at a time. If you select multiple, this service will die if a horrible -# death and might make your beer flat. -# -storage.type = sqlite -#storage.type = postgresql -#storage.type = mysql -#storage.type = odbc - -storage.type.sqlite.db = /etc/ucentral/devices.db -storage.type.sqlite.idletime = 120 -storage.type.sqlite.maxsessions = 128 - -storage.type.postgresql.maxsessions = 64 -storage.type.postgresql.idletime = 60 -storage.type.postgresql.host = localhost -storage.type.postgresql.username = stephb -storage.type.postgresql.password = snoopy99 -storage.type.postgresql.database = ucentral -storage.type.postgresql.port = 5432 -storage.type.postgresql.connectiontimeout = 60 - -storage.type.mysql.maxsessions = 64 -storage.type.mysql.idletime = 60 -storage.type.mysql.host = localhost -storage.type.mysql.username = stephb -storage.type.mysql.password = snoopy99 -storage.type.mysql.database = ucentral -storage.type.mysql.port = 3306 -storage.type.mysql.connectiontimeout = 60 - -# -# Authentication -# -authentication.enabled = true -authentication.default.username = support@example.com -authentication.default.password = support -authentication.default.access = master -authentication.service.type = internal - -ucentral.system.debug = true -ucentral.system.id = 1 -ucentral.system.commandchannel = /tmp/app.ucentralgw -ucentral.system.host.0.path = https://host2.com:9010 -ucentral.system.host.0.id = 2 -ucentral.system.host.1.path = https://host3.com:9010 -ucentral.system.host.1.id = 3 -ucentral.system.host.2.path = https://host4.com:9010 -ucentral.system.host.2.id = 4 - -######################################################################## -######################################################################## -# -# Thw following sections apply to the uCentral service -# -# Logging: please leave as is for now. -# -######################################################################## -######################################################################## - -logging.formatters.f1.class = PatternFormatter -logging.formatters.f1.pattern = %s: [%p] %t -logging.formatters.f1.times = UTC -logging.channels.c1.class = ConsoleChannel -logging.channels.c1.formatter = f1 -logging.channels.c2.class = FileChannel -# This is where the logs will be written. This path MUST exist -logging.channels.c2.path = /tmp/ucentral.log -logging.channels.c2.formatter.class = PatternFormatter -logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t -logging.channels.c3.class = ConsoleChannel -logging.channels.c3.pattern = %s: [%p] %t -# External Channel -logging.loggers.root.channel = c2 -logging.loggers.root.level = information -# Inline Channel with PatternFormatter -# logging.loggers.l1.name = logger1 -# logging.loggers.l1.channel.class = ConsoleChannel -# logging.loggers.l1.channel.pattern = %s: [%p] %t -# logging.loggers.l1.level = information -# SplitterChannel -# logging.channels.splitter.class = SplitterChannel -# logging.channels.splitter.channels = l1,l2 -# logging.loggers.l2.name = logger2 -# logging.loggers.l2.channel = splitter - - - diff --git a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-certs b/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-certs deleted file mode 100755 index d6ed3dae6..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-certs +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -[ -f /etc/ucentral/certs/server-key.pem ] && exit 0 -/usr/libexec/ucentral/create_certificates.sh - -exit 0 diff --git a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-firewall b/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-firewall deleted file mode 100755 index b742a0d59..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-firewall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -uci set firewall.wan.input=ACCEPT -uci commit firewall - -exit 0 diff --git a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-hostname b/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-hostname deleted file mode 100755 index 695a5786c..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-hostname +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -hname=$(cat /sys/class/net/eth0/address | tr -d : | awk '{print tolower($0)}') -uci set system.@system[-1].hostname="ucentral-$hname" diff --git a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-mdns b/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-mdns deleted file mode 100755 index 45d4b83f9..000000000 --- a/feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-mdns +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -uci add_list umdns.@umdns[-1].network=foo -uci commit umdns - -exit 0 diff --git a/feeds/ucentral/ucentralgw/patches/100-bash.patch b/feeds/ucentral/ucentralgw/patches/100-bash.patch deleted file mode 100644 index 487ecd447..000000000 --- a/feeds/ucentral/ucentralgw/patches/100-bash.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/clean.sh -=================================================================== ---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/clean.sh -+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/clean.sh -@@ -1,3 +1,3 @@ --#!/bin/bash -+#!/bin/sh - - rm *.pem *.csr -Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/create_certificates.sh -=================================================================== ---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/create_certificates.sh -+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/create_certificates.sh -@@ -1,15 +1,27 @@ --#!/bin/bash -+#!/bin/sh - --hn=$(hostname) -+mkdir -p /etc/ucentral/certs/cas -+ -+hn=$(cat /proc/sys/kernel/hostname) - howmany=10 --cert_life=365 --subject="/C=CA/ST=British Columbia/L=Vancouver/O=Arilia Wireless/OU=Engineering/CN=$hn/emailAddress=support@example.com" -+cert_life=1825 -+subject="/C=uC/ST=uCentral/L=uCentral/O=uCentral/OU=uCentral/CN=$hn/emailAddress=support@example.com" -+ -+openssl genrsa -out /etc/ucentral/certs/server-key.pem 2048 -+openssl req -new -key /etc/ucentral/certs/server-key.pem -subj "$subject" -out /etc/ucentral/certs/server.csr -+openssl x509 -req -days $cert_life -in /etc/ucentral/certs/server.csr -signkey /etc/ucentral/certs/server-key.pem -out /etc/ucentral/certs/server-cert.pem -+ -+for a in clientcas.pem issuer.pem restapi-ca.pem restapi-cert.pem root.pem websocket-cert.pem; do -+ cp /etc/ucentral/certs/server-cert.pem /etc/ucentral/certs/$a -+done -+ -+for a in restapi-key.pem websocket-key.pem; do -+ cp /etc/ucentral/certs/server-key.pem /etc/ucentral/certs/$a -+done - --openssl genrsa -out server-key.pem 2048 --openssl req -new -key server-key.pem -subj "$subject" -out server.csr --openssl x509 -req -days $cert_life -in server.csr -signkey server-key.pem -out server-cert.pem -+cp /etc/ucentral/certs/server-cert.pem /etc/ucentral/certs/cas/ - --for i in `eval echo {1..$howmany}` -+for i in `seq 1 $howmany` - do -- openssl x509 -signkey server-key.pem -in server.csr -req -days $cert_life -out dev-$i-cert.pem -+ openssl x509 -signkey /etc/ucentral/certs/server-key.pem -in /etc/ucentral/certs/server.csr -req -days $cert_life -out /etc/ucentral/certs/dev-$i-cert.pem - done -Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/more_devices.sh -=================================================================== ---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/more_devices.sh -+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/more_devices.sh -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - - start=11 - finish=50 -@@ -7,4 +7,4 @@ cert_life=365 - for i in `eval echo {$start..$finish}` - do - openssl x509 -signkey server-key.pem -in server.csr -req -days $cert_life -out dev-$i-cert.pem --done -\ No newline at end of file -+done diff --git a/feeds/ucentral/ucentralgw/patches/200-jwt.patch b/feeds/ucentral/ucentralgw/patches/200-jwt.patch deleted file mode 100644 index 1dfc67510..000000000 --- a/feeds/ucentral/ucentralgw/patches/200-jwt.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: ucentralgw-2021-03-28-555b5fef/CMakeLists.txt -=================================================================== ---- ucentralgw-2021-03-28-555b5fef.orig/CMakeLists.txt -+++ ucentralgw-2021-03-28-555b5fef/CMakeLists.txt -@@ -40,7 +40,7 @@ find_package(ZLIB REQUIRED) - find_package(Lua REQUIRED) - - if(SMALL_BUILD) -- find_package(Poco REQUIRED COMPONENTS Crypto Net Util NetSSL Data DataSQLite) -+ find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite) - else() - find_package(CppKafka REQUIRED) - find_package(PostgreSQL REQUIRED) -@@ -81,4 +81,4 @@ if(NOT SMALL_BUILD) - ${MySQL_LIBRARIES} ${ODBC_LIBRARIES} ${ZLIB_LIBRARIES} ${LUA_LIBRARIES} - CppKafka::cppkafka - ) --endif() -\ No newline at end of file -+endif()