mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2026-03-14 21:10:11 +01:00
1d78413c74
-------------------------------------------------------------------------------
* f0147e7 Merge branch 'ubusx_acl' into devel
|\
| * d13aeee fix checkpatch.pl warnings and errors
| * 6eac202 replace avl_strcmp with ubus_object_path_compare: proper comparison for object that end with *
| * d092c9e replace printf with lwsl_notice
| * ce1b001 fix compile warnings: type cast
| * a58a5de implement ubusx_acl__add_object to the avl tree
| * b45d846 ubusx_acl: if option is not used, allow all objects bu default
| * 6a4240c add include ubusx_acl.h in main.c
| * 18450f3 add ubusx_acl__add_objects method
| * 60158a8 add the -X option: ubusx acl
| * 2d98397 add the avl tree to keep the object names
| * c3afdb3 add ubusx_acl to makefile
| * 292b619 initial add ubusx_acl files
| * 7f7752e call the ubusx_acl methods
|/
* aed9de1 Create new vhost on -i if iface already defined
-------------------------------------------------------------------------------
commit f0147e754b1018ef51b96ec21f40b921a30e6a6e
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 16:15:32 +0200
Merge branch 'ubusx_acl' into devel
Base directory -> /
CMakeLists.txt | 1 +
src/main.c | 11 ++++
src/rpc_list_ubus.h | 6 ++
src/ubusx_acl.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/ubusx_acl.h | 36 ++++++++++++
5 files changed, 213 insertions(+)
-------------------------------------------------------------------------------
commit d13aeee31979200f801e203dda58c0c7624ede9e
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 16:13:17 +0200
fix checkpatch.pl warnings and errors
Base directory -> /
src/main.c | 2 +-
src/rpc_list_ubus.h | 5 +++--
src/ubusx_acl.c | 25 +++++++++++++------------
src/ubusx_acl.h | 4 ++--
4 files changed, 19 insertions(+), 17 deletions(-)
-------------------------------------------------------------------------------
commit 6eac202a77a9f3d2288e37ad82624075507c03cf
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 15:59:40 +0200
replace avl_strcmp with ubus_object_path_compare: proper comparison for
object that end with *
Base directory -> /
src/ubusx_acl.c | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit d092c9e1832c5c225adc708f027811319a06486a
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 15:27:58 +0200
replace printf with lwsl_notice
Base directory -> /
src/ubusx_acl.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit ce1b00135b25d8020813830df52c70aff674944a
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 13:54:53 +0200
fix compile warnings: type cast
Base directory -> /
src/ubusx_acl.c | 6 +++---
src/ubusx_acl.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit a58a5de270f1cf360f894fad875cba359ebe3fa3
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 13:49:43 +0200
implement ubusx_acl__add_object to the avl tree
Base directory -> /
src/ubusx_acl.c | 28 ++++++++++++++++++++++++----
src/ubusx_acl.h | 2 +-
2 files changed, 25 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit b45d84696d8a77ede69c0176fa12c02b2fbf0890
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 12:00:44 +0200
ubusx_acl: if option is not used, allow all objects bu default
Base directory -> /
src/ubusx_acl.c | 4 ++++
1 file changed, 4 insertions(+)
-------------------------------------------------------------------------------
commit 6a4240c5c9b9eb74ac0c2b864db1ffbd01b7d0b1
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 11:35:41 +0200
add include ubusx_acl.h in main.c
Base directory -> /
src/main.c | 1 +
1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
commit 18450f3548a8b9f71c597ab73b544bfa144a552c
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 11:31:13 +0200
add ubusx_acl__add_objects method
Base directory -> /
src/main.c | 1 +
src/ubusx_acl.c | 18 ++++++++++++++++++
src/ubusx_acl.h | 1 +
3 files changed, 20 insertions(+)
-------------------------------------------------------------------------------
commit 60158a8c5a14a0dc18eb94d55584cbf174f57b5f
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 10:26:23 +0200
add the -X option: ubusx acl
Base directory -> /
src/main.c | 9 +++++++++
1 file changed, 9 insertions(+)
-------------------------------------------------------------------------------
commit 2d98397f786954935946ceec29550e29a6e6e445
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-04 15:15:36 +0200
add the avl tree to keep the object names
Base directory -> /
src/ubusx_acl.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit c3afdb3a6f5df1c7b8f23eafa7e86455a71851c5
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:57:42 +0200
add ubusx_acl to makefile
Base directory -> /
CMakeLists.txt | 1 +
src/ubusx_acl.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 292b61900a1e6b73d1fb6b205f627b69fb5c1b93
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:32:30 +0200
initial add ubusx_acl files
Base directory -> /
src/ubusx_acl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/ubusx_acl.h | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
-------------------------------------------------------------------------------
commit 7f7752eba0f65ac53cbdacf44c416a989e768f7d
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:30:54 +0200
call the ubusx_acl methods
Base directory -> /
src/rpc_list_ubus.h | 5 +++++
1 file changed, 5 insertions(+)
-------------------------------------------------------------------------------
commit aed9de16f49d94bd5abf10a3038fd9a1712cec19
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-02-27 11:27:44 +0100
Create new vhost on -i if iface already defined
New lws virtual host will now be created if option -i is specified multiple
times on the same port(vhost). New vhost will have the same port and label
as previous vhost.
Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>
Base directory -> /
src/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 52 insertions(+), 23 deletions(-)
-------------------------------------------------------------------------------
111 lines
3.2 KiB
Makefile
111 lines
3.2 KiB
Makefile
#
|
|
# Copyright (C) 2016 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=owsd
|
|
PKG_VERSION:=1.1.1
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE_PROTO=git
|
|
PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
|
|
PKG_SOURCE_VERSION:=f0147e754b1018ef51b96ec21f40b921a30e6a6e
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
|
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
|
|
PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
|
|
PKG_INSTALL:=1
|
|
PKG_BUILD_PARALLEL:=1
|
|
PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS
|
|
|
|
USE_UBUS-y:=-DWSD_HAVE_UBUS=ON
|
|
USE_DBUS-y:=-DWSD_HAVE_DBUS=ON
|
|
USE_BOTH-y:=${USE_UBUS-y} ${USE_DBUS-y}
|
|
|
|
CMAKE_OPTIONS:=${USE_UBUS-${CONFIG_OWSD_USE_UBUS}} \
|
|
${USE_DBUS-${CONFIG_OWSD_USE_DBUS}} \
|
|
${USE_BOTH-${CONFIG_OWSD_USE_DBUS_UBUS}}
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
define Package/owsd
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
DEPENDS:=+libjson-c +libblobmsg-json +libwebsockets +ubox \
|
|
+OWSD_USE_UBUS:ubus \
|
|
+OWSD_USE_DBUS:libdbus \
|
|
+OWSD_USE_DBUS:libxml2 \
|
|
+OWSD_USE_DBUS:dbus \
|
|
+OWSD_USE_DBUS_UBUS:ubus \
|
|
+OWSD_USE_DBUS_UBUS:libdbus \
|
|
+OWSD_USE_DBUS_UBUS:libxml2 \
|
|
+OWSD_USE_DBUS_UBUS:dbus
|
|
TITLE:=owsd daemon
|
|
MENU:=1
|
|
endef
|
|
|
|
define Package/owsd/config
|
|
source "$(SOURCE)/Config.in"
|
|
endef
|
|
|
|
define Package/owsd/install
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owsd $(1)/usr/bin/owsd
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/owsd.init $(1)/etc/init.d/owsd
|
|
$(INSTALL_DIR) $(1)/etc/config
|
|
$(INSTALL_CONF) ./files/owsd.config $(1)/etc/config/owsd
|
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
|
$(INSTALL_BIN) ./files/owsd.hotplug $(1)/etc/hotplug.d/iface/55-owsd
|
|
# $(INSTALL_DIR) $(1)/etc/uci-defaults
|
|
# $(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
|
|
endef
|
|
|
|
define Package/owsd-testdata
|
|
$(call Package/owsd)
|
|
TITLE += (Test certs and rpcd ACLs for running automated tests)
|
|
DEPENDS := owsd +rpcd-mod-file
|
|
endef
|
|
|
|
define Package/owsd/description
|
|
Web socket ubus daemon
|
|
endef
|
|
|
|
define Package/owsd-testdata/install
|
|
$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/owsd-test.json $(1)/usr/share/rpcd/acl.d/owsd-test.json
|
|
$(INSTALL_DIR) $(1)/usr/share/owsd/
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/cert.pem $(1)/usr/share/owsd/cert.pem
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/key.pem $(1)/usr/share/owsd/key.pem
|
|
|
|
$(INSTALL_DIR) $(1)/www/
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/webdemo/index.html $(1)/www/
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/webdemo/script.js $(1)/www/
|
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/res/webdemo/style.css $(1)/www/
|
|
endef
|
|
|
|
define Package/owsd-testdata/postinst
|
|
#!/bin/sh
|
|
set -e
|
|
uci delete rpcd.owsd_test 2>/dev/null || true
|
|
uci set rpcd.owsd_test=login
|
|
uci set rpcd.owsd_test.username="owsd_test"
|
|
uci set rpcd.owsd_test.password="x"
|
|
uci add_list rpcd.owsd_test.read='test-calls'
|
|
uci add_list rpcd.owsd_test.read='test-events'
|
|
uci commit
|
|
endef
|
|
|
|
define Package/owsd-testdata/prerm
|
|
#!/bin/sh
|
|
set -e
|
|
uci delete rpcd.owsd_test
|
|
uci commit
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,owsd))
|
|
$(eval $(call BuildPackage,owsd-testdata))
|