From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 net-misc/linuxptp/Manifest                         |  3 +-
 .../files/linuxptp-2.0_nettstamp-systypes.patch    | 52 ++++++++++++++++++++++
 net-misc/linuxptp/linuxptp-2.0-r1.ebuild           |  4 ++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch

(limited to 'net-misc/linuxptp')

diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 0464c057ced6..bbb6b6a53429 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,4 +1,5 @@
+AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-2.0-r1.ebuild 940 BLAKE2B b5dc69b6bcbd537c1e74623594812878691af84fa5da361302ec2290e7ddf75cd2af92d81d2d7ccba145317f758ed29b0558213eecb3dc23661523ae3f314ddf SHA512 d96b4a9e586478704fad4dc125533db1d9d88510fd161ffb04209c0fefac40c5709b6139ff7114ee7de4f7724d7137ef12c5bbe1075dcc631f3fc8c0da5d4f01
+EBUILD linuxptp-2.0-r1.ebuild 1003 BLAKE2B 434b6f80bb5a3bcb3f187c50e5e388f8552f14a8f23b277d96d8d85d5d0608302948bcad7b25c89e1d911be22392f6ef67f88a21257295025780cca1512bca65 SHA512 73755062bd6e4d0618fcbfc3747e5f2bd708b1c5f3b7b3170dd36834ecc3103ff8e06c800bd86d113269c4ba722d637b47fd887db28bdfad5ecae1cb438c4733
 MISC metadata.xml 327 BLAKE2B 2f8f68a89168272c97f38af2ee447d621164d5f2c31bbaf75818d1386b4082ce59cfe724d54b9b118bc835c1832c4e7fe5b7c6c4b83fd36f48dc7f24701fa2eb SHA512 a98a1fe6de19dad7ab76f21672de567f3f8ac16c857194f4435d260741a9c2bc4f04d268fbc539aa6f1f1d2203bf509416e7e2970f9c24c4d31651a11eac6cd4
diff --git a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
new file mode 100644
index 000000000000..d3f8e5d92906
--- /dev/null
+++ b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
@@ -0,0 +1,52 @@
+net_tstamp.h needs clockid_t to be defined, so must include
+<sys/types.h> before including <linux/net_tstamp.h>
+
+
+--- a/clock.c
++++ b/clock.c
+@@ -17,6 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <poll.h>
+ #include <stdlib.h>
+--- a/hwstamp_ctl.c	2018-08-12 23:08:43.000000000 +0200
++++ b/hwstamp_ctl.c	2020-02-07 13:49:53.256859722 +0100
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#include <sys/types.h>
+ 
+ #include <arpa/inet.h>
+ #include <linux/net_tstamp.h>
+--- a/sk.c	2018-08-12 23:08:43.000000000 +0200
++++ b/sk.c	2020-02-07 13:50:12.334599236 +0100
+@@ -18,6 +18,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/sockios.h>
+ #include <linux/ethtool.h>
+--- a/timemaster.c	2018-08-12 23:08:43.000000000 +0200
++++ b/timemaster.c	2020-02-07 13:50:19.848500949 +0100
+@@ -22,7 +22,6 @@
+ #include <errno.h>
+ #include <libgen.h>
+ #include <limits.h>
+-#include <linux/net_tstamp.h>
+ #include <net/if.h>
+ #include <signal.h>
+ #include <spawn.h>
+@@ -34,6 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <linux/net_tstamp.h>
+ 
+ #include "print.h"
+ #include "rtnl.h"
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 60e25c5dd150..6594c946478c 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -19,6 +19,10 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0_nettstamp-systypes.patch
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
-- 
cgit v1.2.3