riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8396 from smlng/pkg/libcoap/update_patches

Browse Source 
pkg/libcoap: update patches for git >=2.15.x
This commit is contained in:
Martine Lenders 2018-01-22 16:17:55 +01:00 committed by GitHub
commit 02ae3376b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 96 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/libcoap/patches/0001-Add-RIOT-Makefile.patch
View File

@ -1,4 +1,4 @@
From bc86f013bbfc1eca7151d4faa2bb9ca33987115c Mon Sep 17 00:00:00 2001 From e25f8860e73f9097ba613268644382d95902850c Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de> From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Thu, 31 Oct 2013 13:36:10 +0100 Date: Thu, 31 Oct 2013 13:36:10 +0100
Subject: [PATCH 1/9] Add RIOT Makefile Subject: [PATCH 1/9] Add RIOT Makefile
@ -10,7 +10,7 @@ Subject: [PATCH 1/9] Add RIOT Makefile
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
new file mode 100644 new file mode 100644
index 0000000..7f37ccc index 0000000..f424cf1
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
@ -19,4 +19,5 @@ index 0000000..7f37ccc
+ +
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
-- --
1.9.1 2.15.1

4
pkg/libcoap/patches/0002-Add-config.h.patch
View File

@ -1,4 +1,4 @@
From 8be22676f13bd7d254378e2c04119e1632ed55d7 Mon Sep 17 00:00:00 2001 From 64fc056031b36a6799c8f1fe28c16b2ef6bdde1b Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de> From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Thu, 31 Oct 2013 14:02:07 +0100 Date: Thu, 31 Oct 2013 14:02:07 +0100
Subject: [PATCH 2/9] Add config.h Subject: [PATCH 2/9] Add config.h
@ -146,5 +146,5 @@ index 0000000..8915dd3
+ +
+#define WITH_POSIX 1 +#define WITH_POSIX 1
-- --
1.8.3.2 2.15.1

6
pkg/libcoap/patches/0003-Remove-two-example-programs-in-root.patch
View File

@ -1,5 +1,5 @@
From e53472f0a5f15d2459bf9a9ef40d2b302bb80f8b Mon Sep 17 00:00:00 2001 From b6db366147714482c03753aacc522090a0f7b2bf Mon Sep 17 00:00:00 2001
From: Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de> From: =?UTF-8?q?Ludwig=20Kn=C3=BCpfer?= <ludwig.knuepfer@fu-berlin.de>
Date: Tue, 15 Jul 2014 16:57:07 +0200 Date: Tue, 15 Jul 2014 16:57:07 +0200
Subject: [PATCH 3/9] Remove two example programs in root Subject: [PATCH 3/9] Remove two example programs in root
@ -428,5 +428,5 @@ index 5dcdfcd..0000000
-} -}
-/*---------------------------------------------------------------------------*/ -/*---------------------------------------------------------------------------*/
-- --
2.0.1 2.15.1

4
pkg/libcoap/patches/0004-Eliminate-some-compiler-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From 48906fde395dc05c18606ddf3abce5947ab6a1c6 Mon Sep 17 00:00:00 2001 From be9ee2b0b8da10c8fb5eb67a6b3bdf1efe62cb84 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de> From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Wed, 19 Feb 2014 02:24:50 +0100 Date: Wed, 19 Feb 2014 02:24:50 +0100
Subject: [PATCH 4/9] Eliminate some compiler warnings and errors Subject: [PATCH 4/9] Eliminate some compiler warnings and errors
@ -67,5 +67,5 @@ index f9afd48..59c7d59 100644
} }
-- --
1.8.3.2 2.15.1

6
pkg/libcoap/patches/0005-fix-old-style-function-declarations.patch
View File

@ -1,5 +1,5 @@
From e6d36f466b2c1568cb4cfc3a3f1f9348e71db037 Mon Sep 17 00:00:00 2001 From 1fcbd0139432691f7cf1b2c26e543323097d14ca Mon Sep 17 00:00:00 2001
From: Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de> From: =?UTF-8?q?Ludwig=20Kn=C3=BCpfer?= <ludwig.knuepfer@fu-berlin.de>
Date: Tue, 15 Jul 2014 17:06:51 +0200 Date: Tue, 15 Jul 2014 17:06:51 +0200
Subject: [PATCH 5/9] fix old-style function declarations Subject: [PATCH 5/9] fix old-style function declarations
@ -112,5 +112,5 @@ index a891086..5bf2164 100644
void coap_delete_pdu(coap_pdu_t *); void coap_delete_pdu(coap_pdu_t *);
-- --
2.0.1 2.15.1

