pptp-linux: update to 1.8.0

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

3 files changed, 3 insertions, 23 deletions

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 77722b064..000000000
--- 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 <sen.zhang@windriver.com>
-
---- 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.8.0/options.pptp
index f446e22a6..f446e22a6 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp
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.8.0.bb
index 003361c75..bc8b2cb2b 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb
@@ -7,17 +7,16 @@ DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
 HOMEPAGE = "http://pptpclient.sourceforge.net"
 SECTION = "net"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 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"
+SRC_URI[md5sum] = "4efce9f263e2c3f38d79d9df222476de"
+SRC_URI[sha256sum] = "e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda"
 
 S = "${WORKDIR}/pptp-${PV}"