From e6c6a5dfea7c452e0549194131ea3367a3e0459d Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Fri, 4 Mar 2016 20:27:19 -0500 Subject: pptp-linux: update to 1.8.0 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../pptp-linux-1.7.2/fix-parallel-build.patch | 19 ------------- .../pptp-linux/pptp-linux-1.7.2/options.pptp | 30 -------------------- .../pptp-linux/pptp-linux-1.8.0/options.pptp | 30 ++++++++++++++++++++ .../pptp-linux/pptp-linux_1.7.2.bb | 33 ---------------------- .../pptp-linux/pptp-linux_1.8.0.bb | 32 +++++++++++++++++++++ 5 files changed, 62 insertions(+), 82 deletions(-) delete mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch delete mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp delete mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch deleted file mode 100644 index 77722b064d..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -pptp.c and version.c depend on config.h - -Upstream-Status: Backport - -Upstream has already similar fixes. Will be available on next release. - -Signed-off-by: Jesse Zhang - ---- a/Makefile 2013-02-27 17:09:24.431226665 +0800 -+++ b/Makefile 2013-02-27 17:09:03.442075550 +0800 -@@ -43,6 +43,8 @@ - pptpsetup.8: pptpsetup - pod2man $? > $@ - -+pptp.o version.o: config.h -+ - config.h: - echo "/* text added by Makefile target config.h */" > config.h - echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp deleted file mode 100644 index f446e22a6a..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp +++ /dev/null @@ -1,30 +0,0 @@ -# -# Lock the port -# -lock - -# -# We don't need the tunnel server to authenticate itself -# -noauth - -# -# Turn off transmission protocols we know won't be used -# -nobsdcomp -nodeflate - -# -# We want MPPE -# (option naming specific to ppp 2.4.0 with unofficial patch) -# -#mppe-40 -mppe-128 -#mppe-stateless - -# -# We want a sane mtu/mru -# (ppp 2.4.0 with unofficial patch) -# -#mtu 1000 -#mru 1000 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-1.8.0/options.pptp new file mode 100644 index 0000000000..f446e22a6a --- /dev/null +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp @@ -0,0 +1,30 @@ +# +# Lock the port +# +lock + +# +# We don't need the tunnel server to authenticate itself +# +noauth + +# +# Turn off transmission protocols we know won't be used +# +nobsdcomp +nodeflate + +# +# We want MPPE +# (option naming specific to ppp 2.4.0 with unofficial patch) +# +#mppe-40 +mppe-128 +#mppe-stateless + +# +# We want a sane mtu/mru +# (ppp 2.4.0 with unofficial patch) +# +#mtu 1000 +#mru 1000 diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb deleted file mode 100644 index 003361c759..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb +++ /dev/null @@ -1,33 +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=8ca43cbc842c2336e835926c2166c28b" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ - file://options.pptp \ - file://fix-parallel-build.patch \ -" - -SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857" -SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc" - -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.8.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb new file mode 100644 index 0000000000..bc8b2cb2b9 --- /dev/null +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb @@ -0,0 +1,32 @@ +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" + +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ + file://options.pptp \ +" + +SRC_URI[md5sum] = "4efce9f263e2c3f38d79d9df222476de" +SRC_URI[sha256sum] = "e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda" + +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