rp-pppoe: Resync the 3.8 recipe with oe.dev and cleanup patches

- Update HOMEPAGE (from oe.dev)
- Bump PR to match oe.dev (will sync the next bits back over)
- Add Upstream-Status to all patches and a description to the ones
  missing descriptions.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Tom Rini
2011-07-28 03:32:59 +00:00
committed by Koen Kooi
parent 117fb53bfe
commit 966b46ed92
7 changed files with 23 additions and 3 deletions
@@ -1,3 +1,9 @@
Update the configure script to cross-compiling with OE. This hard-codes
a few target paths, reworks a few tests to be more friendly for cross
and drops other tests.
Upstream-Status: Inappropriate [build system specific changes]
Index: src/configure.in Index: src/configure.in
=================================================================== ===================================================================
--- rp-pppoe-3.8.orig/src/configure.in 2006-04-03 00:29:42.000000000 +1000 --- rp-pppoe-3.8.orig/src/configure.in 2006-04-03 00:29:42.000000000 +1000
@@ -1,3 +1,7 @@
Further fixup to the configure scripts to not swallow errors
Upstream-Status: Pending
--- a/src/configure.in.org 2008-01-14 21:08:38.000000000 +0200 --- a/src/configure.in.org 2008-01-14 21:08:38.000000000 +0200
+++ a/src/configure.in 2008-01-14 21:20:09.000000000 +0200 +++ a/src/configure.in 2008-01-14 21:20:09.000000000 +0200
@@ -208,7 +208,7 @@ @@ -208,7 +208,7 @@
@@ -3,6 +3,8 @@ Relax restrictions on the PPPoE src address, as per debian bug
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811
Upstream-Status: Inappropriate [Backport from Debian]
--- rp-pppoe-3.8.orig/src/discovery.c --- rp-pppoe-3.8.orig/src/discovery.c
+++ rp-pppoe-3.8/src/discovery.c +++ rp-pppoe-3.8/src/discovery.c
@@ -376,8 +376,8 @@ @@ -376,8 +376,8 @@
@@ -4,6 +4,8 @@ S. This adds enough autoconf at the top level to allow it to be
called there - all it does is run a sub autoconf stuff in the src called there - all it does is run a sub autoconf stuff in the src
directory. directory.
Upstream-Status: Inappropriate [build system specific change]
Index: rp-pppoe-3.8/Makefile.am Index: rp-pppoe-3.8/Makefile.am
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -6,6 +6,8 @@ The path for the plugin is wrong, it's now part of ppp and is in a
ppp's plugin lib directory. If no path is specified then that's where ppp's plugin lib directory. If no path is specified then that's where
ppp looks, so that's what we do here. ppp looks, so that's what we do here.
Upstream-Status: Inappropriate [configuration]
Index: rp-pppoe-3.8/configs/pppoe.conf Index: rp-pppoe-3.8/configs/pppoe.conf
=================================================================== ===================================================================
--- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 --- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000
@@ -1,3 +1,7 @@
Make the Makefile obey LDFLAGS.
Upstream-Status: Pending
--- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400 --- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400
+++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400 +++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400
@@ -67,16 +67,16 @@ all: $(TARGETS) @@ -67,16 +67,16 @@ all: $(TARGETS)
@@ -1,12 +1,12 @@
DESCRIPTION = "A user-mode PPPoE client and server suite for Linux" DESCRIPTION = "A user-mode PPPoE client and server suite for Linux"
HOMEPAGE = "http://www.roaringpenguin.com/en/penguin/openSourceProducts/rpPppoe" HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe"
SECTION = "console/network" SECTION = "console/network"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
RDEPENDS_${PN} = "ppp" RDEPENDS_${PN} = "ppp"
RDEPENDS_${PN}-server = "${PN}" RDEPENDS_${PN}-server = "${PN}"
RRECOMMENDS_${PN} = "ppp-oe" RRECOMMENDS_${PN} = "ppp-oe"
PR = "r7" PR = "r8"
SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
file://top-autoconf.patch \ file://top-autoconf.patch \
@@ -14,7 +14,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
file://pppoe-src-restrictions.patch \ file://pppoe-src-restrictions.patch \
file://update-config.patch \ file://update-config.patch \
file://dont-swallow-errors.patch \ file://dont-swallow-errors.patch \
file://use-ldflags.patch \ file://use-ldflags.patch \
file://pppoe-server.default \ file://pppoe-server.default \
file://pppoe-server.init" file://pppoe-server.init"