[ptxdist] [PATCH v2] linuxptp: version bump 2.0 -> 3.1.1

[Roland Hieber <rhi@pengutronix.de>]

The old version has been depublished from SourceForge due to CVEs.
The remaining patch has been applied upstream.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v2:
 - remove old patches
 - resend only this one patch out-of-series, no changes for the rest of
   the series

PATCH v1: https://lore.ptxdist.org/ptxdist/20210708220204.13187-2-rhi@pengutronix.de
---
 ...Fix-building-with-new-kernel-headers.patch | 54 -------------------
 patches/linuxptp-2.0/series                   |  4 --
 rules/linuxptp.make                           |  4 +-
 3 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch
 delete mode 100644 patches/linuxptp-2.0/series

diff --git a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch b/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch
deleted file mode 100644
index 247a6a353a7d..000000000000
--- a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Thu, 6 Dec 2018 18:23:44 +0100
-Subject: [PATCH] Fix building with new kernel headers.
-
-net_tstamp.h in recent kernel versions requires time.h for clockid_t.
-
-Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
----
- clock.c      | 2 +-
- sk.c         | 1 +
- timemaster.c | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/clock.c b/clock.c
-index faf2dea82a5b..9bbcefa5c57c 100644
---- a/clock.c
-+++ b/clock.c
-@@ -17,11 +17,11 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <poll.h>
- #include <stdlib.h>
- #include <string.h>
--#include <time.h>
- #include <sys/queue.h>
- 
- #include "address.h"
-diff --git a/sk.c b/sk.c
-index f18b2bf8732b..386b4c8adf80 100644
---- a/sk.c
-+++ b/sk.c
-@@ -18,6 +18,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #include <errno.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <linux/sockios.h>
- #include <linux/ethtool.h>
-diff --git a/timemaster.c b/timemaster.c
-index 4ba921edb902..28c215a2de95 100644
---- a/timemaster.c
-+++ b/timemaster.c
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <libgen.h>
- #include <limits.h>
-+#include <time.h>
- #include <linux/net_tstamp.h>
- #include <net/if.h>
- #include <signal.h>
diff --git a/patches/linuxptp-2.0/series b/patches/linuxptp-2.0/series
deleted file mode 100644
index fe0aad8306c3..000000000000
--- a/patches/linuxptp-2.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-building-with-new-kernel-headers.patch
-# b102f87ad3ef97777cea9ad16f755ca7  - git-ptx-patches magic
diff --git a/rules/linuxptp.make b/rules/linuxptp.make
index 7e94cb20dfbd..6415512f1cbc 100644
--- a/rules/linuxptp.make
+++ b/rules/linuxptp.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp
 #
 # Paths and names
 #
-LINUXPTP_VERSION	:= 2.0
-LINUXPTP_MD5		:= d8bb7374943bb747db7786ac26f17f11
+LINUXPTP_VERSION	:= 3.1.1
+LINUXPTP_MD5		:= 3b79ab5e77c5b5cf06bc1c8350d405bb
 LINUXPTP		:= linuxptp-$(LINUXPTP_VERSION)
 LINUXPTP_SUFFIX		:= tgz
 LINUXPTP_URL		:= $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de