urlfilter: 1.1.3

urlfilter/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -17,7 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -35,7 +34,6 @@ define Package/urlfilter/description
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
         -D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)

urlfilter/files/etc/bbfdm/json/urlfilter.json

@@ -115,6 +115,9 @@
 				"cwmp",
 				"usp"
 			],
+			"uniqueKeys": [
+				"Name"
+			],
 			"access": true,
 			"array": true,
 			"mapping": [
@@ -125,10 +128,40 @@
 						"section": {
 							"type": "profile"
 						},
-						"dmmapfile": "dmmap_urlfilter_profile"
+						"dmmapfile": "dmmap_urlfilter"
 					}
 				}
 			],
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"version": "2.14",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 64
+					}
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"option": {
+								"name": "@Name"
+							}
+						}
+					}
+				]
+			},
 			"WhitelistURL": {
 				"type": "string",
 				"version": "2.14",
@@ -225,7 +258,7 @@
 						"section": {
 							"type": "filter"
 						},
-						"dmmapfile": "dmmap_urlfilter_filter"
+						"dmmapfile": "dmmap_urlfilter"
 					}
 				}
 			],
@@ -273,11 +306,12 @@
 							"option": {
 								"name": "profile"
 							}
-						}
+						},
+						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile."
 					}
 				]
 			},
-			"MacAddress": {
+			"MACAddress": {
 				"type": "string",
 				"version": "2.14",
 				"read": true,