From bf168e4b545dac637f6b38f31c6f6e8b0cd03d70 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Thu, 18 May 2023 12:07:34 +0200 Subject: [PATCH] pkg/ndn-riot: drop unmaintained pkg Upstream [1] has seen no activity since 2018, so it safe to assume this is dead. It is reasonable to assume that any users - if there ever were any - have moved on. Fixes https://github.com/RIOT-OS/RIOT/issues/15638 [1]: https://github.com/named-data-iot/ndn-riot --- examples/ndn-ping/Makefile | 26 -- examples/ndn-ping/Makefile.ci | 32 -- examples/ndn-ping/README.md | 49 --- examples/ndn-ping/main.c | 43 --- examples/ndn-ping/ndn_ping.c | 328 ------------------ pkg/ndn-riot/Makefile | 11 - pkg/ndn-riot/Makefile.dep | 12 - pkg/ndn-riot/Makefile.include | 1 - ...0001-update-xtimer_t-struct-clearing.patch | Bin 1637 -> 0 bytes .../0002-add-max-gnrc-netifs-macros.patch | Bin 1437 -> 0 bytes ...adapt-to-moved-kernel_pid_t-location.patch | Bin 2870 -> 0 bytes ...004-replace-use-of-deprecated-netopt.patch | Bin 834 -> 0 bytes ...05-use-ztimer_msec-instead-of-xtimer.patch | Bin 7852 -> 0 bytes ...recated-CIPHER_AES_128-by-CIPHER_AES.patch | Bin 1171 -> 0 bytes 14 files changed, 502 deletions(-) delete mode 100644 examples/ndn-ping/Makefile delete mode 100644 examples/ndn-ping/Makefile.ci delete mode 100644 examples/ndn-ping/README.md delete mode 100644 examples/ndn-ping/main.c delete mode 100644 examples/ndn-ping/ndn_ping.c delete mode 100644 pkg/ndn-riot/Makefile delete mode 100644 pkg/ndn-riot/Makefile.dep delete mode 100644 pkg/ndn-riot/Makefile.include delete mode 100644 pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch delete mode 100644 pkg/ndn-riot/patches/0002-add-max-gnrc-netifs-macros.patch delete mode 100644 pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch delete mode 100644 pkg/ndn-riot/patches/0004-replace-use-of-deprecated-netopt.patch delete mode 100644 pkg/ndn-riot/patches/0005-use-ztimer_msec-instead-of-xtimer.patch delete mode 100644 pkg/ndn-riot/patches/0006-replace-deprecated-CIPHER_AES_128-by-CIPHER_AES.patch diff --git a/examples/ndn-ping/Makefile b/examples/ndn-ping/Makefile deleted file mode 100644 index 35bf9d5e74..0000000000 --- a/examples/ndn-ping/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# name of your application -APPLICATION = ndn_ping - -# If no BOARD is found in the environment, use this default: -BOARD ?= native - -# This has to be the absolute path to the RIOT base directory: -RIOTBASE ?= $(CURDIR)/../../ - -# Include packages that pull up and auto-init the link layer. -USEMODULE += netdev_default -USEMODULE += auto_init_gnrc_netif -USEMODULE += random -USEMODULE += shell_cmds_default - -USEPKG += ndn-riot - -# Comment this out to disable code in RIOT that does safety checking -# which is not needed in a production environment but helps in the -# development process: -DEVELHELP ?= 1 - -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - -include $(RIOTBASE)/Makefile.include diff --git a/examples/ndn-ping/Makefile.ci b/examples/ndn-ping/Makefile.ci deleted file mode 100644 index 5a6ef28cf2..0000000000 --- a/examples/ndn-ping/Makefile.ci +++ /dev/null @@ -1,32 +0,0 @@ -BOARD_INSUFFICIENT_MEMORY := \ - arduino-duemilanove \ - arduino-leonardo \ - arduino-mega2560 \ - arduino-nano \ - arduino-uno \ - atmega328p \ - atmega328p-xplained-mini \ - atxmega-a3bu-xplained \ - bluepill-stm32f030c8 \ - i-nucleo-lrwan1 \ - msb-430 \ - msb-430h \ - nucleo-f030r8 \ - nucleo-f031k6 \ - nucleo-f042k6 \ - nucleo-l011k4 \ - nucleo-l031k6 \ - nucleo-l053r8 \ - samd10-xmini \ - slstk3400a \ - stk3200 \ - stm32f030f4-demo \ - stm32f0discovery \ - stm32g0316-disco \ - stm32l0538-disco \ - telosb \ - waspmote-pro \ - weio \ - z1 \ - zigduino \ - # diff --git a/examples/ndn-ping/README.md b/examples/ndn-ping/README.md deleted file mode 100644 index 54dced636b..0000000000 --- a/examples/ndn-ping/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# ndn-ping - -This application demonstrates the usage of the package ndn-riot. -This example basically enables the user to setup a ndn data server, and a ndn client that can request the data. -Any board with a default netdev can be used to run this example. - -# Setting up for native - -Create `tap` and `tapbr` devices using RIOT's `tapsetup` script before stating the application: -```bash -sudo ./RIOTDIR/dist/tools/tapsetup/tapsetup -``` - -Then run the application on 2 different terminals : -```bash -# on the first terminal -make PORT=tap0 term -# on the second terminal -make PORT=tap1 term -``` - -# Usage - -The user can run shell commands (type "help" to see the list). -Only one command is relative to ndn : `ndnping`. - -## Start a server - -``` -ndnping server name_uri server_id -``` - -Replace `name_uri` by a ndn name (for example `/test`), and `server_id` by a number. -`server_id` will be appended to the name of the data sent by the server. -This can help when several servers are running using the same `name_uri`, but is not useful in our example. - -A server will start and answer to any interest message matching the name. - -## Start a client - -``` -ndnping client name_uri max_count -``` - -Replace `name_uri` by a ndn name, and `max_count` by a number. -`max_count` is the number of interest message that will be sent. - -A client will start, send a first interest message and wait for a data message. -Once data is received or timeout is reached, the client can send the next interest message, or stop when the last interest have been sent. diff --git a/examples/ndn-ping/main.c b/examples/ndn-ping/main.c deleted file mode 100644 index 695b11e465..0000000000 --- a/examples/ndn-ping/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2016 Wentao Shang - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup examples - * @{ - * - * @file - * @brief NDN ping application - * - * @author Wentao Shang - * - * @} - */ - -#include - -#include "ndn-riot/ndn.h" -#include "shell.h" -#include "msg.h" - -extern int ndn_ping(int argc, char **argv); - -static const shell_command_t shell_commands[] = { - { "ndnping", "start ndn-ping client and server", ndn_ping }, - { NULL, NULL, NULL } -}; - -int main(void) -{ - /* start shell */ - puts("All up, running the shell now"); - char line_buf[SHELL_DEFAULT_BUFSIZE]; - shell_run(shell_commands, line_buf, SHELL_DEFAULT_BUFSIZE); - - /* should be never reached */ - return 0; -} diff --git a/examples/ndn-ping/ndn_ping.c b/examples/ndn-ping/ndn_ping.c deleted file mode 100644 index ef715c13ec..0000000000 --- a/examples/ndn-ping/ndn_ping.c +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright (C) 2016 Wentao Shang - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup examples - * @{ - * - * @file - * @brief NDN ping client and server implementation - * - * @author Wentao Shang - * - * @} - */ - -#include -#include - -#include "thread.h" -#include "random.h" -#include "test_utils/expect.h" - -#include "ndn-riot/app.h" -#include "ndn-riot/ndn.h" -#include "ndn-riot/encoding/name.h" -#include "ndn-riot/encoding/interest.h" -#include "ndn-riot/encoding/data.h" -#include "ndn-riot/msg-type.h" - -static ndn_app_t* handle = NULL; - -static const uint8_t ecc_key_pri[] = { - 0x38, 0x67, 0x54, 0x73, 0x8B, 0x72, 0x4C, 0xD6, - 0x3E, 0xBD, 0x52, 0xF3, 0x64, 0xD8, 0xF5, 0x7F, - 0xB5, 0xE6, 0xF2, 0x9F, 0xC2, 0x7B, 0xD6, 0x90, - 0x42, 0x9D, 0xC8, 0xCE, 0xF0, 0xDE, 0x75, 0xB3 -}; - -static const uint8_t ecc_key_pub[] = { - 0x2C, 0x3C, 0x18, 0xCB, 0x31, 0x88, 0x0B, 0xC3, - 0x73, 0xF4, 0x4A, 0xD4, 0x3F, 0x8C, 0x80, 0x24, - 0xD4, 0x8E, 0xBE, 0xB4, 0xAD, 0xF0, 0x69, 0xA6, - 0xFE, 0x29, 0x12, 0xAC, 0xC1, 0xE1, 0x26, 0x7E, - 0x2B, 0x25, 0x69, 0x02, 0xD5, 0x85, 0x51, 0x4B, - 0x91, 0xAC, 0xB9, 0xD1, 0x19, 0xE9, 0x5E, 0x97, - 0x20, 0xBB, 0x16, 0x2A, 0xD3, 0x2F, 0xB5, 0x11, - 0x1B, 0xD1, 0xAF, 0x76, 0xDB, 0xAD, 0xB8, 0xCE -}; - -static int on_data(ndn_block_t* interest, ndn_block_t* data) -{ - (void)interest; - - ndn_block_t name; - int r = ndn_data_get_name(data, &name); - expect(r == 0); - printf("client (pid=%" PRIkernel_pid "): data received, name=", - handle->id); - ndn_name_print(&name); - putchar('\n'); - - ndn_block_t content; - r = ndn_data_get_content(data, &content); - expect(r == 0); - expect(content.len == 6); - - printf("client (pid=%" PRIkernel_pid "): content=%02X%02X%02X%02X\n", - handle->id, *(content.buf + 2), *(content.buf + 3), - *(content.buf + 4), *(content.buf + 5)); - - r = ndn_data_verify_signature(data, ecc_key_pub, sizeof(ecc_key_pub)); - - if (r != 0) { - printf("client (pid=%" PRIkernel_pid "): fail to verify signature\n", - handle->id); - } - else { - printf("client (pid=%" PRIkernel_pid "): signature valid\n", - handle->id); - } - - return NDN_APP_CONTINUE; -} - -static int on_timeout(ndn_block_t* interest) -{ - ndn_block_t name; - int r = ndn_interest_get_name(interest, &name); - expect(r == 0); - - printf("client (pid=%" PRIkernel_pid "): interest timeout, name=", - handle->id); - ndn_name_print(&name); - putchar('\n'); - - return NDN_APP_CONTINUE; -} - -static uint16_t count = 0; -static uint16_t max_count; - -static int send_interest(void* context) -{ - const char* uri = (const char*)context; - - printf("client (pid=%" PRIkernel_pid "): in sched callback, count=%d\n", - handle->id, ++count); - if (count > max_count) { - /* This is pure hack: ideally should wait for all pending I/O requests - * to finish before stopping the app. However, this may cause the app - * to block forever if not implemented very carefully. */ - printf("client (pid=%" PRIkernel_pid "): stop the app\n", handle->id); - return NDN_APP_STOP; - } - - ndn_shared_block_t* sn = ndn_name_from_uri(uri, strlen(uri)); - if (sn == NULL) { - printf("client (pid=%" PRIkernel_pid "): cannot create name from uri " - "\"%s\"\n", handle->id, uri); - return NDN_APP_ERROR; - } - - uint32_t rand = random_uint32(); - ndn_shared_block_t* sin = ndn_name_append_uint32(&sn->block, rand); - ndn_shared_block_release(sn); - if (sin == NULL) { - printf("client (pid=%" PRIkernel_pid "): cannot append component to " - "name \"%s\"\n", handle->id, uri); - return NDN_APP_ERROR; - } - - uint32_t lifetime = 1000; // 1 sec - - printf("client (pid=%" PRIkernel_pid "): express interest, name=", - handle->id); - ndn_name_print(&sin->block); - putchar('\n'); - - if (ndn_app_express_interest(handle, &sin->block, NULL, lifetime, - on_data, on_timeout) != 0) { - printf("client (pid=%" PRIkernel_pid "): failed to express interest\n", - handle->id); - ndn_shared_block_release(sin); - return NDN_APP_ERROR; - } - ndn_shared_block_release(sin); - - if (ndn_app_schedule(handle, send_interest, context, 2000000) != 0) { - printf("client (pid=%" PRIkernel_pid "): cannot schedule next interest" - "\n", handle->id); - return NDN_APP_ERROR; - } - printf("client (pid=%" PRIkernel_pid "): schedule next interest in 2 sec" - "\n", handle->id); - - return NDN_APP_CONTINUE; -} - -static void run_client(const char* uri, int max_cnt) -{ - printf("client (pid=%" PRIkernel_pid "): start\n", thread_getpid()); - - handle = ndn_app_create(); - if (handle == NULL) { - printf("client (pid=%" PRIkernel_pid "): cannot create app handle\n", - thread_getpid()); - return; - } - - max_count = max_cnt; - count = 0; - - if (ndn_app_schedule(handle, send_interest, (void*)uri, 1000000) != 0) { - printf("client (pid=%" PRIkernel_pid "): cannot schedule first " - "interest\n", handle->id); - ndn_app_destroy(handle); - return; - } - printf("client (pid=%" PRIkernel_pid "): schedule first interest in 1 sec" - "\n", handle->id); - - printf("client (pid=%" PRIkernel_pid "): enter app run loop\n", - handle->id); - - ndn_app_run(handle); - - printf("client (pid=%" PRIkernel_pid "): returned from app run loop\n", - handle->id); - - ndn_app_destroy(handle); -} - -static uint8_t sid = 0; - -static int on_interest(ndn_block_t* interest) -{ - ndn_block_t in; - if (ndn_interest_get_name(interest, &in) != 0) { - printf("server (pid=%" PRIkernel_pid "): cannot get name from interest" - "\n", handle->id); - return NDN_APP_ERROR; - } - - printf("server (pid=%" PRIkernel_pid "): interest received, name=", - handle->id); - ndn_name_print(&in); - putchar('\n'); - - ndn_shared_block_t* sdn = ndn_name_append_uint8(&in, sid); - if (sdn == NULL) { - printf("server (pid=%" PRIkernel_pid "): cannot append component to " - "name\n", handle->id); - return NDN_APP_ERROR; - } - - ndn_metainfo_t meta = { NDN_CONTENT_TYPE_BLOB, -1 }; - - uint32_t rand = random_uint32(); - uint8_t* buf = (uint8_t*)(&rand); - ndn_block_t content = { buf, sizeof(rand) }; - - ndn_shared_block_t* sd = - ndn_data_create(&sdn->block, &meta, &content, - NDN_SIG_TYPE_ECDSA_SHA256, NULL, - ecc_key_pri, sizeof(ecc_key_pri)); - if (sd == NULL) { - printf("server (pid=%" PRIkernel_pid "): cannot create data block\n", - handle->id); - ndn_shared_block_release(sdn); - return NDN_APP_ERROR; - } - - printf("server (pid=%" PRIkernel_pid "): send data to NDN thread, name=", - handle->id); - ndn_name_print(&sdn->block); - putchar('\n'); - ndn_shared_block_release(sdn); - - /* pass ownership of "sd" to the API */ - if (ndn_app_put_data(handle, sd) != 0) { - printf("server (pid=%" PRIkernel_pid "): cannot put data\n", - handle->id); - return NDN_APP_ERROR; - } - - printf("server (pid=%" PRIkernel_pid "): return to the app\n", handle->id); - return NDN_APP_CONTINUE; -} - -static void run_server(const char* prefix, int id) -{ - printf("server (pid=%" PRIkernel_pid "): start\n", thread_getpid()); - - handle = ndn_app_create(); - if (handle == NULL) { - printf("server (pid=%" PRIkernel_pid "): cannot create app handle\n", - thread_getpid()); - return; - } - sid = (uint8_t)id; - - ndn_shared_block_t* sp = ndn_name_from_uri(prefix, strlen(prefix)); - if (sp == NULL) { - printf("server (pid=%" PRIkernel_pid "): cannot create name from uri " - "\"%s\"\n", handle->id, prefix); - return; - } - - printf("server (pid=%" PRIkernel_pid "): register prefix \"%s\"\n", - handle->id, prefix); - /* pass ownership of "sp" to the API */ - if (ndn_app_register_prefix(handle, sp, on_interest) != 0) { - printf("server (pid=%" PRIkernel_pid "): failed to register prefix\n", - handle->id); - ndn_app_destroy(handle); - return; - } - - printf("server (pid=%" PRIkernel_pid "): enter app run loop\n", - handle->id); - - ndn_app_run(handle); - - printf("server (pid=%" PRIkernel_pid "): returned from app run loop\n", - handle->id); - - ndn_app_destroy(handle); -} - -int ndn_ping(int argc, char **argv) -{ - if (argc < 2) { - printf("usage: %s [client|server]\n", argv[0]); - return 1; - } - - if (strcmp(argv[1], "client") == 0) { - if (argc < 4) { - printf("usage: %s client _name_uri_ _max_count_\n", argv[0]); - return 1; - } - - int max_cnt = atoi(argv[3]); - if (max_cnt == 0) { - printf("invalid max count number: %s\n", argv[3]); - return 1; - } - - run_client(argv[2], max_cnt); - } - else if (strcmp(argv[1], "server") == 0) { - if (argc < 4) { - printf("usage: %s server _prefix_ _server_id_\n", argv[0]); - return 1; - } - - run_server(argv[2], atoi(argv[3])); - } - else { - puts("error: invalid command"); - } - return 0; -} diff --git a/pkg/ndn-riot/Makefile b/pkg/ndn-riot/Makefile deleted file mode 100644 index 6be0ebbaf7..0000000000 --- a/pkg/ndn-riot/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PKG_NAME=ndn-riot -PKG_URL=https://github.com/named-data-iot/ndn-riot -PKG_VERSION=34c5eb8adf198049f0a56048825b505c561a8874 -PKG_LICENSE=LGPLv2.1 - -include $(RIOTBASE)/pkg/pkg.mk - -CFLAGS += -Wno-cast-align - -all: - $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR) diff --git a/pkg/ndn-riot/Makefile.dep b/pkg/ndn-riot/Makefile.dep deleted file mode 100644 index ba521c6f1a..0000000000 --- a/pkg/ndn-riot/Makefile.dep +++ /dev/null @@ -1,12 +0,0 @@ -USEMODULE += ndn-encoding -USEMODULE += gnrc -USEMODULE += gnrc_nettype_ndn -USEMODULE += ztimer_usec -USEMODULE += random -USEMODULE += hashes -USEPKG += micro-ecc - -# Blacklist platforms using nimble_netif with gnrc netif, e.g providing -# ble_nimble: NimBLE and ndn-riot use different crypto libraries that have -# name clashes (tinycrypt vs uECC) -FEATURES_BLACKLIST += ble_nimble diff --git a/pkg/ndn-riot/Makefile.include b/pkg/ndn-riot/Makefile.include deleted file mode 100644 index f0aa70ed33..0000000000 --- a/pkg/ndn-riot/Makefile.include +++ /dev/null @@ -1 +0,0 @@ -INCLUDES += -I$(PKGDIRBASE) diff --git a/pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch b/pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch deleted file mode 100644 index c6186522de24b431698106b220cea069a4e9340e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1637 zcmchXZExBz5XWE7pW?%})7PD%^3 zo3uBJKo_6yeD?kP&#|6Ofp$Al-Vb9M@sLxRrkze7X@nvXg7$eB#YvKhP9KId1y?u+ z8bc5a${&P5K*_OPW&lH(O|XE=nK1<}%|xMwH`CJT>ow>8gn#oUe3~xx*cZ4*4!OYr zj3&z#B=DXqyJ#2yr32a<*s{%l1_8NRre85L1NeM#Fnas$3oPft=E0qjQ`F4B!sumY zAS;k-sm6qOo=1Ss=Y9r1A%vzK6`>tGj^@&=&2=D`1uh_)a5YBJf(}TvKyBnqEo#lW za|kT38hdp@gv@jBysrCqdA*o0IjRE)}3hlqB&4pC*S z!_inwxJJR!VwT-7i^chhkmZ_>nZ^v|E!J*OD=gSt3JXW(Ji`YdYn_q8o=9Pav-I*lD&x++gA;@PI)SO%+fxBZ8u)j7c|=cM`F*)KS|8( bp+vXMW2G{O{o-`=0&@FdBcUI5{eY0){ZH)F diff --git a/pkg/ndn-riot/patches/0002-add-max-gnrc-netifs-macros.patch b/pkg/ndn-riot/patches/0002-add-max-gnrc-netifs-macros.patch deleted file mode 100644 index 0f18601aa911e37c04586ec056e6eca11e3a7230..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1437 zcmcgs>rdM-5dZGK;snyvHcgs@K1g|}2-=N}c8G^G38Bb|FT{{K$aM#M{qH-6QlNnL zZC2vP*}uE<@9sR(Fa0Y44)fI{+1U^VLLv3WKW;LhY zgbff_kUqP1>x>DRW#GD3(g1Hg8cH5#Oe%r*(7~{sc7^Bla05jWkzT*sZd>o3P>fuF zC*)uNZWuL#5S)i$FkrAQRa(pi!nWp0lv6L?eJ(V)MlLELb7zJdnOd6S%CFeKV+u*l%Ige%F|e)GAS$JiypTT;OpXs> z0b`v3R7U@RMvJ-jY*uQhNo7F74)|L%Y{RO%TNE}~C+*IAh!tm-0DHb_FX)h$p3HcP zWbw=JWHLO8j}H&x^U1+*M7Ol<4_($qC5oDqGgVK^*OWDg=OyVGWkBr)wZbC4m4bp$ zS$X0`W^~mD!>=vZL8F;#1(WlmBTM%Gq{n*p4n;f5TU5*}x`nSFRzOSo-l&y)neq9e zRs!s0iAX&!40@f-&gNUSlE0{xyoyTLZc=qqA8ddvm1lLahAJ(ER9CH}DAOA+U!!fO z)o4)eG+>Zui5a~+_n_v}1T~adm2Eab?@E0`d23MH5X~&0#hi7SQC$<}<)cFzB$WzR vH=q{OX%iJO!04SJyoJYcdRxqA_Gf_iWJJN*{+g|r#aVhESm=cv&u8o}oW-7P diff --git a/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch b/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch deleted file mode 100644 index 1754bb5af40af8ab9e6a54b3f8892dae495da62f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2870 zcmcImTW{Mo6n@vQIPhLp*petx7s?0%XK8{C+kyef+b|fsI$9iAkd-#Y`r}8Dk|Wt# z1GK3jixkf}l)mrWcwO%vAZgi0M2}R362GrU_Dt;zXhZi-e05{@9gpt14pv z2rcae7@^3!Hrp)WH@2@>4Y%TctBSp<;q1Y#toHp%Al13|o;7OO?zI3+;AZ#H?12$P zcp1mbB!)SP5b|!H_&-WCOZe;0i@VDYe*=@OYM|M{_*r*1Vy8_TPD)EVKsS-xLk7&~eG#=oO_@&ydEL<~U+P2Z10-mgbld3dU_| z9Jem$?Y#MX4!!Ma1wJN=9Om}ET6yqOQHt%8R4`Me*tN`sC3`f~&xSHR#jDZq{Db{j z7Y@zmN*VW_56sV=o8nQ`M~jBha8uSItR5QvWVk)|=7-&8CSaAcU(s%)rP8ooi)#C{ zZ~q>s=f;E|%r0l}@0czdTs&-tjx3ULO{k=p1p$hb)R=P-jmfg=jw?I0RN+NtsKSdB zTB-(!UdYvVF?O+?P6IpB;u z+*@=QJNs8q-dx@NdVNv`Usk^f@k!Ykw3SgiaOVvk+Oc;gS1}<&Bp)oTDNP3jc nPTv7_a|@H$lHcC{=Sc82^J4~6vAhG-5o9u9CGV9)yxTZ2ER diff --git a/pkg/ndn-riot/patches/0004-replace-use-of-deprecated-netopt.patch b/pkg/ndn-riot/patches/0004-replace-use-of-deprecated-netopt.patch deleted file mode 100644 index b5675cb3ad3386ce0d1f534bc003250b1f774f32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 834 zcmb7>TaTMC5QX3UD@H4|0&$5AAs4!>lHDY2Ri%xTM5?-4A!84T+XN6X>Gj9gphekM z+lL|q%y_e)_06DbBmvm-vdzxW*VZ``U#df(52V zE?~e|%!YB)2Zu6B$+}KIqtG$jt)`pXH}_CsdEf$}J|PqtNGvN9MoL1Cx+pavTeI?h zzWK1)B+Kc?WHs9+>$jigpz@POE*t9c^7QuIeA7-4&+|wlqcUH>F9^UfHG@nY5X7G6 zJCv@ejSyB^6}jcuO)c?Y7*l#SAyQ=-c-~HF;Jr>O?Y@Z0C4PelgT5F@-$%)CJPg5D zH7Pe6xKPA#9Jr8^33yTD4#8=kraTwQxR!a+{wCqIE)p)K)%0xw-L=ar(TwQtB_Z?X_swSAi;<_8llp;0X4NX!Y>;T%hHIcU{QQ%e&2P4^tt%5|41(u*q5p~m TtWwFB&#uf70SWw&`izj@e?ICI diff --git a/pkg/ndn-riot/patches/0005-use-ztimer_msec-instead-of-xtimer.patch b/pkg/ndn-riot/patches/0005-use-ztimer_msec-instead-of-xtimer.patch deleted file mode 100644 index 84f7f615a19f719ebac998c623f1a6550c556421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7852 zcmcIpdvn{y5&zrx6kBDIAt^op@GZ+4D-vaEN=q7v>Lh797!Wv+s6mhgK*dh#@7~?L z!;_>cwW-D?z`MP@+xPF5SJ8R}^S#aHLcZZX<%iv6YnP$H^f@Ar>0Y6Ltg|d*p6>Y;>`kpiZkLm`ZuEGAlRlI1&0uK^d8y_W-Z9uW1ZjKSr4<@ySHexB5TJ+D}Q?UVEr_^{xrEiDbEt+<>bf5549t8 z#uJc)fG2@SIKqDtE_me6$uc7M`2I*c-n+vuYKPM7z8xgtvpW6;Zbu}U6RqWD%RMX<8gC{=Hv$s#EG5w6dxFU0-n~mwH2XPp=zzz zSqj&3=2l|Q1M#e-tBQ^=ik}29hixDtaONPwB>I|)Rh3|$lm|TIa%x>prjyyEmUbQ&a}LgPPJ+QitF5Z%R2;8l|X|=Flz_V{sB~ zon&__%*l&(@^vF{&pdwj>{lg}W>MLqcrYep<%CIllSCv8rp~BQFI$}G&{o-@V}ZF+ zY6OxsPPm;Es1o!?I8smNJ)gIhD}o`}Z1r=Z8+P zbp;%W&{?~FxafrTO0<_p#W`;s{c1-v+d}ui;=cGw6k01=ek%3bUY=>k`Jhx34dxr2 zh9c=K!pP}tJ}2|7SDroM2x8`x`Nn-ZEq~%y@;+C1%0(g1b?jB}yVRj{;GNk2%8H)0j#JIdaistVE8G_mCZ{C$aDpW!o}LnRn=+EUO#B z^~`y@?eu#+#~YO`%Y?G#^DAk}G-bta4#=(redmUaF}8%;ng?s=vov3)liMmcAY!BM ze2)}uSG3>fDfdMM#+z26(m`-shqp<^0) z*-T6*W#d;CP3Q2_(O3tzSmj0Q8^ky|CE7$VIB*niA}d*3x7HHj#Kz0hz{gg+hiiBZmJaJSl3oh>u4W zf?-yJg=$E*#`25doDExn2;Z_Q2ID5(8-@rNy3Z*ilNHlINdV3Q(CN%>FKJ!+} z0znrU4@(g|*}+yI41jPQwh|F1h?1WCXdSMQCuUxZPeOl$wWp?ab$|ZB`gH!2HNC!? z5bhHk)g&4FGJ@D2aV%Awy8G1f z`v#uQr)*caS+ExAc7|BWcT>znXQ)8R98S`tTE-yr5Tx8kmzF>UJ&A<>iu|Yyrns@> ztat~U{d_mE$Xjn8XG*=aerNeBKq9MlKsr4(2E#u{wRTLGcm>=4q+olhUDPZg(pn_& zQJ1y={P8?RJN{tIx|7Qc}tiDc{L_UA7*6R?2^l95EqB zg6mRV9ZzLDpi;oHQn(kYB8*Y#@Wajhg++RNn4Mqz*?PGCg)=B=t~UFK;eIJ+XaaAt zSLct@88%IJmgAN9wyf@SInCT(&wj=%eSHHh=+?{HlWnGXho4G&2<{ENFHn1qF&K}W zvi2mU)Si4N?U^Ig+cADBgrNkS+?@Y7rK4kW1q?!X3i#(WzA&~;DBV^dM5fCE)R11v z2%)fC#!JN%apDHlfIE}v&txQIAZ}$ek+!H%5X*Mma+;$oXHol!sQ3$E3wiCX=FHeH zhvLv>WTa$f;UF@2+PSwP5y?&z)tjD4o17 z9*#Wr+5QSTK-zpwmGj^GG55}7@p)}?B^``(nc(I2{T_KAjzh|nxP=B!W0-u36)ds1S$+vK)*Qq{|CKv^impC&EymUsJV@w zCb_(aioln0GgXV-NgUyd)R*^p2E3JsUfGGWvw&3wR($?(h#31WRlNlppe6qn_P!+U+s+6?>x6){vAr>`;Bh9zkxCKFf^_@{dA4CPxW*t8XthI|wrVLuZOS zuFH)I{=~19K13R*9FJ)3DV%dG6kp<3M0t1axkOMHA{snJ}*oLFu zHmSY8p>7&tk9K{S%)i>jtZb@e*$4-Jp(r-q t@fS7Px^Z z14@hTftb>W%&koU(+2OD5*lGzF(DC7*u4_6PMJuhB@1i)ikvZn1=wM5}V3{q`T8`-Muz#BS2V1xZS7!o36 zT|*Eor2#g2>{~rnh*SdaAZ1k@Q<|5Z=E^MX;q-1}%5T!FO3v2<7yUbotU!eE|fIV@&qn7 zE7ZN-f0t%29+SXD%Nhpz9ci-$FZzZ5fV=C24>!2$US)%72q!>?@SS+iwD?21%kIY6 z?Dh4V!GSC4z6}L%rc`Te4{dvF$@_Cd-D-CS91h#q&+1@!+!yGaG@4tj;QjUG