50
pkg/libcoap/patches/0006-debug-do-not-misuse-NDEBUG.patch
View File

@ -1,4 +1,4 @@
From ca876797dbe6ba05f75a451e8724495a0770fe86 Mon Sep 17 00:00:00 2001 From 50a9c4a0b04a556eddc58e94967453ed87811f7a Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org> From: Oleg Hahm <oleg@hobbykeller.org>
Date: Thu, 23 Jul 2015 10:20:38 +0200 Date: Thu, 23 Jul 2015 10:20:38 +0200
Subject: [PATCH 6/9] debug: do not misuse NDEBUG Subject: [PATCH 6/9] debug: do not misuse NDEBUG
@ -30,10 +30,10 @@ index e93003c..95da094 100644
#endif #endif
return NULL; return NULL;
diff --git a/debug.c b/debug.c diff --git a/debug.c b/debug.c
index adff3c2..e043225 100644 index 241a803..399b6ac 100644
--- a/debug.c --- a/debug.c
+++ b/debug.c +++ b/debug.c
@@ -86,7 +86,7 @@ print_timestamp(char *s, size_t len, coap_tick_t t) { @@ -78,7 +78,7 @@ print_timestamp(char *s, size_t len, coap_tick_t t) {
#endif /* HAVE_TIME_H */ #endif /* HAVE_TIME_H */
@ -42,7 +42,7 @@ index adff3c2..e043225 100644
#ifndef HAVE_STRNLEN #ifndef HAVE_STRNLEN
/** /**
@@ -326,7 +326,7 @@ coap_show_pdu(const coap_pdu_t *pdu) { @@ -318,7 +318,7 @@ coap_show_pdu(const coap_pdu_t *pdu) {
} }
#endif /* WITH_CONTIKI */ #endif /* WITH_CONTIKI */
@ -52,10 +52,10 @@ index adff3c2..e043225 100644
#ifndef WITH_CONTIKI #ifndef WITH_CONTIKI
void void
diff --git a/debug.h b/debug.h diff --git a/debug.h b/debug.h
index d18558f..edf4b86 100644 index b4dae5d..5226eb5 100644
--- a/debug.h --- a/debug.h
+++ b/debug.h +++ b/debug.h
@@ -54,7 +54,10 @@ void coap_log_impl(coap_log_t level, const char *format, ...); @@ -48,7 +48,10 @@ void coap_log_impl(coap_log_t level, const char *format, ...);
#endif #endif
#ifndef NDEBUG #ifndef NDEBUG
@ -80,10 +80,10 @@ index b034b6b..cdd9a20 100644
#endif #endif
diff --git a/examples/client.c b/examples/client.c diff --git a/examples/client.c b/examples/client.c
index bd75deb..7872c35 100644 index 903685e..98f4aa9 100644
--- a/examples/client.c --- a/examples/client.c
+++ b/examples/client.c +++ b/examples/client.c
@@ -282,7 +282,7 @@ message_handler(struct coap_context_t *ctx, @@ -287,7 +287,7 @@ message_handler(struct coap_context_t *ctx,
unsigned char *databuf; unsigned char *databuf;
coap_tid_t tid; coap_tid_t tid;
@ -91,8 +91,8 @@ index bd75deb..7872c35 100644
+#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED
if (LOG_DEBUG <= coap_get_log_level()) { if (LOG_DEBUG <= coap_get_log_level()) {
debug("** process incoming %d.%02d response:\n", debug("** process incoming %d.%02d response:\n",
(received->hdr->code >> 5), received->hdr->code & 0x1F); (received->hdr->code >> 5), received->hdr->code & 0x1F);
@@ -1075,7 +1075,7 @@ main(int argc, char **argv) { @@ -1087,7 +1087,7 @@ main(int argc, char **argv) {
if (! (pdu = coap_new_request(ctx, method, optlist))) if (! (pdu = coap_new_request(ctx, method, optlist)))
return -1; return -1;
@ -102,10 +102,10 @@ index bd75deb..7872c35 100644
debug("sending CoAP request:\n"); debug("sending CoAP request:\n");
coap_show_pdu(pdu); coap_show_pdu(pdu);
diff --git a/net.c b/net.c diff --git a/net.c b/net.c
index 7338802..9372570 100644 index 035619c..8fe08b4 100644
--- a/net.c --- a/net.c
+++ b/net.c +++ b/net.c
@@ -243,7 +243,7 @@ coap_new_node() { @@ -243,7 +243,7 @@ coap_new_node(void) {
node = coap_malloc_node(); node = coap_malloc_node();
if ( ! node ) { if ( ! node ) {
@ -157,10 +157,10 @@ index 7338802..9372570 100644
#ifndef INET6_ADDRSTRLEN #ifndef INET6_ADDRSTRLEN
#define INET6_ADDRSTRLEN 40 #define INET6_ADDRSTRLEN 40
diff --git a/pdu.c b/pdu.c diff --git a/pdu.c b/pdu.c
index 04ef9c6..05d8537 100644 index e3c9720..c55823b 100644
--- a/pdu.c --- a/pdu.c
+++ b/pdu.c +++ b/pdu.c
@@ -132,7 +132,7 @@ coap_new_pdu() { @@ -132,7 +132,7 @@ coap_new_pdu(void) {
pdu = coap_pdu_init(0, 0, uip_ntohs(COAP_INVALID_TID), COAP_MAX_PDU_SIZE); pdu = coap_pdu_init(0, 0, uip_ntohs(COAP_INVALID_TID), COAP_MAX_PDU_SIZE);
#endif /* WITH_CONTIKI */ #endif /* WITH_CONTIKI */
@ -170,13 +170,16 @@ index 04ef9c6..05d8537 100644
coap_log(LOG_CRIT, "coap_new_pdu: cannot allocate memory for new PDU\n"); coap_log(LOG_CRIT, "coap_new_pdu: cannot allocate memory for new PDU\n");
#endif #endif
diff --git a/resource.c b/resource.c diff --git a/resource.c b/resource.c
index 1d9cf34..101ea4d 100644 index 1b2657f..5b9e90f 100644
--- a/resource.c --- a/resource.c
+++ b/resource.c +++ b/resource.c
@@ -821,4 +821,4 @@ coap_remove_failed_observers(coap_context_t *context, @@ -816,7 +816,7 @@ coap_remove_failed_observers(coap_context_t *context,
list_remove(resource->subscribers, obs);
obs->fail_cnt = 0;
-#ifndef NDEBUG -#ifndef NDEBUG
+#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED
if (LOG_DEBUG <= coap_get_log_level()) { if (LOG_DEBUG <= coap_get_log_level()) {
#ifndef INET6_ADDRSTRLEN #ifndef INET6_ADDRSTRLEN
#define INET6_ADDRSTRLEN 40 #define INET6_ADDRSTRLEN 40
diff --git a/str.c b/str.c diff --git a/str.c b/str.c
@ -212,11 +215,11 @@ index d683419..37d4e20 100644
-#ifndef NDEBUG -#ifndef NDEBUG
+#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED
if ( inet_ntop(sub->subscriber.addr.sa.sa_family, if ( inet_ntop(sub->subscriber.addr.sa.sa_family,
&sub->subscriber.addr, addr, sizeof(addr)) ) { &sub->subscriber.addr, addr, sizeof(addr)) ) {
debug("*** notify for %s to [%s]\n", res->uri->path.s, addr); debug("*** notify for %s to [%s]\n", res->uri->path.s, addr);
@@ -100,7 +100,7 @@ notify(coap_context_t *context, coap_resource_t *res, @@ -100,7 +100,7 @@ notify(coap_context_t *context, coap_resource_t *res,
&sub->subscriber.addr.sa, &sub->subscriber.addr.sa,
sub->subscriber.size, pdu) sub->subscriber.size, pdu)
== COAP_INVALID_TID) { == COAP_INVALID_TID) {
-#ifndef NDEBUG -#ifndef NDEBUG
+#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED
@ -248,8 +251,8 @@ index d683419..37d4e20 100644
-#ifndef NDEBUG -#ifndef NDEBUG
+#ifdef DEBUG_ENABLED +#ifdef DEBUG_ENABLED
if (inet_ntop(COAP_SUBSCRIPTION(node)->subscriber.addr.sa.sa_family, if (inet_ntop(COAP_SUBSCRIPTION(node)->subscriber.addr.sa.sa_family,
&COAP_SUBSCRIPTION(node)->subscriber.addr, &COAP_SUBSCRIPTION(node)->subscriber.addr,
addr, sizeof(addr))) { addr, sizeof(addr))) {
@@ -236,7 +236,7 @@ coap_delete_resource(coap_context_t *context, coap_key_t key) { @@ -236,7 +236,7 @@ coap_delete_resource(coap_context_t *context, coap_key_t key) {
for (prev = NULL, node = context->resources; node; for (prev = NULL, node = context->resources; node;
prev = node, node = node->next) { prev = node, node = node->next) {
@ -260,4 +263,5 @@ index d683419..37d4e20 100644
#endif #endif
if (!prev) if (!prev)
-- --
2.5.0 2.15.1

5
pkg/libcoap/patches/0007-fix-option-parsing-with-debug-enabled.patch
View File

@ -1,4 +1,4 @@
From e5adb25f18ff979b2777f7161b1038611c84a450 Mon Sep 17 00:00:00 2001 From 398ee4df737c7eb21feb8ce3996096e014d974aa Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org> From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 4 Aug 2015 23:07:24 +0200 Date: Tue, 4 Aug 2015 23:07:24 +0200
Subject: [PATCH 7/9] fix option parsing with debug enabled Subject: [PATCH 7/9] fix option parsing with debug enabled
@ -23,4 +23,5 @@ index a03fc9e..b825eac 100644
case 14: case 14:
/* Handle two-byte value: First, the MSB + 269 is stored as delta value. /* Handle two-byte value: First, the MSB + 269 is stored as delta value.
-- --
2.5.0 2.15.1

7
pkg/libcoap/patches/0008-fix-debug-out-in-PDU-parsing.patch
View File

@ -1,4 +1,4 @@
From 3409c3834022c9e7cd73ac69e34dfaa101947cf0 Mon Sep 17 00:00:00 2001 From 2e896e0e744102502f8243c83d4cc13a4cdfce20 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org> From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 4 Aug 2015 23:09:27 +0200 Date: Tue, 4 Aug 2015 23:09:27 +0200
Subject: [PATCH 8/9] fix debug out in PDU parsing Subject: [PATCH 8/9] fix debug out in PDU parsing
@ -8,7 +8,7 @@ Subject: [PATCH 8/9] fix debug out in PDU parsing
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net.c b/net.c diff --git a/net.c b/net.c
index 9372570..86c7793 100644 index 8fe08b4..0b8c99e 100644
--- a/net.c --- a/net.c
+++ b/net.c +++ b/net.c
@@ -930,9 +930,10 @@ if (!coap_pdu_parse((unsigned char *)buf, bytes_read, node->pdu)) { @@ -930,9 +930,10 @@ if (!coap_pdu_parse((unsigned char *)buf, bytes_read, node->pdu)) {
@ -24,4 +24,5 @@ index 9372570..86c7793 100644
} }
#endif #endif
-- --
2.5.0 2.15.1

5
pkg/libcoap/patches/0009-delete-unused-function-check_opt_size.patch
View File

@ -1,4 +1,4 @@
From 4e065c420056a5416d9d4b00439042d7adcefddb Mon Sep 17 00:00:00 2001 From d44530b311ff5bd9529f000c2a1781630f6ae576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com> From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Wed, 16 Sep 2015 19:02:09 +0200 Date: Wed, 16 Sep 2015 19:02:09 +0200
Subject: [PATCH 9/9] delete unused function check_opt_size Subject: [PATCH 9/9] delete unused function check_opt_size
@ -33,4 +33,5 @@ index 0b8c99e..18f39a7 100644
coap_read( coap_context_t *ctx ) { coap_read( coap_context_t *ctx ) {
#ifdef WITH_POSIX #ifdef WITH_POSIX
-- --
2.5.2 2.15.1