From 24b63bd9f0225abd54c03a35e7f8f56bba1193e2 Mon Sep 17 00:00:00 2001
From: Martin Lenders <mail@martin-lenders.de>
Date: Wed, 19 Feb 2014 03:18:46 +0100
Subject: [PATCH] Update libcoap

---
 Makefile.dep                                  |   6 ++++++
 Makefile.modules                              |   1 +
 pkg/libcoap/0001-Add-RIOT-Makefile.patch      | Bin 0 -> 922 bytes
 pkg/libcoap/0002-Add-config.h.patch           | Bin 0 -> 4361 bytes
 ...Remove-two-example-programs-in-root.patch} | Bin 18777 -> 14676 bytes
 ...te-some-compiler-warnings-and-errors.patch | Bin 0 -> 1757 bytes
 pkg/libcoap/Makefile                          |   4 ++--
 7 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 pkg/libcoap/0001-Add-RIOT-Makefile.patch
 create mode 100644 pkg/libcoap/0002-Add-config.h.patch
 rename pkg/libcoap/{patch.txt => 0003-Remove-two-example-programs-in-root.patch} (75%)
 create mode 100644 pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch

diff --git a/Makefile.dep b/Makefile.dep
index c1e1ba5787..3ab7ee9882 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -1,3 +1,9 @@
+ifneq (,$(filter libcoap,$(USEPKG)))
+	ifeq (,$(filter pnet,$(USEMODULE)))
+		USEMODULE += pnet
+	endif
+endif
+
 ifneq (,$(filter pnet,$(USEMODULE)))
 	ifeq (,$(filter posix,$(USEMODULE)))
 		USEMODULE += posix
diff --git a/Makefile.modules b/Makefile.modules
index c7380ba3a1..30600b2560 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -4,6 +4,7 @@ UNDEF += $(BINDIR)startup.o
 USEMODULE += cpu core sys
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
 ED = $(USEMODULE:%=-DMODULE_%)
+ED += $(USEPKG:%=-DMODULE_%)
 EXTDEFINES = $(shell echo $(ED)|tr 'a-z' 'A-Z')
 BL=$(USEMODULE:%= $(BINDIR)%.a)
 
diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9481c500c58d59153c5f79db87694f14d57c062c
GIT binary patch
literal 922
zcmah{+m6~W5PkPo%mWXgki;esXw<EsT)L5<thlI^stP&I1l%T0l!RSY>c`iCg4n8*
zQ66H?_?$CyW|F4~1P(@Sk4KIp0=E-6t`6R2ZqQ|67lW?b>#`0C4zpCj5;I_3pwv5l
z(4v%)iH7lD#`97tn4$_XFW`N`W!z7Wmu7srv_kwqM!ZB1R=a%@90qeyY7piCb3DiO
z7zKkeO388`{6JB9@a<`^8a@KE+uvajhOqGGE6w#2BN-zhrfHJP5q?1jj4B8)s0u*r
zxY}aa)Cs8y)Dlxw)QtuKk)u`uNg5((Mz`I*;1CkZC<4>m$`ZJJW`p4JOBBAG2(I1}
zsarqj;T*%VqIWdloK+gZ4)NJm`#2_A-8E3Z4<>Euwpp_S{XQ{f^U-=b_8w~WVux`I
z0WVPT1ff<Rt`{SJ(P$9E|2&+oN8=?J4`BMWdNq}ggXOsK_GA~Yg)Nnc_qxe9b+$-z
zypalX`K&FxlNEw7df2G#jXII-ZJs9^ktRv1ZWLAe6qb5Ag<hW5J5_}|#OX`MFKG5(
zO`YK+BKByDb=r3jHTOnOIr|4rmTJ2HJU`{LO8uV+6Jt1;4nCbs8GZ3rkDI6Y(*H^f
ZVw_F5vg)!-R%Nl?5+Ka#S&r2r<Tts?5{3W(

literal 0
HcmV?d00001

diff --git a/pkg/libcoap/0002-Add-config.h.patch b/pkg/libcoap/0002-Add-config.h.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ac8c7a7604e918ab6508ec051b9fc95506070fcd
GIT binary patch
literal 4361
zcmbtX?{C^j5dH4IVw8MnS_0TWel&`zIN%biV36&!SDjAA*lXCU?M2?DIZpS-->eM@
zP?Bu!P!t(#zkTy|X7<hJf@N?yC9T%^#d%`1r}0JHI_tDAE=eoWJBIO*80YO4iO<gB
z3mCE-JhA}e0(AYV{DYRR8`@`txq@L>2%5uy<S{8YTxTIoZ?f{odRqP1h{-3d7YcF(
z{(N}~Z39M;KoFx1M(0XzUFjE4(+yqMyyf&y5{WDLeQf&OJ7_gKe}Eas5V1U=v&LN0
z>h-$z_!a&E1L11_@1ubM2~7z^^Dv*0__PG2IVTt!%lS#|JuX=g3;{A06F{oxoz5c*
zO^a!gK)pVr0>b8oD@-3RwVXUuOKiQbQPk`&RJHsx8kZl9vp8<c2%#C1pUr%krW%H}
z4Rmt@b^TO_nsF*4zq!$B%@2=E8UTHglLDE>kjQ=BkZIs1O;_u$%YxvOADX-G()_vC
z<@441;Zm?U330F203}3^Bs3>L6PPY(8q<6R%bfniga}hOp}8PMj#qP%E=U1c7!~aO
zX8GeKs*r%$4b1U)U<LP%{nc_ka}eC#+k;;D*!CiV;cnqdE4GAr_>+K`6SxkGMc70R
zqA~x3>qvs7-i`A8V_ZQJyfeRAf$5ITz;-M@xC2A0DPVJ%2nxWSXSu4VlNk|V92YcC
z*gHs;c_dS<qKg~4R;47|w|ukLb8YAINKp+`T&xy^zs}iqeE<8{@)Wh0L@ZpqgOpB-
zuvo!KJ(WMaKS+CE-*!jlSdnr{Gb#=f-jics4{cu(mihb4?iIjST#yVighL2@=U#G-
zF#WSdDCiVxeUgP~%AzOjPa(`>tp)&?VmdI)tKxxjtQ5J>P6`dp!C=${{n_=mGBYC?
zD^>@0VlS|vH5|F$Uk>aEc!I#3h$sGscv?fx^3}2&YbTzn(8S8=-Kw&@Mp#*vSepm2
zcVtE6vMy~$H61xg@wnL6U{6=i8dzQbrF7X+m9yx_E2?^<?iW>6xxj9y&^tW8hoz_(
z_BEnnI=?O`qGA;)qE5IdqL7m)!wTPRNISda`EJ+rtnP5EmRJaj2g2df-UqgwzG^E%
z5hSjP2-rINZxA6z-}0IQ&cJe%!k4NR(Y$yK(Cyy2N`Tkc*_u_BD#ZTX3#xQgjK4w`
z;o+3sFD!}fn=)-*=*3UPRe}qe5jEnzJ+$6JTk**Ako8;6yplEA87w+A-soVk@Kl+r
z>G2jVRJp#uQ+g`tP6+4lfaf4VV>g3>ELb5pB&<N!ML8_O=tnpsz~^k4#xTVzg57TC
zz#N<1FJ|9DH`jNq@yPYz=;)VoQ?8ew+l4&L2(V-a{xF_n4lOv6r#d>2*AVe!2Wdyq
zVyU5Hlf$O*h!35H(J&6L!q8aqRW@a*)S(b>h`~2qg)rs}HCafV_k};K%)L8!PUAOe
zAZ@rka^UEh;D5E@rsLVr-S*#nmm=0hH@LIR9zySTyKf`6=LNTR-*S4k=|~s0S)qVM
z!6HmXOgt_arX@VEBF6tz%*z2FV_cNpjni396B>oNz<CD;wuBa3z)4Df5S(T4WtN80
z>47&k-R>z4D&;L3hm>?}WRG#Ys3wN^*|`KAp`1cCj|Gx=P%#ezd2@XW_QS%F;}~!-
zrU_n<l#>dn9D??qEzK<=RTI+Q&8o<rkSfGIKU^%*pz^trtgJGu;WUg$hIRUQ$Zyr}
zl9RaFvZr3Z1~|~-C(B&wjk6}2oOg1Gs>N?+kC@?3<xH%#*aznHZxV<@XUF8f;q3r!
cyu~-$zYE4A&;AWF4o7RvXk0ehjh3eU3r2ArCIA2c

literal 0
HcmV?d00001

diff --git a/pkg/libcoap/patch.txt b/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch
similarity index 75%
rename from pkg/libcoap/patch.txt
rename to pkg/libcoap/0003-Remove-two-example-programs-in-root.patch
index 45e6b8a0cb1ed7995d4b715f02cc5d06a82c7dbf..08b5bd9b1670a044b13ff54a38568dcef72f4a0d 100644
GIT binary patch
delta 441
zcmZ{e!AiqG6h+bH6!$K#JH;lQ$)rshL=;6_SQOihh>J<`(ngX@n55N(&~MOwfFI$n
zxbbg{Z50uG+|9f1@b3M1*?2eeGoy3(ydV0#eki=2BO{+8&LdaFt|O%Ixb)&s@<fIS
z2D-qIN(c{}2TQ@>T(GY<0S3y{X@LtWVlovDa+PLB`O>tqm1)Ox$WB#F0Y;N)dk!gZ
z8P&}fAtAa!Bkp0J3(nba8s1Y>2e`dD9-W*+cHBE$Q?6%(`ay#pRbFO<(&({Kd4(q1
zXk9aASr$X2RcYz4A~PdnM|gtpyJ$|oX7SqE*<PbRAR5$hI2O+>f6m|_Ni(VtO;j<a
zxDA(g5mQEWs*7sZ+GDGYkn5PxH1E0Y-}L{P?^wp-G)bC%<FtnAtlPio%^PpavcQDx
J+tPLz`vhmvf{*|J

delta 4584
zcmb7I%Wm676h*q!rri`My1K9p#Ez_2o^9b2rX^M;q8CUxMOO5P97%*p4lzU7Q5T(m
zXg;OC(oO!RcSt=biL@Cn3_3G&=FFLM@7$aJ_}71)ow(j~3boqIi-9!y<c>}~pTcDG
zSqbUGmmj|SNjB4;dcE0t>%MEft<-8YXt?yg5iWecQmt0At1d60);w=QwRQd)E-x$9
z{;+e?(|>z^aw_K3_hCW=4M{-Z<g|Tbb`10EtWq@w?cPmCx1jnSYR1W_X$;3#nx&sX
zO=kaWh^1(Fq2n)Hx;wGqFis1GT<+adUbJvM>Nu@d^Rpe!c2VS-O2dg34Z;K4VL`yc
z-C3JSieN}%)JMc#xO`%k@IL$OAtD>J#@?yKQl@wwrSzBP%hsFMPe9`4HVPdb0EtG#
zaKA^Er{j^LztXr;tsGU?dS|X><C40%&VRo?3*UYD`{(a}45!|#K1V+|Ed4xm(Hr+I
zC9i(Xb<t*3#zn1{za~Cvynyv^9iU4?%1KOJm~s|uN4yXw%hjI?PI2aoMy1+#A+uA8
z)~f|609nLrPKitT3PE8&2V*3p;7wt&@O;+`XRrtpYY`t#y)dRc#4n{j<q!~uv$M_q
z$BWRVQ_$MBHX8MG`(|K#)J;q4*;hA4uanHn?h-R-sjZf50dsOsA)ZsXAUq;?IW(@%
zf5(j!Lr{TRPu3sf4vOKm_EEPrbEMhEKp)%J(2{tQnIjZ{3qg4qWXsac1hxd~?Tp66
zl^A8=ls$*(B6MPpg(+bab)`!}xvP)0PRBF`e+*0NfuhIDh>EA=kUB~+9)B9?mXf0k
zZ-<fSIr!d$6TXDgny>!hESGoBxM~lz(IcE?_7Z(B@Zx;RdxG?gzA;vem5U25kOStN
zm<H$)0R*~(8%5ed!v_(Gy$NRZ+dvZEXU<msb0DExsR966p$QDl#UDJ8=cB&X>kZq`
zEF_SzXFvnSmpPY#{@XiRU+)jiPmdpMi+qd7g2vke<QN_iEq$DSxpF^{FofJm4$%Xi
z7(kt?vNSIcRz)X<=q|R*Qx>6<_%sG(Jt?S9odXs2l(qDp-X8B-Mq*aT4f<QboVzE4
zwTA5vMZ)guDq_rwhdD$l1Mj3KYuv$zEP3z?ghf;DYMLi0qGB)}qRN89$K1gO%n2~k
zcQex-SF?@PNV`AEch{i^nC)iS2$uy(+8SfF>z2()D1!nnBZGp?$RJm5SD_4{Ps67)
z81(c(DFJSgCwJz23n+8q70+(Augy}37pksGty<#rpDa7|>_!2(dA)NLNa160Xxy}X
z*m<Qa1wYo5cOOa1+uWtVWh3?iT8{eI=<6HeC3u&403{X#iubp?fQcwr;9%^PBaS5v
z#$PUVnN!P@Q{-FJC?+d+lg}eeRhdOxms26&0bfPzi54^9G-5m!Fl8JIF;755oI5h3
zAm(i0yD-5oig_<_#5#A3wDt$Bt7C!Jm8L!#nqxRRI(SCahEwdMAnA(ObO%2laG>>d
zI8v`XmLyLh;zJMj68j&lx}X$%nv^yh!0URm{wjYPhVP141{3BhC3swP2$@O$Ygxvc
zS>hmbhP`5>q~6y)Uz;1Vm!q;w%4gLDmR3Pk=f-dVM+L_}bhI|G3}|P|a<S$p)509X
zqitX7S_iTB^WL9Bvt!v;Mpqwn3~i8ot~o@UIp|1qpNO&1MQbwd;%_gWCnpP-h?8<o
zc(c%(dJYL=?1W-e&Ep~ldFp$26#5KTGoPsH53G@9w$HJJNrnt;U;I^hdyIWY+Df>E
z4GTW!sy$gxvlVkYrEc45a5V(Uxn$;GSbZM@4e>u9@Pqn-rcg<Hv?oGZjRA7ReNv<h
zP*PKDky6CHDw#*V9S~n)^{eQrV8dAUi9-X7*Uh7!iQ|Q!ZhCFox(X2#Ku)^9U4%+<
oY(%l_d9Jod(&i>7y9_TY#M@cPv5zdgzo;GOB0maPh_?m&A3EoI8~^|S

diff --git a/pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch b/pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9307d10c17d0d1f6aa454df5459a6b193493c6d2
GIT binary patch
literal 1757
zcmb7EZExE)5dO|zacjO<wk1=xEL+Z2B*+%jSd$cpixwCLff6Z;n_fJTYBFs5?>kcR
zWH;G>34$pf?~czscMoryx`bdI(J<p;5iNO2m#M!FX~=oDU`Z;LQLti3$ow>fySjo$
zaR7e>ly2+`b4q=3i)l7+#~LjwcrPk08U^2$OcqzAHM&J-^tgCSzGqr&;FI7}@FTbt
z2`2Fap!3Z<*eoebs81<*Y?EI^syFb{hwI(VI|ydM&+tPbOIcw&sJax8*5yGKqJbyY
zRI=JDU=;_^G<Bm0ab1@H<Gc|{c{%(E0Zi~APzmj&V4ibZ-rLsJZ(`#Ykl_gm(wtR$
z3wZ&uQUXh@D>a%pQ&<2Oh3Njf4k27-8My9VYGAYB{ABnh5-ECyfG*|%6`n`M%3o$a
zVBKL57~rRo1VO`T^wkx(J`JZKOw8g_Kues~>=5_I#p1V?6)KkHp%|qIR3ld>+Zx7f
zN&p(6+ol3~N#HL6WO5-hM3%w!KEC_-ez(23e%zrIO|lYa))8}H<U6>Dos}6uT9sy6
zrpQiVoMoj+4@#=IOqtUE3CDpy5D>@=M&B^!oW!nS$;_@jc_N}bh?wWC7c^S&ugL2>
zJL0-;Lt3yjoZ+vfjKGDg(xT-8-Xukx{_5p#PHiU6SO!`?Ztr*T-Sy{zlB2~;&S=zD
zO71Jc9qdnAoRNdf;+Pm3`RLPj_b&eM@VNc#V0O^56fri)K#1!sQ$k<9tUt#Qu!#El
zvxsFpSbN?wN>_XtoexjvIn<vMJ2Z>=bcI7>7c}VK55lxt>84Hl5y5HE;#ngg+YcB+
zgQCJ~;tMNU;lVY^=Lt&G6x(B$Ii#$D1hv=*)Fp=}sdLjv474MM-f{08OFnYEZgU32
z1vnB0Dz6)T%!+=OWP-amLw<-zhIkxQ6F(b|`!jaAKtRvBg9o}cSXzZZvbuqX1eN*)
zQSWl8P|2d;fFJv!PFP_)I$EM|8X+yX_`cDS1wIfl{-==M_Ainuq|&0Y8gvloxgNeM
zmAuN%%Y$t*tTv9?w9|9*aKGFBxHTO18qT%7k0u72X`uUdV9h}|$S2^LFZN*a9r*qB
zS*lljO;s17Py!nOr#N6dJAu;5LwtnudY1nIW=QsWDg<ONAbWw~#Yuc`?Jc}HA%6pG
CZx+D-

literal 0
HcmV?d00001

diff --git a/pkg/libcoap/Makefile b/pkg/libcoap/Makefile
index 9a91f013bd..1205f4f6d4 100644
--- a/pkg/libcoap/Makefile
+++ b/pkg/libcoap/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=libcoap
 PKG_URL=http://git.code.sf.net/p/libcoap/code
-PKG_VERSION=89acaa6775ca3a4aedea510557e6b9c0c01fa5db
+PKG_VERSION=ef41ce5d02d64cec0751882ae8fd95f6c32bc018
 
 ifneq ($(RIOTBOARD),)
 include $(RIOTBOARD)/$(BOARD)/Makefile.include
@@ -19,7 +19,7 @@ all: patch
 patch: $(CURDIR)/$(PKG_NAME)/Makefile
 
 $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME)
-	cd $< && git apply ../patch.txt
+	cd "$<" && git am --ignore-whitespace $(CURDIR)/*.patch || true
 
 $(CURDIR)/$(PKG_NAME)/:
 	git clone $(PKG_URL) $@ && \
-- 
GitLab