gentoo auto-resync : 16:12:2024 - 02:01:58

6 files changed, 35 insertions, 42 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 16b1ef8ca56a..afe4e734d897 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index ce16e895703c..bb01e0a86238 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,11 +1,10 @@
-AUX linuxptp-3.1.1-string-include.patch 630 BLAKE2B 7b9dbbb6988282f0a600414440708663ef802896b3b8a674eea4937bb6edc013526faffb2647c1995b881f41699eda868cee9adeca8efb9e49633c1b8af880c8 SHA512 898f30ce82bae0c070814825a11d050fcbbcd6b769c4207bb988ec69edc8a31d920475e86e847ec99e815f18c147640763f3e123517222f273a1953abd366fc7
-AUX linuxptp-3.1.1-user_cpp.patch 329 BLAKE2B e99f87e5e8c42ac3eff67b8fea87994718ab7531dac0a69b609cd2fda0e3d88762439c1dbcfe9b76ef07bea8a159476e32624c146c9a89756e22560b691d0b27 SHA512 03a40f08cd783a16849ebfbf033e1f0a953d8aac31c56ea69adad4e4c2fede3a8acc7ecc8bc62706b9fbc7271fb5781c95fd7f7b03aa4c67da8a2afae65dfa19
 AUX linuxptp-4.2-user_cpp.patch 322 BLAKE2B eec32f57c46f8ef26e97a104a6c7e6c42c6a47ebabee34aa82b01f457ecf839e38679dbcebcfd1c2d09b4eb3bfba77cadef976e3e881e3df6c39f8c5013955f7 SHA512 5755e915b0600fcca58c9ce37dd309247d36c50126ea2773117082caf7d0ed51746d05d550a2e0583824633abd6b4dcbe3bcca5ca9215f6153fd0bf57b1dbf65
+AUX linuxptp-4.4-user_cpp.patch 789 BLAKE2B 75b19510cfa2c1d4698fa7f276de2a006856d040771aa7652d1b16928b795e65daa45e452c6dab5fb8c0a425cd8a26d29f981546e8a9376bc4fd50a295e44a41 SHA512 6c8a6bc9df53bbf1c9ca479201454f40a462b9cedf7c1fb43ea108e0dd3b2873e1e598f24a00589ae9f81874f5e17040a979742f57b03a633a438d5b308d8ed7
 AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844194512511ce99407cc88da7a2c83e019b20571098eba3f2297c1a1fe54da47f8fb5e07a58c20a007a2 SHA512 55f048ae44eb43894aad957b35842b0b21aa27e922be85bd286847281f8716bdde9b8187ca90d90d31c9d4587de4c35eebaf0e47498f9b950279037e03069086
 AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
-DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae
 DIST linuxptp-4.2.tgz 253861 BLAKE2B 83489edb1cb48a7f245e3224705332980a32aed14e166c3fd0d8111f4008ae42a293397a588a546e421fae634057829dcbcd94794ce539ecb166e5cf69ff6554 SHA512 479e512efd0573602379a9e1d8ef5c0ec9e033944cee5aed11c68cea5e8a3f7d4b6f2d11f6d6d4718282010da52c2c8629d675d9b388cc0c3d574845a913cdbb
-EBUILD linuxptp-4.1.ebuild 1253 BLAKE2B c5b8b219460cdb7ed868ffbc61f11d60f111879f8f810eef5fc526f63eacf7d03b17e175a8235bba9bb29668513bfcbd5c5272455c8c9df6aa0d02f5a909cae4 SHA512 a92551e976d0670ef5454ebcd4570d6fb05cca9ce55482324c2948532f3c099dc3d7e343f96488a7edc7b0127c2d10e5e2c16fcbf314c748a17846c6edb05afb
+DIST linuxptp-4.4.tgz 277069 BLAKE2B 01ae5fa39c43b00ec528a7e0eebed9138cde6fc0c04d0a9fe53a0c3925bd3431463f381e63637db56bb68e85cddc9a18dc2eb214aaa52a39acaf79c23c8bd1ab SHA512 f9c8ac0c812d9829b3bc4595412afbeea0cade4937c46efbe47789d0ced38894a65f38a174a65a59c51b4d85a7bbf970b5d575ae1389c504fbd36eb7f96bd282
 EBUILD linuxptp-4.2.ebuild 1203 BLAKE2B 3085a2e9703b34c76f3efa4af28d8e770f372edd52dfad4b726534bcd1cbb91911a08ae119fd92ad500de48ec2efb93574001029d715886c441342f7d8fc7a3f SHA512 2ed027c157cfedb831405e1d4f3180b7e881cbc7cd1db5b9279ef910fc0a3cc9efece1009a877e3d18594b157645561e5c9cc809d2ffa3845f325129cfdfad7a
+EBUILD linuxptp-4.4.ebuild 1215 BLAKE2B ccd8ee6fed42f387d6521bd4ba438ab4f56ce11a476e258277b85f1eccfe920464c90b6795a578efdc87df5860dc1c53d300c476b825ac5ba19accb133758d82 SHA512 e2347957aae86162e75f20ddf465f53fb8971c95b592f66c92731fd08ea5aacbba7eaccaea248b042becfbaaba2f3572494d2fb073f22df3d6f516e50d047686
 MISC metadata.xml 397 BLAKE2B ad47c63ba080644c0e964191a16c9e06c7357dd489f278c721c1b3e3cd292f61ae635870e809130b9ba23bb28b4e8e4500673028cafd4ba92ef79992c35c9c1b SHA512 273aed8c5eb9a4f3f9aa458b550ea9de53b0d9cc7d87ab7af36a9c4c515df0aa9952a84c9f6e381ce2e2e4d7e6dce308663505ea586f588d4bc18d431b9f9162
diff --git a/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch b/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch
deleted file mode 100644
index 622a87f67ec0..000000000000
--- a/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=aec96f23775b946cf99c39e7274bcc8fdd4711ca
-https://sourceforge.net/p/linuxptp/mailman/message/37603438/
-
-From d49b4fb8063ecd89617587e5ea566cc9da9393ef Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 31 Aug 2022 19:09:18 -0700
-Subject: [PATCH] include string.h for strncpy()
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/interface.c
-+++ b/interface.c
-@@ -5,6 +5,7 @@
-  * @note SPDX-License-Identifier: GPL-2.0+
-  */
- #include <stdlib.h>
-+#include <string.h>
- #include "interface.h"
- 
- struct interface {
diff --git a/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch
deleted file mode 100644
index d2b3728b6141..000000000000
--- a/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/incdefs.sh
-+++ b/incdefs.sh
-@@ -27,7 +27,7 @@
- 	printf " -D_GNU_SOURCE"
- 
- 	# Get list of directories searched for header files.
--	dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /")
-+	dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /")
- 
- 	# Look for clock_adjtime().
- 	for d in $dirs; do
diff --git a/net-misc/linuxptp/files/linuxptp-4.4-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-4.4-user_cpp.patch
new file mode 100644
index 000000000000..4334bd7900c4
--- /dev/null
+++ b/net-misc/linuxptp/files/linuxptp-4.4-user_cpp.patch
@@ -0,0 +1,24 @@
+--- a/incdefs.sh
++++ b/incdefs.sh
+@@ -27,7 +27,7 @@
+ 	printf " -D_GNU_SOURCE"
+ 
+ 	# Get list of directories searched for header files.
+-	dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /")
++	dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /")
+ 
+ 	# Look for clock_adjtime().
+ 	for d in $dirs; do
+diff --git a/makefile b/makefile
+index 3c2406b..c2fadb1 100644
+--- a/makefile
++++ b/makefile
+@@ -40,7 +40,7 @@ OBJECTS	= $(OBJ) hwstamp_ctl.o nsm.o phc2sys.o phc_ctl.o pmc.o pmc_agent.o \
+ SRC	= $(OBJECTS:.o=.c)
+ DEPEND	= $(OBJECTS:.o=.d)
+ srcdir	:= $(dir $(lastword $(MAKEFILE_LIST)))
+-incdefs := $(shell CC="$(CC)" $(srcdir)/incdefs.sh)
++incdefs := $(shell CPP="$(CPP)" $(srcdir)/incdefs.sh)
+ version := $(shell $(srcdir)/version.sh $(srcdir))
+ VPATH	= $(srcdir)
+ 
diff --git a/net-misc/linuxptp/linuxptp-4.1.ebuild b/net-misc/linuxptp/linuxptp-4.4.ebuild
index 51e65f46d2d1..7f327cec3c41 100644
--- a/net-misc/linuxptp/linuxptp-4.1.ebuild
+++ b/net-misc/linuxptp/linuxptp-4.4.ebuild
@@ -7,19 +7,21 @@ inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
 HOMEPAGE="https://linuxptp.nwtime.org/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
+SRC_URI="https://downloads.nwtime.org/${PN}//${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+RDEPEND="dev-libs/nettle"
+
+DEPEND="${RDEPEND} \
+	elibc_musl? ( sys-libs/queue-standalone )"
 
 CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-user_cpp.patch
-	"${FILESDIR}"/${PN}-3.1.1-string-include.patch
+	"${FILESDIR}"/${PN}-4.4-user_cpp.patch
 )
 
 pkg_setup() {
@@ -36,7 +38,7 @@ src_compile() {
 src_install() {
 	emake \
 		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
+		mandir="${D}"/usr/share/man
 		infodir="${D}"/usr/share/info \
 		libdir="${D}"/usr/$(get_libdir) \
 		install