From a0e6b51758e1acd156c565597fa367df0ba5d81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <mkschreder.uk@gmail.com>
Date: Mon, 31 Aug 2015 17:50:25 +0200
Subject: [PATCH] Make sure rpcd uci deletes an option that is set to empty
 (just like uci)

---
 ubus/ubus-rpcd/Makefile          | 96 --------------------------------
 ubus/ubus-rpcd/files/rpcd.config |  7 ---
 ubus/ubus-rpcd/files/rpcd.init   | 21 -------
 3 files changed, 124 deletions(-)
 delete mode 100644 ubus/ubus-rpcd/Makefile
 delete mode 100644 ubus/ubus-rpcd/files/rpcd.config
 delete mode 100755 ubus/ubus-rpcd/files/rpcd.init

diff --git a/ubus/ubus-rpcd/Makefile b/ubus/ubus-rpcd/Makefile
deleted file mode 100644
index 7ba1f070b..000000000
--- a/ubus/ubus-rpcd/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (C) 2013-2014 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:=rpcd
-PKG_VERSION:=1.0.18
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/mkschreder/juci-rpcd.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_SOURCE_VERSION:=master
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Martin Schröder <mkschreder.uk@gmail.com>
-
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/include/rpcd $(1)/usr/include/
-endef
-
-define Package/rpcd/default
-  SECTION:=utils
-  CATEGORY:=UBUS
-  TITLE:=JUCI ubus RPC backend server
-  DEPENDS:=+libubus +libubox
-endef
-
-define Package/rpcd
-  $(Package/rpcd/default)
-  DEPENDS+= +libuci +libblobmsg-json
-endef
-
-define Package/rpcd/description
- This package provides the UBUS RPC backend server to expose various
- functionality to frontend programs via JSON-RPC.
-endef
-
-define Package/rpcd/conffiles
-/etc/config/rpcd
-endef
-
-define Package/rpcd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/rpcd.init $(1)/etc/init.d/rpcd
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd $(1)/sbin/rpcd
-	$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/unauthenticated.json $(1)/usr/share/rpcd/acl.d/unauthenticated.json
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/rpcd.config $(1)/etc/config/rpcd
-endef
-
-
-# 1: plugin name
-# 2: extra dependencies
-# 3: plugin title/description
-define BuildPlugin
-
-  PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_luci-rpc-mod-$(1)
-
-  define Package/rpcd-mod-$(1)
-    $(Package/rpcd/default)
-    TITLE+= ($(1) plugin)
-    DEPENDS+=rpcd $(2)
-  endef
-
-  define Package/rpcd-mod-$(1)/description
-    $(3)
-  endef
-
-  define Package/rpcd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(1).so $$(1)/usr/lib/rpcd/
-  endef
-
-  $$(eval $$(call BuildPackage,rpcd-mod-$(1)))
-
-endef
-
-$(eval $(call BuildPackage,rpcd))
-$(eval $(call BuildPlugin,file,,Provides ubus calls for file and directory operations.))
-#$(eval $(call BuildPlugin,iwinfo,+libiwinfo,Provides ubus calls for accessing iwinfo data.))
diff --git a/ubus/ubus-rpcd/files/rpcd.config b/ubus/ubus-rpcd/files/rpcd.config
deleted file mode 100644
index ff35225bd..000000000
--- a/ubus/ubus-rpcd/files/rpcd.config
+++ /dev/null
@@ -1,7 +0,0 @@
-
-config login
-	option username 'admin'
-	option password '$p$admin'
-	list read '*'
-	list write '*'
-
diff --git a/ubus/ubus-rpcd/files/rpcd.init b/ubus/ubus-rpcd/files/rpcd.init
deleted file mode 100755
index 98b633365..000000000
--- a/ubus/ubus-rpcd/files/rpcd.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=12
-
-USE_PROCD=1
-NAME=rpcd
-PROG=/sbin/rpcd
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_close_instance
-}
-
-stop() {
-	service_stop /sbin/rpcd
-}
-
-reload() {
-	service_reload /sbin/rpcd
-}