From 18b8535e1a4ce6c89c10b204205411195e419571 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 8 Jul 2017 06:17:44 -0700 Subject: [PATCH] pptp-linux: Upgrade to 1.9.0 Fix build errors found when building for musl while here Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../0001-include-missing-sys-types.h.patch | 28 +++++++++++++++++++ .../options.pptp | 0 ...ptp-linux_1.8.0.bb => pptp-linux_1.9.0.bb} | 9 +++--- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch rename meta-networking/recipes-protocols/pptp-linux/{pptp-linux-1.8.0 => pptp-linux}/options.pptp (100%) rename meta-networking/recipes-protocols/pptp-linux/{pptp-linux_1.8.0.bb => pptp-linux_1.9.0.bb} (81%) diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch b/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch new file mode 100644 index 0000000000..804bf12349 --- /dev/null +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch @@ -0,0 +1,28 @@ +From f6c4d2468ae0dadd2f35680d61b98b2a59077328 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jul 2017 10:31:03 -0700 +Subject: [PATCH] include missing sys/types.h + +Fixes errors seen on musl +pqueue.h:21:3: error: unknown type name 'u_int32_t' + +Signed-off-by: Khem Raj +--- + pqueue.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pqueue.h b/pqueue.h +index c37ba7b..ae4cc6a 100644 +--- a/pqueue.h ++++ b/pqueue.h +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + /* wait this many seconds for missing packets before forgetting about them */ + #define DEFAULT_PACKET_TIMEOUT 0.3 +-- +2.13.2 + diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp b/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp similarity index 100% rename from meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp rename to meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb similarity index 81% rename from meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb rename to meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb index bc8b2cb2b9..10c9170fb1 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb @@ -9,14 +9,13 @@ SECTION = "net" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PR = "r1" - SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ file://options.pptp \ -" + file://0001-include-missing-sys-types.h.patch \ + " -SRC_URI[md5sum] = "4efce9f263e2c3f38d79d9df222476de" -SRC_URI[sha256sum] = "e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda" +SRC_URI[md5sum] = "b2117b377f65294a9786f80f0235d308" +SRC_URI[sha256sum] = "0b1e8cbfc578d3f5ab12ee87c5c2c60419abfe9cc445690a8a19c320b11c9201" S = "${WORKDIR}/pptp-${PV}"