From 82c7eac0418b857d6ff751dd9c065da9d2e905c2 Mon Sep 17 00:00:00 2001
From: Jose Alamos <jose.alamos@haw-hamburg.de>
Date: Wed, 9 Jan 2019 14:47:36 +0100
Subject: [PATCH] pkg/wakaama: Bump to v1.0
- copy basic objects from client implementation
- fix pkg warnings
- use lwm2m_strdup instead of strdup
- fix alignment problem in lwm2m data struct
- add fix of acc_ctrl object read
---
pkg/wakaama/Makefile | 5 ++++-
pkg/wakaama/Makefile.include | 2 +-
.../0009-fixed-warnings-in-observe.c.patch | Bin 1787 -> 1812 bytes
...13-fixed-warnings-in-example-objects.patch | Bin 0 -> 3932 bytes
...4-Use-lwm2m_strdup-instead-of-strdup.patch | Bin 0 -> 932 bytes
...ed-alignment-problem-in-lwm2m_data_t.patch | Bin 0 -> 756 bytes
.../0016-change-liblwm2m-include.patch | Bin 0 -> 708 bytes
.../0017-fix-access-control-object-read.patch | Bin 0 -> 976 bytes
8 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch
create mode 100644 pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch
create mode 100644 pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch
create mode 100644 pkg/wakaama/patches/0016-change-liblwm2m-include.patch
create mode 100644 pkg/wakaama/patches/0017-fix-access-control-object-read.patch
diff --git a/pkg/wakaama/Makefile b/pkg/wakaama/Makefile
index 2079cf4e5a..a49bb8d815 100644
--- a/pkg/wakaama/Makefile
+++ b/pkg/wakaama/Makefile
@@ -1,6 +1,6 @@
PKG_NAME=wakaama
PKG_URL=https://github.com/eclipse/wakaama.git
-PKG_VERSION=ee80c224622684ee47c17c57918904cffd00c4d2
+PKG_VERSION=da74b3c91570b9716fbb424e90935806b2b29814
PKG_LICENSE=EDL-1.0,EPL-1.0
.PHONY: all
@@ -12,6 +12,9 @@ patch: git-download
mkdir -p "$(PKG_BUILDDIR)/riotbuild"
cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild
cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_BUILDDIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild
+ cp $(PKG_BUILDDIR)/examples/client/object_server.c $(PKG_BUILDDIR)/riotbuild
+ cp $(PKG_BUILDDIR)/examples/client/object_security.c $(PKG_BUILDDIR)/riotbuild
+ cp $(PKG_BUILDDIR)/examples/client/object_access_control.c $(PKG_BUILDDIR)/riotbuild
echo 'MODULE:=wakaama' > $(PKG_BUILDDIR)/riotbuild/Makefile
echo 'include $$(RIOTBASE)/Makefile.base' >> $(PKG_BUILDDIR)/riotbuild/Makefile
diff --git a/pkg/wakaama/Makefile.include b/pkg/wakaama/Makefile.include
index 1bfb90a655..7c3de093bb 100644
--- a/pkg/wakaama/Makefile.include
+++ b/pkg/wakaama/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(RIOTPKG)/wakaama/wakaama
+INCLUDES += -I$(PKGDIRBASE)/wakaama/riotbuild
diff --git a/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch b/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch
index 177220af93168fd7cd94cdf30614bd9e2b58a4b8..8e39b6f6fe1fc6b31dbf58f73fbb896aab3a4b86 100644
GIT binary patch
delta 212
zcmey(JB3fzttdZN!O%D*$;2oz&C<{;+1N16GRe%uz&z0;%`D9#EzQEfAk8>2+1$)B
zX`*hVo^O7hj)J*@Z(^l_k%6Iwf}w?#k(rf&g@U$$k%0kMaA{IjYI2E{LUe#*h_lDU
z-HQYa(u~p!Q&RNwEG$ed63r|o=Q3JwnCO@(Xd9ZDOkT_AsHgx0Ipw)Vx$*f)#i>PQ
zsVVU#3R(&<PJs2~_l)~EO^tQT6|~JvO(t`)x=t2gX4(9oiHV8B6fA0PwwaUl6C(gC
CcRUdQ
delta 187
zcmW;D&k6xS901^UrIsQ$j=#Ib{O14cO(LbFD9LGejDwOAF3LM-<N+MK0B5h@fn3P(
zJA9Y&r_|_eH)}AK5y`j{Txd;|(~cQ!Qz28n6x8rkVuqQa=f+G--695RV7NH|C8z*J
z!dSv3)Cm$&9PhK0v%3W5qxPiJ2Vz=C&(B*$AzEBuv#FKkG&6n~=!nI?hm!ew&<>71
g3SR|oVg+?6$m1Oj!U+FT)W5^7ujQ(bQ~nx!0b}VgUjP6A
diff --git a/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch b/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch
new file mode 100644
index 0000000000000000000000000000000000000000..280f6e6c2fb77a4988eaaf900e88292c921b0fc1
GIT binary patch
literal 3932
zcmb_fZExE)5dN-Tam!G^jx9%$<=3okvt(U7q;Y__+lRIgD2Z~o%9KG-Ns6`qeMgb<
zOKc}zF~P88@_2X8y*=_fk<Gy)p_lYLkGOru>x8t^Nn9`S``)0}3A^2n-;Ze9>4oq<
z<8VtC;P$|AhUEu5$8oK9sAdS~cY@`T5f1MOCn@|g&nVAm`j+t|6LTWjmsY`<9SS<9
zycN@tbwMN@!nB}G7{DKR(sSHCxX#e)4P74^j_WwqZ4v%WBRPbRH)qrH%g>OoM;gNe
z5uEW^4vYhRB=bc|AuA<w%d&0Ts#f!pC}ot(6TKUdD57~DL>ZSNOIs0q1Mr}+|3FTo
zLNNIiMfLR!+%BMrjcc#HoQiuYmWKiDd1$Y^HZ<T53)%=Tr8z`*gwJT)gdPG!6_RB<
zuQlpTXtyDzDb)*h-LhhqB<RkJNgyXC6fc4f50$hSkLe>gop#6X#;ul59M5m7EID1@
zSCKy4s)eB8aLaGsg6(zPW)B+rh6}mGLW-bZT=oMA3vnMjU~*_6Xr2`UQ(IGeZWlK(
zaFXzdjxmh52E3SK#gV3E^0>NTO$3n?X&_i2kAXyglJp9z`Ig*Mc#XfKbKIS<8+&A)
zjlk(nU3-L4)Afg|D?DS_E8F@>`6t+^)p)v5@SM#!7JMb~Q~=V4xi=4DM5cVti*TCW
zp9w*}qCIIIKeErQdy*EkMe_4Imc{~GkSHPL&6Y}*K<(M1QC6VCuU~^xKdAoJdT4L{
zS2CvN29BEyJlbl7N!UsHor7v_P0O>@wkD_Q%<m1Fsx8&M3%GKhu^6Ik@inL<13f@$
zI^JfQNH{iQ=Yr<4X_B$Ec`I~~zgvJG%PzIYEMKJLU;}l_{>QR^W=TvF_-j1946Y`>
z-|A9I76R)dspT@x3UuQL;N(>?#Cfe}m+?{cf$oWX_(^=?M@_R~kI?1uMg3H(TSBhH
zv73&UXR)qoJ0<EGw>_$ksU9*aAF%2u)T$l$NjC$6Qq_mRsv_J0r36#rsg951A-pP@
zfP)zya>SMYnq@MVf-LkxewPVZiD?G7%+h$0BvUp=)_GOv0IUpG4pbn@h^!*ELWT2W
z`&8xGhS)M>_6R-Q(6#ax-oTL*1wDcx93>>p>Cv<LHL{C!ZCm)NL@G>`XZzDuN!TM!
zAFG6Y$6BKt$;Gnq(J~E@Qo;}Ih?}~Fi7mrwvadsnQ?#<E3S?CZhcMZaPM?`0nsCh&
z@e<@N7pF+v>w3{3JaCE_9WTrfBc&#Y+i`GmG}LXN2FMPk(!K}S_fdxL1Us2Z$E)Hu
zWVIs2jFdrC41g2?nj~s!hSaM-j$^|edf5aT*Yr`X2P@!wa&{AVPA52@Tu*<yo-W7#
z$qDul$U6$!OCb3de7^#GcPm$uB2CS(fH#%`+-|E;*=YOTOMvMkjv-0+;58*;f>Qx1
zCypdyM&->D%wdrvRBYf)DWA!^C0uh(SG>wmu&%bQCwPjr7bN(4Q`=dVtNt3t*iJeF
z$cu`?74sPzbr4h*g6qiojvri4rop?(hwBUFwhEN*^)<J&{cUb3z0(f-AhSf+X6o9*
zEe9C*F=kPU|1+;_CBu~4*znT6l<5d<4vtM`(e<;`^Z)QmIcsmrH~5N6QkLM$x2BLL
zc6o-(JJXyKVlkN?2a?OC(<^v8DdrjBCsDLV8;+x!8iEP3J*q(LAeyJ52H`H2+EQx*
zu+Bc4>h`5~Q|ehB+Is!M34x5XUgm008jVQRWpljnh5rVTi11IBI0ggau!G9fS}<*}
Kyq4SYE$d&5$IdMP
literal 0
HcmV?d00001
diff --git a/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch b/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ca125ed85443aa2dda14e847188ba3878254bf98
GIT binary patch
literal 932
zcma)4?{C^L5dH4I;y%Jcf)gbK(hX7ZLq%&e1g)lOnj$;CP>;kxiP<`B``_n4VWs;}
zEKByC@7~jU=UG)2;D;jYW1ptT`;^fh(v%N4<zW`4gJ2-2&xMzI9>k@B6>h-|fzoKd
z!K2hAGXoRB__30;mP|p+6wBd#QKBj_A4!#!Rl&5}I6Eb6USWaC5jZ3hrZH-8I}pGO
zxq);0;096PMJ@%4x|EXDj(@{cNAP8FeK)@O3imZa{-f}Uq}G+#ZCh=Ss@BK^lo=dz
zgxI!C0H0W~&9UyLxkRPA<sK}lG2K;C|8!FL4IWsg(uGXs2<anJYZM(58&s^cELF>D
zH?hDR_o3Y;M93@y+g?iztot?#f4hcACGZJ&#)GUMIF1;&Sq}p+CiHy2k#h+Xu`CNN
zVH=IW4t&}P!8#l!aj^B-BMt9hjr!zOa>%!&(qN4Fj@4Xr2)taHRi<NM50C!Fr9k)q
zx1VD#PFB<L{c?Wyki?%R(`2!nCaat4<#dvKoIYHg1IY|pyk69sxoDri{37;C#^!!v
z-R^iU)44E%HnTOn&!6FlbVaPod(XbuKZMr+|FhqsI#B1RP9k3E`*SX;k-M!oP3I73
N+sqn>=eUkf$Y1Ln7kdBz
literal 0
HcmV?d00001
diff --git a/pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch b/pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f2006b1c7119ded27b6fa74c9d41bccc7291d908
GIT binary patch
literal 756
zcmZ{hVQZW~5Qe|+uXsN;7>%n&JyXh+l+Zv!3kmc?DaY!Lcbn*X=-MVE_uo63UPzO4
z5EkE=dFI{Ov%YI_tixL8Sss^JoKUVbQ5Bbqco9>c=qj(1I-^n&E;@@#+CpXs!(#pr
zg`pH@j45!s>CNDbvba!IHF)24WIJk>#@1cmDratj(Hg((sU;g|`XD|jM+Lr<K7>rU
z?T&dehm=Lk10r}K^Tp*@UQ^`?{P_0q>h$wZ)aI5nRAbhbNe<h-D;sKIESleK)ULF0
zYUPCReP5vJdOB)MIj4dR9>8GMC36}=wNZ9GJK+9-dS^QO&O2a7(A3cU>mLZAO<lwH
z*Tz8|y=0az6=AHVTg0_YRjPyFI8J3+){tSCCdp*%HAQ%yhu5U#5`MH;9A@yQBLxfY
zZcCbK46Yw5ht>0I|FeS=0r6&)z`gLn@w}C(D>uWrZ;H`aCsWoqjNXfuSM->_7n8d<
zirAJHN0Lpl@RqB``iV2e6Ste6_S_Cm*^18hBc_@i)bO>u{$lLS-@!ZlQq4#w!khB{
WHNKlKy<ZX8vE_Y3M1c$vA^rgL9^q&J
literal 0
HcmV?d00001
diff --git a/pkg/wakaama/patches/0016-change-liblwm2m-include.patch b/pkg/wakaama/patches/0016-change-liblwm2m-include.patch
new file mode 100644
index 0000000000000000000000000000000000000000..671f570c41978643b7f76a7388b1806e211d681a
GIT binary patch
literal 708
zcmbV}Uu)Yi6vf~5DGu37Q%AC7D{*2<@wP7OLkoj;Ph$*Ox{fvcr+5i1V;_EUn&CaQ
zP!N*Nx#H;Rr|r<Uu&K+E)XJsS<x)9IW|Qb;x?Zld&WtWM&a7OrUgNg!a7PbN8KlgQ
z1BsN1Z9`0s8#0|6dfb@qx2M75qIq^ib8?E>Jo4JK<zd(fN0;o%>?t2}7tq*J8RFCi
zD#>M%D~(7hDcRkj{7H77<J*___aCpn!`7zT5gK1Mk8RS58osm5!BJR21Gl|-;3^fC
zG0r)I?FWh{|G%xU_=5ydIHXYdhECaT5w!1q(XjV@cNWb@?Wm!n<a5THuPSi9^Lv>1
z#S6+8%glF<o{$B~IyFM9bXJyub$EEdKlcAhK8vCVuiQ}-;Ci*l5FO{DU|@Ln587-(
zBkEZw@u?(4JYk+8K1bCLIAZ_Nnx^UP*&N~9PgXS$1>-zs(UkGFfU!eImG1~wpFVv3
S3^}%3J&V8vED<Ubiv0!XP|bS)
literal 0
HcmV?d00001
diff --git a/pkg/wakaama/patches/0017-fix-access-control-object-read.patch b/pkg/wakaama/patches/0017-fix-access-control-object-read.patch
new file mode 100644
index 0000000000000000000000000000000000000000..69ff6dfce6d476b9446f37f50d404dce8ca289b5
GIT binary patch
literal 976
zcmb7CUvJtl5P$clxTgsg65=!vNVkfL4XsjFq806>sv^g}fH&hH$DwE%-+c}+4Rw29
zkrn$+zdz^m%}lihyec`vXcRFq;xrkJN)e7C!3Xgb<vgL|IL2Wt7<{fYJmLmu0%4dQ
z7DQo4$;`>5aF0w2Q^7scKO`Cn@6<69s8eRLVlV!Rt&7Gi1A#Z>1GAXIqQM@}G0d=V
zdhS4z^lF$6LhwQwhUBp+z9F|MJY~0w>8EEX<qjC<Sl7TSZB3=1IzYf66NLD_PXKpp
zy-`^Axss@D|A@$sy!^xqIQ)bNJcp-FRw3{e(@PYtAdtF7V`Zf~Ubl?}Dm;XKmk=S#
z5`2FtEwKKjUd5$IBDKIBU{ugDNrHgJW8_f`t{uZTZZCMbEAc!JE_a?xz#k8K33!LU
z3v0`)<j_cMN4bTK+2%Fc+^TIyy{w~kE|_JxeGBcL_1dS&xiu=UWSe#2)J1cdbqT!w
z>ZVwzZT4j3b07u0|Be14Gyle5eWz=CC$9e{o;joDmB8GU*Ex9|*r)SXrrP;>bLP~2
zrMD;kd0qdKc0JH;;5sLj9z?z4b)A;?-((~Iu+PbEer;nkOy{>*9)*K^I)7Mvd{~^-
YyFa#K?`Vaa_V3qj7=T0pO#(`O0i!4_*Z=?k
literal 0
HcmV?d00001
--
GitLab