From 443ca16e881545e166f0c273b3e886ce1b474fd8 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 10:09:39 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cy --- OAT.xml | 1 + bundle.json | 1 + iptables.spec | 1 + 3 files changed, 3 insertions(+) diff --git a/OAT.xml b/OAT.xml index 82711ff7..a715e1e3 100644 --- a/OAT.xml +++ b/OAT.xml @@ -24,6 +24,7 @@ 2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is: 3. policyitem type: + "compatibility" is used to check license compatibility in the specified path; "license" is used to check source license header in the specified path; "copyright" is used to check source copyright header in the specified path; diff --git a/bundle.json b/bundle.json index f13192b0..f280145c 100644 --- a/bundle.json +++ b/bundle.json @@ -15,6 +15,7 @@ "subsystem": "thirdparty", "syscap": [], "features": [], + "adapted_system_type": [ "standard" ], diff --git a/iptables.spec b/iptables.spec index fd917e15..a146e96d 100644 --- a/iptables.spec +++ b/iptables.spec @@ -2,6 +2,7 @@ %global legacy_actions %{_libexecdir}/initscripts/legacy-actions Name: iptables Version: 1.8.7 + Release: 14 Summary: IP packet filter administration utilities License: GPLv2 and Artistic Licence 2.0 and ISC -- Gitee From 6433bb6138be2d587204a06d59f62367925707be Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 02:44:26 +0000 Subject: [PATCH 2/9] update OAT.xml. Signed-off-by: cy --- OAT.xml | 207 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 103 insertions(+), 104 deletions(-) diff --git a/OAT.xml b/OAT.xml index a715e1e3..99368e53 100644 --- a/OAT.xml +++ b/OAT.xml @@ -24,7 +24,6 @@ 2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is: 3. policyitem type: - "compatibility" is used to check license compatibility in the specified path; "license" is used to check source license header in the specified path; "copyright" is used to check source copyright header in the specified path; @@ -71,112 +70,112 @@ cluster.' desc=""/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + -- Gitee From 0dc0e43ac5baf85383a6dc484921f2cf1f5c9817 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 02:45:40 +0000 Subject: [PATCH 3/9] update bundle.json. Signed-off-by: cy --- bundle.json | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/bundle.json b/bundle.json index f280145c..671e6456 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,6 @@ "subsystem": "thirdparty", "syscap": [], "features": [], - "adapted_system_type": [ "standard" ], @@ -31,29 +30,7 @@ "//third_party/iptables:iptables-restore", "//third_party/iptables:iptables-save" ], - "inner_kits": [ - { - "name": "//third_party/iptables:iptables", - "header": { - "header_files": [], - "header_base": "//third_party/iptables/include" - } - }, - { - "name": "//third_party/iptables:iptables-restore", - "header": { - "header_files": [], - "header_base": "//third_party/iptables/include" - } - }, - { - "name": "//third_party/iptables:iptables-save", - "header": { - "header_files": [], - "header_base": "//third_party/iptables/include" - } - } - ], + "inner_kits": [], "test": [] } } -- Gitee From 8140b2310325da6bb8f3b8a5137c9f1ad874e310 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 02:47:21 +0000 Subject: [PATCH 4/9] update iptables.spec. Signed-off-by: cy --- iptables.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/iptables.spec b/iptables.spec index a146e96d..e5ae64b1 100644 --- a/iptables.spec +++ b/iptables.spec @@ -2,7 +2,6 @@ %global legacy_actions %{_libexecdir}/initscripts/legacy-actions Name: iptables Version: 1.8.7 - Release: 14 Summary: IP packet filter administration utilities License: GPLv2 and Artistic Licence 2.0 and ISC @@ -164,6 +163,7 @@ touch %{buildroot}%{_mandir}/man8/arptables-save.8 touch %{buildroot}%{_mandir}/man8/arptables-restore.8 touch %{buildroot}%{_mandir}/man8/ebtables.8 +cp -a %{_libdir}/libip*tc.so.0.* %{buildroot}%{_libdir} %ldconfig_scriptlets %post @@ -259,6 +259,7 @@ fi %defattr(-,root,root) %license COPYING %{script_path}/ip*tables.init +%{_sysconfdir}/ethertypes %config(noreplace) %{_sysconfdir}/sysconfig/* %{_sbindir}/nfnl_osf %{_sbindir}/nfbpf_* @@ -419,10 +420,10 @@ ebtables translate Print flush command after parsing is finished * Mon Aug 02 2021 chenyanpanHW - 1.8.7-2 - DESC: delete -S git from %autosetup, and delete BuildRequires git -* Fri Jul 23 2021 gaihuiying - 1.8.7-1 +* Fri Jul 23 gaihuiying - 1.8.7-1 - update to 1.8.7 -* Sat Jul 25 2020 hanzhijun - 1.8.5-1 +* Sat Jul 25 hanzhijun - 1.8.5-1 - update to 1.8.5 * Thu Apr 16 2020 chenzhen - 1.8.1-5 -- Gitee From 4b2751747d518df4976a93f4828510989b5a4658 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 03:28:19 +0000 Subject: [PATCH 5/9] update OAT.xml. Signed-off-by: cy --- OAT.xml | 188 ++++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 136 deletions(-) diff --git a/OAT.xml b/OAT.xml index 99368e53..3ecb99b2 100644 --- a/OAT.xml +++ b/OAT.xml @@ -47,151 +47,67 @@ - - COPYING - - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - -- Gitee From 5c05dc2a6e186a780ac386743318d4db6ce8d06f Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 28 Dec 2024 03:29:53 +0000 Subject: [PATCH 6/9] update bundle.json. Signed-off-by: cy --- bundle.json | 62 +++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/bundle.json b/bundle.json index 671e6456..400d3799 100644 --- a/bundle.json +++ b/bundle.json @@ -1,37 +1,33 @@ { - "name": "@ohos/iptables", - "description": "iptables is the userspace command line program used to configure the Linux 2.4.x and later packet filtering ruleset. It is targeted towards system administrators.", - "version": "v1.8.7", - "license": "GPL V2.0", - "publishAs": "code-segment", - "segment": { - "destPath": "third_party/iptables" + "name": "@ohos/libwebsockets", + "description": "Libwebsockets is a simple-to-use, MIT-license, pure C library providing client and server for http/1, http/2, websockets, MQTT and other protocols in a security-minded, lightweight, configurable, scalable and flexible way.", + "version": "v4.3.3", + "license": "Apache V2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "third_party/libwebsockets" + }, + "dirs": {}, + "scripts": {}, + "licensePath": "COPYING", + "component": { + "name": "libwebsockets", + "subsystem": "thirdparty", + "syscap": [], + "features": [], + "adapted_system_type": [ "standard" ], + "rom": "319KB", + "ram": "13865KB", + "deps": { + "components": [ "zlib" ], + "third_party": [ + "openssl" + ] }, - "dirs": {}, - "scripts": {}, - "licensePath": "COPYING", - "component": { - "name": "iptables", - "subsystem": "thirdparty", - "syscap": [], - "features": [], - "adapted_system_type": [ - "standard" - ], - "rom": "", - "ram": "", - "deps": { - "components": [], - "third_party": [] - }, - "build": { - "sub_component": [ - "//third_party/iptables:iptables", - "//third_party/iptables:iptables-restore", - "//third_party/iptables:iptables-save" - ], - "inner_kits": [], - "test": [] - } + "build": { + "sub_component": [], + "inner_kits": [], + "test": [] } + } } \ No newline at end of file -- Gitee From dd73973a700f396449845d43c689fdb242f5e37c Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 07:43:26 +0000 Subject: [PATCH 7/9] update OAT.xml. Signed-off-by: cy --- OAT.xml | 137 +++++++++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 86 deletions(-) diff --git a/OAT.xml b/OAT.xml index 3ecb99b2..ddb2187e 100644 --- a/OAT.xml +++ b/OAT.xml @@ -1,5 +1,5 @@ - + + COPYING - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + - - - - - - - - + \ No newline at end of file -- Gitee From ef132effc98d64d44d83ecf2b14b684300ec4fb8 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 07:44:02 +0000 Subject: [PATCH 8/9] update bundle.json. Signed-off-by: cy --- bundle.json | 62 ++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/bundle.json b/bundle.json index 400d3799..671e6456 100644 --- a/bundle.json +++ b/bundle.json @@ -1,33 +1,37 @@ { - "name": "@ohos/libwebsockets", - "description": "Libwebsockets is a simple-to-use, MIT-license, pure C library providing client and server for http/1, http/2, websockets, MQTT and other protocols in a security-minded, lightweight, configurable, scalable and flexible way.", - "version": "v4.3.3", - "license": "Apache V2.0", - "publishAs": "code-segment", - "segment": { - "destPath": "third_party/libwebsockets" - }, - "dirs": {}, - "scripts": {}, - "licensePath": "COPYING", - "component": { - "name": "libwebsockets", - "subsystem": "thirdparty", - "syscap": [], - "features": [], - "adapted_system_type": [ "standard" ], - "rom": "319KB", - "ram": "13865KB", - "deps": { - "components": [ "zlib" ], - "third_party": [ - "openssl" - ] + "name": "@ohos/iptables", + "description": "iptables is the userspace command line program used to configure the Linux 2.4.x and later packet filtering ruleset. It is targeted towards system administrators.", + "version": "v1.8.7", + "license": "GPL V2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "third_party/iptables" }, - "build": { - "sub_component": [], - "inner_kits": [], - "test": [] + "dirs": {}, + "scripts": {}, + "licensePath": "COPYING", + "component": { + "name": "iptables", + "subsystem": "thirdparty", + "syscap": [], + "features": [], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [], + "third_party": [] + }, + "build": { + "sub_component": [ + "//third_party/iptables:iptables", + "//third_party/iptables:iptables-restore", + "//third_party/iptables:iptables-save" + ], + "inner_kits": [], + "test": [] + } } - } } \ No newline at end of file -- Gitee From 5cd14c07c37d6412863220f8d287a8ba2c0e0c8d Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 08:44:29 +0000 Subject: [PATCH 9/9] update OAT.xml. Signed-off-by: cy --- OAT.xml | 217 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 168 insertions(+), 49 deletions(-) diff --git a/OAT.xml b/OAT.xml index ddb2187e..99368e53 100644 --- a/OAT.xml +++ b/OAT.xml @@ -1,5 +1,5 @@ - - - COPYING + + COPYING + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + - \ No newline at end of file + + -- Gitee