diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-09 19:03:05 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-09 20:34:33 -0700 |
commit | 285a93a5a9decb14ec51729bd5620c63f93df829 (patch) | |
tree | 08e8b61b68ef0d45fa557155b6f07d50d6f07e1a | |
parent | 10f2232c70879e0e2e8b6fbd60448104ac056e8c (diff) | |
download | meta-openembedded-285a93a5a9decb14ec51729bd5620c63f93df829.tar.gz |
pptp-linux: Upgrade 1.9.0 -> 1.10.0
Remove patch for issue fixed upstream.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch | 28 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb (renamed from meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb) | 5 |
2 files changed, 2 insertions, 31 deletions
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 804bf1234..000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f6c4d2468ae0dadd2f35680d61b98b2a59077328 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 10:31:03 -0700 | ||
4 | Subject: [PATCH] include missing sys/types.h | ||
5 | |||
6 | Fixes errors seen on musl | ||
7 | pqueue.h:21:3: error: unknown type name 'u_int32_t' | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | pqueue.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/pqueue.h b/pqueue.h | ||
15 | index c37ba7b..ae4cc6a 100644 | ||
16 | --- a/pqueue.h | ||
17 | +++ b/pqueue.h | ||
18 | @@ -3,6 +3,7 @@ | ||
19 | |||
20 | #include <time.h> | ||
21 | #include <sys/time.h> | ||
22 | +#include <sys/types.h> | ||
23 | |||
24 | /* wait this many seconds for missing packets before forgetting about them */ | ||
25 | #define DEFAULT_PACKET_TIMEOUT 0.3 | ||
26 | -- | ||
27 | 2.13.2 | ||
28 | |||
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.10.0.bb index 10c9170fb..322158146 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb | |||
@@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
11 | 11 | ||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ | 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ |
13 | file://options.pptp \ | 13 | file://options.pptp \ |
14 | file://0001-include-missing-sys-types.h.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | SRC_URI[md5sum] = "b2117b377f65294a9786f80f0235d308" | 16 | SRC_URI[md5sum] = "8d25341352fdae5ad5b36b9f18254908" |
18 | SRC_URI[sha256sum] = "0b1e8cbfc578d3f5ab12ee87c5c2c60419abfe9cc445690a8a19c320b11c9201" | 17 | SRC_URI[sha256sum] = "82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4" |
19 | 18 | ||
20 | S = "${WORKDIR}/pptp-${PV}" | 19 | S = "${WORKDIR}/pptp-${PV}" |
21 | 20 | ||