diff --git a/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch b/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch deleted file mode 100644 index 715f3da..0000000 --- a/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch +++ /dev/null @@ -1,108 +0,0 @@ -From e9590b1ca75d360eaf3211bebd86058214d48064 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 14 Jul 2019 21:50:43 +0200 -Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel - -In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 -the asm-generic/sockios.h header no longer defines SIOCGSTAMP. -Instead it provides only SIOCGSTAMP_OLD. - -The linux/sockios.h header now defines SIOCGSTAMP using either -SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only -header file is not pulled so we get a build failure. - -canlogserver.c: In function 'main': -canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'? - if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) - ^~~~~~~~~~ - SIOCGRARP -canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in - -Fixes: - - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - canlogserver.c | 1 + - cansniffer.c | 1 + - isotpdump.c | 1 + - isotpperf.c | 1 + - isotpsniffer.c | 1 + - slcanpty.c | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/canlogserver.c b/canlogserver.c -index f9ae159..4429ccd 100644 ---- a/canlogserver.c -+++ b/canlogserver.c -@@ -62,6 +62,7 @@ - - #include <linux/can.h> - #include <linux/can/raw.h> -+#include <linux/sockios.h> - #include <signal.h> - #include <errno.h> - -diff --git a/cansniffer.c b/cansniffer.c -index b710058..0ff29b4 100644 ---- a/cansniffer.c -+++ b/cansniffer.c -@@ -62,6 +62,7 @@ - - #include <linux/can.h> - #include <linux/can/bcm.h> -+#include <linux/sockios.h> - - #include "terminal.h" - -diff --git a/isotpdump.c b/isotpdump.c -index 1ab9416..97baeca 100644 ---- a/isotpdump.c -+++ b/isotpdump.c -@@ -57,6 +57,7 @@ - - #include <linux/can.h> - #include <linux/can/raw.h> -+#include <linux/sockios.h> - #include "terminal.h" - - #define NO_CAN_ID 0xFFFFFFFFU -diff --git a/isotpperf.c b/isotpperf.c -index 6ee6ede..5ad302a 100644 ---- a/isotpperf.c -+++ b/isotpperf.c -@@ -57,6 +57,7 @@ - - #include <linux/can.h> - #include <linux/can/raw.h> -+#include <linux/sockios.h> - - #define NO_CAN_ID 0xFFFFFFFFU - #define PERCENTRES 2 /* resolution in percent for bargraph */ -diff --git a/isotpsniffer.c b/isotpsniffer.c -index 6c19c8b..5d61872 100644 ---- a/isotpsniffer.c -+++ b/isotpsniffer.c -@@ -56,6 +56,7 @@ - - #include <linux/can.h> - #include <linux/can/isotp.h> -+#include <linux/sockios.h> - #include "terminal.h" - - #define NO_CAN_ID 0xFFFFFFFFU -diff --git a/slcanpty.c b/slcanpty.c -index e90b32a..5fdfa55 100644 ---- a/slcanpty.c -+++ b/slcanpty.c -@@ -37,6 +37,7 @@ - - #include <linux/can.h> - #include <linux/can/raw.h> -+#include <linux/sockios.h> - - /* maximum rx buffer len: extended CAN frame with timestamp */ - #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) --- -2.22.1 - diff --git a/canutils.changes b/canutils.changes index e541b1c..9770d3f 100644 --- a/canutils.changes +++ b/canutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 24 08:05:00 UTC 2020 - Tuukka Pasanen <tuukka.pasanen@ilmi.fi> + +- Update to version v2020.04.02 + ------------------------------------------------------------------- Mon Aug 26 08:48:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de> diff --git a/canutils.spec b/canutils.spec index e494763..e65cd98 100644 --- a/canutils.spec +++ b/canutils.spec @@ -20,12 +20,11 @@ Name: canutils Summary: Utilities for Controller Area Networks from the Linux-CAN project License: GPL-2.0-only AND GPL-2.0-or-later AND BSD-3-Clause Group: Hardware/Other -Version: 2018.02.0 +Version: 2020.02.04 Release: 0 URL: https://github.com/linux-can/can-utils Source: https://github.com/linux-can/can-utils/archive/v%version.tar.gz -Patch1: 0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch BuildRequires: libtool BuildRequires: pkg-config Obsoletes: canutils-linuxcan diff --git a/v2018.02.0.tar.gz b/v2018.02.0.tar.gz deleted file mode 100644 index 1dffdc3..0000000 --- a/v2018.02.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:370ad4b19447c29099f7300548f1a3362d6e123c4a6a827dbbd3110bc2c26839 -size 100415 diff --git a/v2020.02.04.tar.gz b/v2020.02.04.tar.gz new file mode 100644 index 0000000..7e45dc3 --- /dev/null +++ b/v2020.02.04.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a766aad89955b9cfcca27f61ef988fa169565c3657d2789808c0f33a7afa23c8 +size 121866