summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-22 09:50:44 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2017-09-08 16:38:48 -0400
commit7a13a2e45b26c22476f6b08a3008c6fc287acc62 (patch)
tree172df92f59f5c2e10e35aa39020f002b609697dc /meta-networking
parenta669e44708e985f717b6af876fe5e5e24e9afa17 (diff)
downloadmeta-openembedded-7a13a2e45b26c22476f6b08a3008c6fc287acc62.tar.gz
xl2tpd: Update to 1.3.9
License changes are cosmetic https://github.com/xelerance/xl2tpd/commit/1611d6f028fe30da4cee5b026fd1de81d97cba48 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc5
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch134
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb4
3 files changed, 3 insertions, 140 deletions
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
index 6f7f69330..d037c7cfc 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
@@ -6,12 +6,9 @@ DEPENDS = "ppp virtual/kernel"
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
7 7
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=0636e73ff0215e8d672dc4c32c317bb3" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
10
11INC_PR = "r0"
12 10
13SRC_URI = "git://github.com/xelerance/xl2tpd.git \ 11SRC_URI = "git://github.com/xelerance/xl2tpd.git \
14 file://fix-inline-functions-errors-with-gcc-5.x.patch \
15" 12"
16 13
17S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch
deleted file mode 100644
index b75c9129d..000000000
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch
+++ /dev/null
@@ -1,134 +0,0 @@
1Upstream-Status: Backport
2
3Backport from https://github.com/xelerance/xl2tpd/commit/9098f64950eb22cf049058d40f647bafdb822174
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6---
7From 9098f64950eb22cf049058d40f647bafdb822174 Mon Sep 17 00:00:00 2001
8From: Kai Kang <kai.kang@windriver.com>
9Date: Wed, 23 Sep 2015 10:41:05 +0800
10Subject: [PATCH] Fix build errors caused by inline function with gcc 5
11
12GCC 5 defaults to -std=gnu11 instead of -std=gnu89. And -std=gnu89
13employs the GNU89 inline semantics, -std=gnu11 uses the C99 inline
14semantics.
15
16For 'inline' fuction, it is NOT exported by C99. So error messages such as:
17
18| control.c:1717: undefined reference to `check_control'
19
20For these functions which is not referred by other compile units, make
21them 'static inline'.
22
23For 'extern inline' function, it fails such as:
24
25| misc.h:68:20: warning: inline function 'swaps' declared but never defined
26| extern inline void swaps (void *, int);
27| ^
28
29Because function swaps() is referred by other compile units, it must be
30exported. The semantics of 'extern inline' are not same between GNU89
31and C99, so remove 'inline' attribute for compatible with GNU89.
32
33Ref:
34https://gcc.gnu.org/gcc-5/porting_to.html
35
36Signed-off-by: Kai Kang <kai.kang@windriver.com>
37---
38 control.c | 8 ++++----
39 misc.c | 2 +-
40 misc.h | 2 +-
41 network.c | 4 ++--
42 4 files changed, 8 insertions(+), 8 deletions(-)
43
44diff --git a/control.c b/control.c
45index b2891a9..c4a39b5 100644
46--- a/control.c
47+++ b/control.c
48@@ -1140,7 +1140,7 @@ int control_finish (struct tunnel *t, struct call *c)
49 return 0;
50 }
51
52-inline int check_control (const struct buffer *buf, struct tunnel *t,
53+static inline int check_control (const struct buffer *buf, struct tunnel *t,
54 struct call *c)
55 {
56 /*
57@@ -1276,7 +1276,7 @@ inline int check_control (const struct buffer *buf, struct tunnel *t,
58 return 0;
59 }
60
61-inline int check_payload (struct buffer *buf, struct tunnel *t,
62+static inline int check_payload (struct buffer *buf, struct tunnel *t,
63 struct call *c)
64 {
65 /*
66@@ -1382,7 +1382,7 @@ inline int check_payload (struct buffer *buf, struct tunnel *t,
67 #endif
68 return 0;
69 }
70-inline int expand_payload (struct buffer *buf, struct tunnel *t,
71+static inline int expand_payload (struct buffer *buf, struct tunnel *t,
72 struct call *c)
73 {
74 /*
75@@ -1562,7 +1562,7 @@ void send_zlb (void *data)
76 toss (buf);
77 }
78
79-inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
80+static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
81 int convert)
82 {
83 /*
84diff --git a/misc.c b/misc.c
85index 3092401..af90dbf 100644
86--- a/misc.c
87+++ b/misc.c
88@@ -170,7 +170,7 @@ void do_packet_dump (struct buffer *buf)
89 printf ("}\n");
90 }
91
92-inline void swaps (void *buf_v, int len)
93+void swaps (void *buf_v, int len)
94 {
95 #ifdef __alpha
96 /* Reverse byte order alpha is little endian so lest save a step.
97diff --git a/misc.h b/misc.h
98index aafdc62..caab7a1 100644
99--- a/misc.h
100+++ b/misc.h
101@@ -65,7 +65,7 @@ extern void l2tp_log (int level, const char *fmt, ...);
102 extern struct buffer *new_buf (int);
103 extern void udppush_handler (int);
104 extern int addfcs (struct buffer *buf);
105-extern inline void swaps (void *, int);
106+extern void swaps (void *, int);
107 extern void do_packet_dump (struct buffer *);
108 extern void status (const char *fmt, ...);
109 extern void status_handler (int signal);
110diff --git a/network.c b/network.c
111index b1268c6..d324a71 100644
112--- a/network.c
113+++ b/network.c
114@@ -135,7 +135,7 @@ int init_network (void)
115 return 0;
116 }
117
118-inline void extract (void *buf, int *tunnel, int *call)
119+static inline void extract (void *buf, int *tunnel, int *call)
120 {
121 /*
122 * Extract the tunnel and call #'s, and fix the order of the
123@@ -155,7 +155,7 @@ inline void extract (void *buf, int *tunnel, int *call)
124 }
125 }
126
127-inline void fix_hdr (void *buf)
128+static inline void fix_hdr (void *buf)
129 {
130 /*
131 * Fix the byte order of the header
132--
1332.6.1
134
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
index 42bc398a1..88ae5d6f8 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
@@ -2,7 +2,7 @@ require xl2tpd.inc
2 2
3# This is v1.3.6 plus some commits. There is no tag for this commit. 3# This is v1.3.6 plus some commits. There is no tag for this commit.
4# 4#
5PV = "1.3.6+git${SRCPV}" 5PV = "1.3.9+git${SRCPV}"
6 6
7SRCREV = "a96b345962622ea58490924130675df6db062d11" 7SRCREV = "f114c10ac532051badeca0132b144a2f1596f047"
8 8