summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commitac91e7084fdea49befdb84e78d4a533c075dd28f (patch)
treefa208fe5725cb52dbc763c106c3ec90f8bec85fc
parent50178323e6ea268896a79a7027069dca5ba0fabd (diff)
downloadpoky-ac91e7084fdea49befdb84e78d4a533c075dd28f.tar.gz
ppp: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 9f2ce622866c9766dc861561671ebb3f1c407e0b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/ppp/ppp/cifdefroute.patch71
-rw-r--r--meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch15
2 files changed, 46 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
index db4dbc27a9..7dd69d8f4d 100644
--- a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
+++ b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
@@ -4,10 +4,11 @@ Rebased it to fit ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
4 4
5Upstream-Status: Inappropriate [debian/suse patches] 5Upstream-Status: Inappropriate [debian/suse patches]
6 6
7diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c 7Index: ppp-2.4.7/pppd/ipcp.c
8--- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 8===================================================================
9+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 16:40:00.478716855 +0800 9--- ppp-2.4.7.orig/pppd/ipcp.c
10@@ -198,6 +198,16 @@ 10+++ ppp-2.4.7/pppd/ipcp.c
11@@ -198,6 +198,16 @@ static option_t ipcp_option_list[] = {
11 "disable defaultroute option", OPT_ALIAS | OPT_A2CLR, 12 "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
12 &ipcp_wantoptions[0].default_route }, 13 &ipcp_wantoptions[0].default_route },
13 14
@@ -24,7 +25,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
24 { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, 25 { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
25 "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, 26 "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
26 { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, 27 { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
27@@ -271,7 +281,7 @@ 28@@ -271,7 +281,7 @@ struct protent ipcp_protent = {
28 ip_active_pkt 29 ip_active_pkt
29 }; 30 };
30 31
@@ -33,7 +34,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
33 static void ipcp_script __P((char *, int)); /* Run an up/down script */ 34 static void ipcp_script __P((char *, int)); /* Run an up/down script */
34 static void ipcp_script_done __P((void *)); 35 static void ipcp_script_done __P((void *));
35 36
36@@ -1742,7 +1752,12 @@ 37@@ -1761,7 +1771,12 @@ ip_demand_conf(u)
37 if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) 38 if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
38 return 0; 39 return 0;
39 if (wo->default_route) 40 if (wo->default_route)
@@ -46,7 +47,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
46 default_route_set[u] = 1; 47 default_route_set[u] = 1;
47 if (wo->proxy_arp) 48 if (wo->proxy_arp)
48 if (sifproxyarp(u, wo->hisaddr)) 49 if (sifproxyarp(u, wo->hisaddr))
49@@ -1830,7 +1845,8 @@ 50@@ -1849,7 +1864,8 @@ ipcp_up(f)
50 */ 51 */
51 if (demand) { 52 if (demand) {
52 if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { 53 if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -56,7 +57,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
56 if (go->ouraddr != wo->ouraddr) { 57 if (go->ouraddr != wo->ouraddr) {
57 warn("Local IP address changed to %I", go->ouraddr); 58 warn("Local IP address changed to %I", go->ouraddr);
58 script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0); 59 script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
59@@ -1855,7 +1871,12 @@ 60@@ -1874,7 +1890,12 @@ ipcp_up(f)
60 61
61 /* assign a default route through the interface if required */ 62 /* assign a default route through the interface if required */
62 if (ipcp_wantoptions[f->unit].default_route) 63 if (ipcp_wantoptions[f->unit].default_route)
@@ -69,7 +70,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
69 default_route_set[f->unit] = 1; 70 default_route_set[f->unit] = 1;
70 71
71 /* Make a proxy ARP entry if requested. */ 72 /* Make a proxy ARP entry if requested. */
72@@ -1905,7 +1926,12 @@ 73@@ -1924,7 +1945,12 @@ ipcp_up(f)
73 74
74 /* assign a default route through the interface if required */ 75 /* assign a default route through the interface if required */
75 if (ipcp_wantoptions[f->unit].default_route) 76 if (ipcp_wantoptions[f->unit].default_route)
@@ -82,7 +83,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
82 default_route_set[f->unit] = 1; 83 default_route_set[f->unit] = 1;
83 84
84 /* Make a proxy ARP entry if requested. */ 85 /* Make a proxy ARP entry if requested. */
85@@ -1983,7 +2009,7 @@ 86@@ -2002,7 +2028,7 @@ ipcp_down(f)
86 sifnpmode(f->unit, PPP_IP, NPMODE_DROP); 87 sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
87 sifdown(f->unit); 88 sifdown(f->unit);
88 ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, 89 ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -91,7 +92,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
91 } 92 }
92 93
93 /* Execute the ip-down script */ 94 /* Execute the ip-down script */
94@@ -1999,12 +2025,21 @@ 95@@ -2018,12 +2044,21 @@ ipcp_down(f)
95 * proxy arp entries, etc. 96 * proxy arp entries, etc.
96 */ 97 */
97 static void 98 static void
@@ -115,10 +116,11 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
115 cifproxyarp(unit, hisaddr); 116 cifproxyarp(unit, hisaddr);
116 proxy_arp_set[unit] = 0; 117 proxy_arp_set[unit] = 0;
117 } 118 }
118diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h 119Index: ppp-2.4.7/pppd/ipcp.h
119--- ppp-2.4.5-orig/pppd/ipcp.h 2010-06-30 15:51:12.043682063 +0800 120===================================================================
120+++ ppp-2.4.5/pppd/ipcp.h 2010-06-30 16:40:49.586203129 +0800 121--- ppp-2.4.7.orig/pppd/ipcp.h
121@@ -70,6 +70,7 @@ 122+++ ppp-2.4.7/pppd/ipcp.h
123@@ -70,6 +70,7 @@ typedef struct ipcp_options {
122 bool old_addrs; /* Use old (IP-Addresses) option? */ 124 bool old_addrs; /* Use old (IP-Addresses) option? */
123 bool req_addr; /* Ask peer to send IP address? */ 125 bool req_addr; /* Ask peer to send IP address? */
124 bool default_route; /* Assign default route through interface? */ 126 bool default_route; /* Assign default route through interface? */
@@ -126,10 +128,11 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h
126 bool proxy_arp; /* Make proxy ARP entry for peer? */ 128 bool proxy_arp; /* Make proxy ARP entry for peer? */
127 bool neg_vj; /* Van Jacobson Compression? */ 129 bool neg_vj; /* Van Jacobson Compression? */
128 bool old_vj; /* use old (short) form of VJ option? */ 130 bool old_vj; /* use old (short) form of VJ option? */
129diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8 131Index: ppp-2.4.7/pppd/pppd.8
130--- ppp-2.4.5-orig/pppd/pppd.8 2010-06-30 15:51:12.043682063 +0800 132===================================================================
131+++ ppp-2.4.5/pppd/pppd.8 2010-06-30 16:42:47.102413859 +0800 133--- ppp-2.4.7.orig/pppd/pppd.8
132@@ -121,6 +121,13 @@ 134+++ ppp-2.4.7/pppd/pppd.8
135@@ -121,6 +121,13 @@ the gateway, when IPCP negotiation is su
133 This entry is removed when the PPP connection is broken. This option 136 This entry is removed when the PPP connection is broken. This option
134 is privileged if the \fInodefaultroute\fR option has been specified. 137 is privileged if the \fInodefaultroute\fR option has been specified.
135 .TP 138 .TP
@@ -143,7 +146,7 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8
143 .B disconnect \fIscript 146 .B disconnect \fIscript
144 Execute the command specified by \fIscript\fR, by passing it to a 147 Execute the command specified by \fIscript\fR, by passing it to a
145 shell, after 148 shell, after
146@@ -717,7 +724,12 @@ 149@@ -734,7 +741,12 @@ disable both forms of hardware flow cont
147 .TP 150 .TP
148 .B nodefaultroute 151 .B nodefaultroute
149 Disable the \fIdefaultroute\fR option. The system administrator who 152 Disable the \fIdefaultroute\fR option. The system administrator who
@@ -157,10 +160,11 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8
157 can do so by placing this option in the /etc/ppp/options file. 160 can do so by placing this option in the /etc/ppp/options file.
158 .TP 161 .TP
159 .B nodeflate 162 .B nodeflate
160diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h 163Index: ppp-2.4.7/pppd/pppd.h
161--- ppp-2.4.5-orig/pppd/pppd.h 2010-06-30 15:51:12.050166398 +0800 164===================================================================
162+++ ppp-2.4.5/pppd/pppd.h 2010-06-30 16:43:36.514148327 +0800 165--- ppp-2.4.7.orig/pppd/pppd.h
163@@ -643,7 +643,11 @@ 166+++ ppp-2.4.7/pppd/pppd.h
167@@ -665,7 +665,11 @@ int sif6addr __P((int, eui64_t, eui64_t
164 int cif6addr __P((int, eui64_t, eui64_t)); 168 int cif6addr __P((int, eui64_t, eui64_t));
165 /* Remove an IPv6 address from i/f */ 169 /* Remove an IPv6 address from i/f */
166 #endif 170 #endif
@@ -172,19 +176,20 @@ diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h
172 /* Create default route through i/f */ 176 /* Create default route through i/f */
173 int cifdefaultroute __P((int, u_int32_t, u_int32_t)); 177 int cifdefaultroute __P((int, u_int32_t, u_int32_t));
174 /* Delete default route through i/f */ 178 /* Delete default route through i/f */
175diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c 179Index: ppp-2.4.7/pppd/sys-linux.c
176--- ppp-2.4.5-orig/pppd/sys-linux.c 2010-06-30 15:51:12.050166398 +0800 180===================================================================
177+++ ppp-2.4.5/pppd/sys-linux.c 2010-06-30 16:54:00.362716231 +0800 181--- ppp-2.4.7.orig/pppd/sys-linux.c
178@@ -206,6 +206,8 @@ 182+++ ppp-2.4.7/pppd/sys-linux.c
179 183@@ -207,6 +207,8 @@ static unsigned char inbuf[512]; /* buff
180 static int if_is_up; /* Interface has been marked up */ 184 static int if_is_up; /* Interface has been marked up */
185 static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */
181 static int have_default_route; /* Gateway for default route added */ 186 static int have_default_route; /* Gateway for default route added */
182+static struct rtentry old_def_rt; /* Old default route */ 187+static struct rtentry old_def_rt; /* Old default route */
183+static int default_rt_repl_rest; /* replace and restore old default rt */ 188+static int default_rt_repl_rest; /* replace and restore old default rt */
184 static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ 189 static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */
185 static char proxy_arp_dev[16]; /* Device for proxy arp entry */ 190 static char proxy_arp_dev[16]; /* Device for proxy arp entry */
186 static u_int32_t our_old_addr; /* for detecting address changes */ 191 static u_int32_t our_old_addr; /* for detecting address changes */
187@@ -1537,6 +1539,9 @@ 192@@ -1545,6 +1547,9 @@ static int read_route_table(struct rtent
188 p = NULL; 193 p = NULL;
189 } 194 }
190 195
@@ -194,7 +199,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
194 SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); 199 SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
195 SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); 200 SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
196 SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); 201 SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
197@@ -1606,20 +1611,51 @@ 202@@ -1614,20 +1619,51 @@ int have_route_to(u_int32_t addr)
198 /******************************************************************** 203 /********************************************************************
199 * 204 *
200 * sifdefaultroute - assign a default route through the address given. 205 * sifdefaultroute - assign a default route through the address given.
@@ -260,7 +265,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
260 } 265 }
261 266
262 memset (&rt, 0, sizeof (rt)); 267 memset (&rt, 0, sizeof (rt));
263@@ -1638,6 +1674,12 @@ 268@@ -1646,6 +1682,12 @@ int sifdefaultroute (int unit, u_int32_t
264 error("default route ioctl(SIOCADDRT): %m"); 269 error("default route ioctl(SIOCADDRT): %m");
265 return 0; 270 return 0;
266 } 271 }
@@ -273,7 +278,7 @@ diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
273 278
274 have_default_route = 1; 279 have_default_route = 1;
275 return 1; 280 return 1;
276@@ -1673,6 +1715,16 @@ 281@@ -1681,6 +1723,16 @@ int cifdefaultroute (int unit, u_int32_t
277 return 0; 282 return 0;
278 } 283 }
279 } 284 }
diff --git a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
index d59717ebd3..8a69396cc7 100644
--- a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
@@ -6,10 +6,11 @@ Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
6 6
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
8 8
9diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux 9Index: ppp-2.4.7/pppd/Makefile.linux
10--- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800 10===================================================================
11+++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 17:08:21.806363042 +0800 11--- ppp-2.4.7.orig/pppd/Makefile.linux
12@@ -117,10 +117,10 @@ 12+++ ppp-2.4.7/pppd/Makefile.linux
13@@ -120,10 +120,10 @@ CFLAGS += -DHAS_SHADOW
13 #LIBS += -lshadow $(LIBS) 14 #LIBS += -lshadow $(LIBS)
14 endif 15 endif
15 16
@@ -20,9 +21,9 @@ diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
20-endif 21-endif
21+#endif 22+#endif
22 23
23 ifdef NEEDDES 24 ifdef USE_LIBUTIL
24 ifndef USE_CRYPT 25 CFLAGS += -DHAVE_LOGWTMP=1
25@@ -169,10 +169,10 @@ 26@@ -177,10 +177,10 @@ LIBS += -ldl
26 endif 27 endif
27 28
28 ifdef FILTER 29 ifdef FILTER