diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:49:45 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
| commit | 268e9ef7206b8fb959099510da960f54639a0be0 (patch) | |
| tree | e467741ef4459b85248272d44f60ebd7c9819619 /meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch | |
| parent | 68c8fe1aba92ca2ed5e1156fa0050609ab4f73af (diff) | |
| download | meta-openembedded-contrib-268e9ef7206b8fb959099510da960f54639a0be0.tar.gz | |
rp-pppoe: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file src/discovery.c
Hunk #1 succeeded at 472 with fuzz 1 (offset 96 lines)
among others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch')
| -rw-r--r-- | meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch index bcf4d1164d..03697ff1f6 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch @@ -1,3 +1,8 @@ +From a6a85ec5c85cbd3c86743b6e2fa391198869bff8 Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + Relax restrictions on the PPPoE src address, as per debian bug 293811: @@ -5,9 +10,15 @@ Relax restrictions on the PPPoE src address, as per debian bug Upstream-Status: Inappropriate [Backport from Debian] ---- rp-pppoe-3.8.orig/src/discovery.c -+++ rp-pppoe-3.8/src/discovery.c -@@ -376,8 +376,8 @@ +--- + src/discovery.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/discovery.c b/src/discovery.c +index 7ee259d..5213a37 100644 +--- a/src/discovery.c ++++ b/src/discovery.c +@@ -472,8 +472,8 @@ waitForPADO(PPPoEConnection *conn, int timeout) if (!packetIsForMe(conn, &packet)) continue; if (packet.code == CODE_PADO) { @@ -17,4 +28,4 @@ Upstream-Status: Inappropriate [Backport from Debian] + printErr("Ignoring broadcast PADO packet"); continue; } - parsePacket(&packet, parsePADOTags, &pc); + #ifdef PLUGIN |