summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/rp-pppoe/ChangeLog7
-rw-r--r--net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch13
2 files changed, 17 insertions, 3 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index fed7ba2cc981..3b0a75c877a0 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/rp-pppoe
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.100 2008/08/23 03:52:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.101 2008/09/10 20:56:43 mrness Exp $
+
+ 10 Sep 2008; Alin Năstac <mrness@gentoo.org>
+ files/rp-pppoe-3.10-autotools.patch:
+ Avoid executing pppd just for checking the version, it only increase chances
+ of sandbox violation (#236923).
*rp-pppoe-3.10-r1 (23 Aug 2008)
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
index 66a6e9de9bcb..e10e8ac72ed1 100644
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
@@ -72,6 +72,15 @@ diff -Nru rp-pppoe-3.10.orig/src/configure.in rp-pppoe-3.10/src/configure.in
AC_TRY_RUN([#include <sys/socket.h>
#include <net/ethernet.h>
#include <linux/if.h>
+@@ -204,7 +204,7 @@
+ dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than
+ dnl 2.3.7 -- stop
+
+-PPPD_VERSION=`$PPPD --version 2>&1 | awk ' /version/ {print $NF}'`
++PPPD_VERSION=2.4.4
+
+ case "$PPPD_VERSION" in
+ 1.*|2.0.*|2.1.*|2.2.*|2.3.0|2.3.1|2.3.2|2.3.3|2.3.4|2.3.5|2.3.6)
@@ -258,7 +258,7 @@
if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
@@ -86,7 +95,7 @@ diff -Nru rp-pppoe-3.10.orig/src/plugin.c rp-pppoe-3.10/src/plugin.c
+++ rp-pppoe-3.10/src/plugin.c 2008-06-30 22:27:18.000000000 +0200
@@ -27,7 +27,6 @@
static char const RCSID[] =
- "$Id: rp-pppoe-3.10-autotools.patch,v 1.1 2008/06/30 21:40:26 mrness Exp $";
+ "$Id: rp-pppoe-3.10-autotools.patch,v 1.2 2008/09/10 20:56:43 mrness Exp $";
-#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -97,7 +106,7 @@ diff -Nru rp-pppoe-3.10.orig/src/relay.c rp-pppoe-3.10/src/relay.c
+++ rp-pppoe-3.10/src/relay.c 2008-06-30 22:27:18.000000000 +0200
@@ -17,8 +17,6 @@
static char const RCSID[] =
- "$Id: rp-pppoe-3.10-autotools.patch,v 1.1 2008/06/30 21:40:26 mrness Exp $";
+ "$Id: rp-pppoe-3.10-autotools.patch,v 1.2 2008/09/10 20:56:43 mrness Exp $";
-#define _GNU_SOURCE 1 /* For SA_RESTART */
-