From 285a93a5a9decb14ec51729bd5620c63f93df829 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 9 May 2019 19:03:05 +0300 Subject: pptp-linux: Upgrade 1.9.0 -> 1.10.0 Remove patch for issue fixed upstream. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../0001-include-missing-sys-types.h.patch | 28 ------------------- .../pptp-linux/pptp-linux_1.10.0.bb | 30 +++++++++++++++++++++ .../pptp-linux/pptp-linux_1.9.0.bb | 31 ---------------------- 3 files changed, 30 insertions(+), 59 deletions(-) delete mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb delete mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb 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 deleted file mode 100644 index 804bf12349..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.10.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb new file mode 100644 index 0000000000..3221581466 --- /dev/null +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Client for Microsoft PPTP VPNs" +DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \ + and OpenBSD client for the proprietary Microsoft Point-to-Point \ + Tunneling Protocol, PPTP. Allows connection to a PPTP based \ + Virtual Private Network (VPN) as used by employers and some \ + cable and ADSL internet service providers." +HOMEPAGE = "http://pptpclient.sourceforge.net" +SECTION = "net" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ + file://options.pptp \ + " + +SRC_URI[md5sum] = "8d25341352fdae5ad5b36b9f18254908" +SRC_URI[sha256sum] = "82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4" + +S = "${WORKDIR}/pptp-${PV}" + +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 + install -m 555 pptp ${D}${sbindir} + install -m 644 pptp.8 ${D}${mandir}/man8 + install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp +} + +RDEPENDS_${PN} = "ppp" diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb deleted file mode 100644 index 10c9170fb1..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Client for Microsoft PPTP VPNs" -DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \ - and OpenBSD client for the proprietary Microsoft Point-to-Point \ - Tunneling Protocol, PPTP. Allows connection to a PPTP based \ - Virtual Private Network (VPN) as used by employers and some \ - cable and ADSL internet service providers." -HOMEPAGE = "http://pptpclient.sourceforge.net" -SECTION = "net" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ - file://options.pptp \ - file://0001-include-missing-sys-types.h.patch \ - " - -SRC_URI[md5sum] = "b2117b377f65294a9786f80f0235d308" -SRC_URI[sha256sum] = "0b1e8cbfc578d3f5ab12ee87c5c2c60419abfe9cc445690a8a19c320b11c9201" - -S = "${WORKDIR}/pptp-${PV}" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_install() { - install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 - install -m 555 pptp ${D}${sbindir} - install -m 644 pptp.8 ${D}${mandir}/man8 - install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp -} - -RDEPENDS_${PN} = "ppp" -- cgit 1.2.3-korg