From patchwork Tue Sep 4 14:06:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 181570 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6FFA62C0093 for ; Wed, 5 Sep 2012 00:06:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 33D0E30F17; Tue, 4 Sep 2012 14:06:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6wCKFQ0K40N0; Tue, 4 Sep 2012 14:06:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 71A6124F5D; Tue, 4 Sep 2012 14:06:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CBB6D8F75B for ; Tue, 4 Sep 2012 14:06:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 11D8F888D4 for ; Tue, 4 Sep 2012 14:06:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ySQEFmwG6aD4 for ; Tue, 4 Sep 2012 14:06:44 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [85.10.205.246]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8B51D88791 for ; Tue, 4 Sep 2012 14:06:44 +0000 (UTC) Received: from asgard (host146.190-139-159.telecom.net.ar [190.139.159.146]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q84E6bJ0004816 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 4 Sep 2012 14:06:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1346767602; bh=iJLLh/VTL4kFmS0uYbZto8CG4uNtmHQjipeN3yNWnaw=; h=From:To:Cc:Subject:Date; b=KC7hT9diw2etTABWb98E19QX5mypcxFo+TonkamNATONn8cUoQfC+P6J6o3FIVqMl x48xb8qjGAqOvbSND58/TiTijqFzl6WrZRaD3P0RiQxnPvGeQV8ZsSyhSUNRzdo3Du wJ4vhZVThxAoJfkJXqkzOZFCnJrsBxSkk/fvzgIg= Received: by asgard (sSMTP sendmail emulation); Tue, 04 Sep 2012 11:06:36 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 4 Sep 2012 11:06:36 -0300 Message-Id: <1346767596-7924-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] rp-pppoe: bump to version 3.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- .../rp-pppoe-3.10-001-configure-bitfield.patch | 34 -------------------- .../rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch | 20 ++++++----- package/rp-pppoe/rp-pppoe.mk | 4 ++- 3 files changed, 14 insertions(+), 44 deletions(-) delete mode 100644 package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch diff --git a/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch b/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch deleted file mode 100644 index 8cc472f..0000000 --- a/package/rp-pppoe/rp-pppoe-3.10-001-configure-bitfield.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- rp-pppoe-3.10.orig/src/configure.in 2006-04-02 16:29:42.000000000 +0200 -+++ rp-pppoe-3.10/src/configure.in 2007-08-24 11:51:04.000000000 +0200 -@@ -231,6 +231,7 @@ esac - - dnl Figure out packing order of structures - AC_MSG_CHECKING([packing order of bit fields]) -+if test "x$rpppoe_cv_pack_bitfields" = "x" ; then - AC_TRY_RUN([ - union foo { - struct bar { -@@ -254,8 +255,8 @@ main(void) - return 2; - } - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -- -+$ECHO "no defaults for cross-compiling") -+fi - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) - AC_DEFINE(PACK_BITFIELDS_REVERSED) ---- rp-pppoe-3.10.orig/src/configure 2010-08-20 10:46:39.000000000 -0700 -+++ rp-pppoe-3.10/src/configure 2010-08-20 11:02:16.000000000 -0700 -@@ -6272,7 +6272,9 @@ esac - { echo "$as_me:$LINENO: checking packing order of bit fields" >&5 - echo $ECHO_N "checking packing order of bit fields... $ECHO_C" >&6; } - if test "$cross_compiling" = yes; then -- $ECHO "no defaults for cross-compiling"; exit 0 -+if test "x$rpppoe_cv_pack_bitfields" = "x" ; then -+ $ECHO "no defaults for cross-compiling" -+fi - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch b/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch index 27c8357..d364e86 100644 --- a/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch +++ b/package/rp-pppoe/rp-pppoe-3.10-002-krn-plugin.patch @@ -1,17 +1,19 @@ ---- rp-pppoe-3.10/src/configure.theorig 2008-02-05 13:57:15.000000000 -0800 -+++ rp-pppoe-3.10/src/configure 2008-02-05 13:24:36.000000000 -0800 -@@ -6151,7 +6151,7 @@ modprobe ppp_synctty > /dev/null 2>&1 +diff -Nura rp-pppoe-3.11.orig/src/configure rp-pppoe-3.11/src/configure +--- rp-pppoe-3.11.orig/src/configure 2012-08-21 10:01:10.536440032 -0300 ++++ rp-pppoe-3.11/src/configure 2012-08-21 10:01:45.353442397 -0300 +@@ -4517,7 +4517,7 @@ modprobe pppoe > /dev/null 2>&1 fi - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : - ac_cv_linux_kernel_pppoe=no; $ECHO "cross-compiling, default: " + ac_cv_linux_kernel_pppoe=yes; $ECHO "cross-compiling, default: " else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ ---- rp-pppoe-3.10/src/pppoe-server.c.theorig 2006-04-02 07:29:42.000000000 -0700 -+++ rp-pppoe-3.10/src/pppoe-server.c 2008-02-05 13:52:15.000000000 -0800 -@@ -20,6 +20,9 @@ static char const RCSID[] = + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +diff -Nura rp-pppoe-3.11.orig/src/pppoe-server.c rp-pppoe-3.11/src/pppoe-server.c +--- rp-pppoe-3.11.orig/src/pppoe-server.c 2012-08-21 10:01:10.535440032 -0300 ++++ rp-pppoe-3.11/src/pppoe-server.c 2012-08-21 10:02:02.597443569 -0300 +@@ -20,6 +20,9 @@ #include "config.h" diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index cf12d64..106d310 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -4,8 +4,10 @@ # ############################################################# -RP_PPPOE_VERSION = 3.10 +RP_PPPOE_VERSION = 3.11 RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download +RP_PPPOE_LICENSE = GPLv2 +RP_PPPOE_LICENSE_FILES = doc/LICENSE RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff