mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/ptpd2: remove package
The package has no active upstream: https://github.com/ptpd/ptpd/issues/100 The last upstream commit dates back to 2019. The package causes numerous build errors with newer toolchains so we remove it from buildroot. Fixes: https://autobuild.buildroot.net/results/9ef/9efbc2f6a53e6739481c3371b8b9705897e20950/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
committed by
Arnout Vandecappelle
parent
fab50ed3b1
commit
66544e0e48
@@ -759,10 +759,6 @@ package/prosody/0002-add-pidfile.patch lib_patch.Upstream
|
|||||||
package/prosody/S50prosody Shellcheck lib_sysv.Indent lib_sysv.Variables
|
package/prosody/S50prosody Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||||
package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch lib_patch.Upstream
|
package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch lib_patch.Upstream
|
||||||
package/ptpd/S65ptpd Shellcheck lib_sysv.Indent lib_sysv.Variables
|
package/ptpd/S65ptpd Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||||
package/ptpd2/0001-musl.patch lib_patch.Upstream
|
|
||||||
package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch lib_patch.Upstream
|
|
||||||
package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch lib_patch.Upstream
|
|
||||||
package/ptpd2/S65ptpd2 Shellcheck lib_sysv.Indent lib_sysv.Variables
|
|
||||||
package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch lib_patch.Upstream
|
package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch lib_patch.Upstream
|
||||||
package/pulseaudio/S50pulseaudio lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables
|
package/pulseaudio/S50pulseaudio lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables
|
||||||
package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch lib_patch.Upstream
|
package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch lib_patch.Upstream
|
||||||
|
|||||||
@@ -146,6 +146,13 @@ endif
|
|||||||
|
|
||||||
comment "Legacy options removed in 2026.05"
|
comment "Legacy options removed in 2026.05"
|
||||||
|
|
||||||
|
config BR2_PACKAGE_PTPD2
|
||||||
|
bool "ptpd2 removed"
|
||||||
|
select BR2_LEGACY
|
||||||
|
help
|
||||||
|
ptpd2 was no longer maintained upstream, so it has been
|
||||||
|
dropped.
|
||||||
|
|
||||||
config BR2_PACKAGE_LIBHDHOMERUN
|
config BR2_PACKAGE_LIBHDHOMERUN
|
||||||
bool "libhdhomerun"
|
bool "libhdhomerun"
|
||||||
select BR2_LEGACY
|
select BR2_LEGACY
|
||||||
|
|||||||
@@ -2587,7 +2587,6 @@ endif
|
|||||||
source "package/prosody/Config.in"
|
source "package/prosody/Config.in"
|
||||||
source "package/proxychains-ng/Config.in"
|
source "package/proxychains-ng/Config.in"
|
||||||
source "package/ptpd/Config.in"
|
source "package/ptpd/Config.in"
|
||||||
source "package/ptpd2/Config.in"
|
|
||||||
source "package/pure-ftpd/Config.in"
|
source "package/pure-ftpd/Config.in"
|
||||||
source "package/putty/Config.in"
|
source "package/putty/Config.in"
|
||||||
source "package/radvd/Config.in"
|
source "package/radvd/Config.in"
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
Fix musl build
|
|
||||||
|
|
||||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
||||||
|
|
||||||
diff -uNr ptpd-ptpd-2.3.1.org/src/dep/net.c ptpd-ptpd-2.3.1/src/dep/net.c
|
|
||||||
--- ptpd-ptpd-2.3.1.org/src/dep/net.c 2015-06-29 17:13:29.000000000 +0200
|
|
||||||
+++ ptpd-ptpd-2.3.1/src/dep/net.c 2016-01-24 00:35:44.509860065 +0100
|
|
||||||
@@ -82,7 +82,6 @@
|
|
||||||
#ifdef SO_TIMESTAMPING
|
|
||||||
#include <linux/net_tstamp.h>
|
|
||||||
#include <linux/sockios.h>
|
|
||||||
-#include <linux/ethtool.h>
|
|
||||||
#endif /* SO_TIMESTAMPING */
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
From af1d16d90ff273413a57cd02689f4fb005403609 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
|
||||||
Date: Fri, 31 Aug 2018 18:46:56 +0200
|
|
||||||
Subject: [PATCH] ntp_isc_md5: rename EVP_MD_CTX into PTPD_EVP_MD_CTX
|
|
||||||
|
|
||||||
EVP_MD_CTX can conflict with openssl that defines a completely different
|
|
||||||
typedef with same name.
|
|
||||||
|
|
||||||
Since this typedef is used only twice in the entire ptpd,
|
|
||||||
substitute EVP_MD_CTX with PTPD_EVP_MD_CTX.
|
|
||||||
|
|
||||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
|
||||||
---
|
|
||||||
src/dep/ntpengine/ntp_isc_md5.c | 2 +-
|
|
||||||
src/dep/ntpengine/ntp_isc_md5.h | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/dep/ntpengine/ntp_isc_md5.c b/src/dep/ntpengine/ntp_isc_md5.c
|
|
||||||
index 850d004..3216de8 100644
|
|
||||||
--- a/src/dep/ntpengine/ntp_isc_md5.c
|
|
||||||
+++ b/src/dep/ntpengine/ntp_isc_md5.c
|
|
||||||
@@ -262,7 +262,7 @@ MD5authencrypt(
|
|
||||||
{
|
|
||||||
u_char digest[64];
|
|
||||||
u_int len;
|
|
||||||
- EVP_MD_CTX ctx;
|
|
||||||
+ PTPD_EVP_MD_CTX ctx;
|
|
||||||
pkt[length / 4] = htonl(keyid);
|
|
||||||
EVP_DigestInit(&ctx);
|
|
||||||
EVP_DigestUpdate(&ctx, (u_char *)key, (u_int)strlen(key));
|
|
||||||
diff --git a/src/dep/ntpengine/ntp_isc_md5.h b/src/dep/ntpengine/ntp_isc_md5.h
|
|
||||||
index fa6e2ee..236c0e4 100644
|
|
||||||
--- a/src/dep/ntpengine/ntp_isc_md5.h
|
|
||||||
+++ b/src/dep/ntpengine/ntp_isc_md5.h
|
|
||||||
@@ -80,7 +80,7 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest);
|
|
||||||
# define MD5Init(c) isc_md5_init(c)
|
|
||||||
# define MD5Update(c, p, s) isc_md5_update(c, p, s)
|
|
||||||
# define MD5Final(d, c) isc_md5_final((c), (d)) /* swapped */
|
|
||||||
- typedef MD5_CTX EVP_MD_CTX;
|
|
||||||
+ typedef MD5_CTX PTPD_EVP_MD_CTX;
|
|
||||||
# define EVP_DigestInit(c) MD5Init(c)
|
|
||||||
# define EVP_DigestUpdate(c, p, s) MD5Update(c, p, s)
|
|
||||||
# define EVP_DigestFinal(c, d, pdl) \
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
From 84157b11e8f27318f7291823c657f6313c3b60af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jan Breuer <jan.breuer@jaybee.cz>
|
|
||||||
Date: Tue, 12 Jul 2016 18:07:08 +0200
|
|
||||||
Subject: [PATCH] Solve issue #25 - Removing type U64 from net-snmp related
|
|
||||||
code
|
|
||||||
|
|
||||||
[Thomas: Backport to 2.3.1.]
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
---
|
|
||||||
src/dep/snmp.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/dep/snmp.c b/src/dep/snmp.c
|
|
||||||
index 5c08aaa..3086c86 100644
|
|
||||||
--- a/src/dep/snmp.c
|
|
||||||
+++ b/src/dep/snmp.c
|
|
||||||
@@ -221,7 +221,7 @@ snmpHeaderIndexBest(struct snmpHeaderIndex *idx)
|
|
||||||
|
|
||||||
#define SNMP_LOCAL_VARIABLES \
|
|
||||||
static unsigned long long_ret; \
|
|
||||||
- static U64 counter64_ret; \
|
|
||||||
+ static struct counter64 counter64_ret; \
|
|
||||||
static uint32_t ipaddr; \
|
|
||||||
Integer64 bigint; \
|
|
||||||
struct snmpHeaderIndex idx; \
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
config BR2_PACKAGE_PTPD2
|
|
||||||
bool "ptpd2"
|
|
||||||
select BR2_PACKAGE_LIBPCAP
|
|
||||||
help
|
|
||||||
The PTP daemon (PTPd) implements the Precision Time protocol
|
|
||||||
(PTP) as defined by the IEEE-1588-2008.
|
|
||||||
|
|
||||||
https://github.com/ptpd/ptpd
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Start ptpd2
|
|
||||||
#
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
printf "Starting ptpd2: "
|
|
||||||
start-stop-daemon -S -q -x /usr/sbin/ptpd2 -- -g
|
|
||||||
if [ $? != 0 ]; then
|
|
||||||
echo "FAILED"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo "OK"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
printf "Stopping ptpd2: "
|
|
||||||
start-stop-daemon -K -q -x /usr/sbin/ptpd2
|
|
||||||
echo "OK"
|
|
||||||
;;
|
|
||||||
restart|reload)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Usage: $0 {start|stop|restart}"
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit $?
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# Locally computed:
|
|
||||||
sha256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 ptpd2-2.3.1.tar.gz
|
|
||||||
sha256 5e101ac565a8e74ef4efbf7e0c95ef9333e00618c05dbf5fb4ed50a5bab1ff09 COPYRIGHT
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
#
|
|
||||||
# ptpd2
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
PTPD2_VERSION = 2.3.1
|
|
||||||
PTPD2_SITE = $(call github,ptpd,ptpd,ptpd-$(PTPD2_VERSION))
|
|
||||||
PTPD2_DEPENDENCIES = libpcap
|
|
||||||
PTPD2_CONF_OPTS = --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config
|
|
||||||
# configure not shipped
|
|
||||||
PTPD2_AUTORECONF = YES
|
|
||||||
PTPD2_LICENSE = BSD-2-Clause
|
|
||||||
PTPD2_LICENSE_FILES = COPYRIGHT
|
|
||||||
|
|
||||||
ifeq ($(BR2_STATIC_LIBS),y)
|
|
||||||
PTPD2_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_NETSNMP),y)
|
|
||||||
PTPD2_CONF_ENV += ac_cv_path_PATH_NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
|
|
||||||
PTPD2_DEPENDENCIES += netsnmp
|
|
||||||
else
|
|
||||||
PTPD2_CONF_OPTS += --disable-snmp
|
|
||||||
endif
|
|
||||||
|
|
||||||
define PTPD2_INSTALL_INIT_SYSV
|
|
||||||
$(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \
|
|
||||||
$(TARGET_DIR)/etc/init.d/S65ptpd2
|
|
||||||
endef
|
|
||||||
|
|
||||||
define PTPD2_INSTALL_INIT_SYSTEMD
|
|
||||||
$(INSTALL) -D -m 644 package/ptpd2/ptpd2.service \
|
|
||||||
$(TARGET_DIR)/usr/lib/systemd/system/ptpd2.service
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=Precision Time Protocol daemon
|
|
||||||
After=syslog.target network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/sbin/ptpd2 -C -g
|
|
||||||
Restart=always
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
Reference in New Issue
Block a user