From 72b59cfc2e2dc0ecd5b28083857264facf19e26d Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Thu, 12 Apr 2018 15:55:50 +0200
Subject: [PATCH] pkg/cn-cbor: Bump version
Patches for unaligned memory access are upstreamed and thus removed
here
---
pkg/cn-cbor/Makefile | 2 +-
pkg/cn-cbor/Makefile.cn-cbor | 3 +++
...mplement-alignment-safe-ntoh16p-ntoh32p.patch | Bin 1034 -> 0 bytes
3 files changed, 4 insertions(+), 1 deletion(-)
delete mode 100644 pkg/cn-cbor/patches/0001-implement-alignment-safe-ntoh16p-ntoh32p.patch
diff --git a/pkg/cn-cbor/Makefile b/pkg/cn-cbor/Makefile
index 094c57bec9..0ff9ac08d6 100644
--- a/pkg/cn-cbor/Makefile
+++ b/pkg/cn-cbor/Makefile
@@ -1,6 +1,6 @@
PKG_NAME=cn-cbor
PKG_URL=https://github.com/cabo/cn-cbor
-PKG_VERSION=2f9c3b1931eb012909e74f3b628e6a31fd446ad1
+PKG_VERSION=f1cf9ffdf5cfab935a45900556f9b68af925c256
PKG_LICENSE=MIT
.PHONY: all
diff --git a/pkg/cn-cbor/Makefile.cn-cbor b/pkg/cn-cbor/Makefile.cn-cbor
index e13f6b2105..0466f35c80 100644
--- a/pkg/cn-cbor/Makefile.cn-cbor
+++ b/pkg/cn-cbor/Makefile.cn-cbor
@@ -1,3 +1,6 @@
MODULE := cn-cbor
+# Enable code forcing aligned reads
+CFLAGS += -DCBOR_ALIGN_READS
+
include $(RIOTBASE)/Makefile.base
diff --git a/pkg/cn-cbor/patches/0001-implement-alignment-safe-ntoh16p-ntoh32p.patch b/pkg/cn-cbor/patches/0001-implement-alignment-safe-ntoh16p-ntoh32p.patch
deleted file mode 100644
index 7cd6a73514e0d3ec66a1c0f71e335fe3ac9ce735..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1034
zcmZ=O%Fk6uv`9>`urxC>G&VIiOfob}HZ@MMv@|qLGfy%xG)_xQHBU`6vM{$)@XgOt
z2u>|fFf>;%Ft7q61tS9kLoSdpRtnyU#RZ8)3c<-4IjNb&sYMDl*<cZeVwi|tN~#@~
zOJYf?m4aJQrjCN4nSyU(k%Ezdp@o8>sg<#@m4ShRwt=C60atKoQdVkmiIqZhfMbZW
zN323-Zb43JZfahMLSjy4dLD?STb!7ds*qQbpJ8ZLprNUtrUvF18x?41a&hVE>T)R*
z7bWW_=jkRV<rnECE7T|$nkZ-^0gw_yg|y6^RE6Y>#Ju#>6deUaBZbVo;?$y&%>2A!
z4Q)*w1tW!&)SOfZUsschD<v~6O+i;TJ+nk1Q6JTYBvd|EW?o8ag+ijanYnpls-B*S
zfk8^DX_|tefq|Kc3CM})CU9wMYb&6e;^3g5Yig)tp`dMQsAFiM;NYN8T#{IlnXHhK
zUz(JYs*sYJoS%{!pOKi8rjeOfq5xuODpYeRa4G0(DY#`;D3oNR7N;s?rYThBmntMD
z=Bbw`q~t5)<>%>wgEKWnp(r&mrC32rpG!eGB{eNG4-&E#1sVmK3L07(rFq4f>3OLs
zpnxjU($px>)a24dRtbs&kWx^56eDXW&d4t+f#^Wf0*Wb^mK<a)Ir(|%Fdf=Zua;)!
zl^B}Emw@9KWEqN!6toIJ9@bV+P*8xYEXggf<^l`lrsgIWRBEV|<QC{C6zC`vXI7==
zr)iYr7HDchl@z6xlosWIO)myZSaWIDa%poR+iz?HwIAeiy!L}tl52ksvi-2A2Kma&
z1ZuyTNdan%K>ZK(Jy=~)YKej^*gqiG7HC>?DJUp_1Z`|=6^xCnxpZ|ExQz4+&Gd}8
FxByz@HH-iN
--
GitLab