[Buildroot] [PATCH 1/2] package/ptpd2: bump version to 2.3.1, switch upstream to github

[Buildroot] [PATCH 1/2] package/ptpd2: bump version to 2.3.1, switch upstream to github

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ptpd2/Config.in  | 3 ++-
 package/ptpd2/ptpd2.hash | 2 +-
 package/ptpd2/ptpd2.mk   | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/ptpd2/Config.in b/package/ptpd2/Config.in
index e37b10e..e88a9bb 100644
--- a/package/ptpd2/Config.in
+++ b/package/ptpd2/Config.in
@@ -5,4 +5,5 @@ config BR2_PACKAGE_PTPD2
 	  The PTP daemon (PTPd) implements the Precision Time protocol
 	  (PTP) as defined by the IEEE-1588-2008.
 
-	  http://ptpd.sourceforge.net/
+	  https://github.com/ptpd/ptpd
+
diff --git a/package/ptpd2/ptpd2.hash b/package/ptpd2/ptpd2.hash
index 2570c00..af1f78a 100644
--- a/package/ptpd2/ptpd2.hash
+++ b/package/ptpd2/ptpd2.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7  ptpd-2.3.0.tar.gz
+sha256	267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2	ptpd2-ptpd-2.3.1.tar.gz
diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk
index cd49fe5..c86db7e 100644
--- a/package/ptpd2/ptpd2.mk
+++ b/package/ptpd2/ptpd2.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-PTPD2_VERSION = 2.3.0
-PTPD2_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD2_VERSION)
-PTPD2_SOURCE = ptpd-$(PTPD2_VERSION).tar.gz
+PTPD2_VERSION = ptpd-2.3.1
+PTPD2_SITE = $(call github,ptpd,ptpd,$(PTPD2_VERSION))
 PTPD2_DEPENDENCIES = libpcap
 # configure not shipped
 PTPD2_AUTORECONF = YES
-- 
2.7.0.rc3

[Buildroot] [PATCH 2/2] package/ptpd2: Fix musl build

[Bernd Kuhls]

The autobuilders did not catch the error yet because they failed
earlier with other packages, but I am continuing the build using
the defconfig from:
http://autobuild.buildroot.net/results/6cc/6cc0f8c067e07deea688b9b97284601a596b898c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ptpd2/0001-musl.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/ptpd2/0001-musl.patch

diff --git a/package/ptpd2/0001-musl.patch b/package/ptpd2/0001-musl.patch
new file mode 100644
index 0000000..2e214b2
--- /dev/null
+++ b/package/ptpd2/0001-musl.patch
@@ -0,0 +1,15 @@
+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 */
+ 
+ /**
-- 
2.7.0.rc3

[Buildroot] [PATCH 1/2] package/ptpd2: bump version to 2.3.1, switch upstream to github

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 24 Jan 2016 00:40:18 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/ptpd2/Config.in  | 3 ++-
>  package/ptpd2/ptpd2.hash | 2 +-
>  package/ptpd2/ptpd2.mk   | 5 ++---
>  3 files changed, 5 insertions(+), 5 deletions(-)

Both applied. Please submit the musl fix upstream: the project is on
github, so it's trivial to submit patches.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com