Avoid executing pppd just for checking the version, it only increase chances of sandbox violation (#236923).

Package-Manager: portage-2.1.4.4

3 files changed, 22 insertions, 8 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/Manifest b/net-dialup/rp-pppoe/Manifest
index 3be00d2ed5be..4fe5f91474dc 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rp-pppoe-3.10-autotools.patch 3879 RMD160 09294eef31ffa7bbef0b2bf11370f839d7daa6da SHA1 0b15045295976be5b2e589877b32a14e581e620e SHA256 3895842d42234f632681ab3b88a55d9b7a53c6c469c7399eb708ea699bc629c3
+AUX rp-pppoe-3.10-autotools.patch 4176 RMD160 85ad91e81da97a32eee2628aa7706e242a8880b9 SHA1 2d4fecac2bc0bc087b19f91bbef409cbf36567fa SHA256 3bfa24576369a0223067d45af8671188893fbd84cb80f3f64f7a7f0d7787f77a
 AUX rp-pppoe-3.10-gentoo-netscripts.patch 5238 RMD160 8aa0e19fc56145d082bb8e2fd42065c28d8f140d SHA1 da66c718e9c4c15f09b4118287b9a4c78c39a58d SHA256 c9c4997c3db1d0d350d285f371575b12cb15f15dfeac920b2fe573bff85754dc
 AUX rp-pppoe-3.10-linux-headers.patch 823 RMD160 bd0bb516a130d9e96dcc95bcff1b5a910fdc62fb SHA1 923c0309182d7122dcf65ef66c327ea3a29869bb SHA256 39c854283b6a3d4ef382fb8aa1339b6a64be42c0922fa48ecc9b0c19e2a103e6
 AUX rp-pppoe-3.10-plugin-options.patch 1491 RMD160 9ab34c6f39f65da909ae03f7124722d8d5dd3c3b SHA1 294cd49572a3a9e8c8bcde17eb3c26cb99449abc SHA256 dc3fe5aa64c1880a701940e5636964eb90a3afec8ddf739aa4046fdf771d0374
@@ -20,12 +20,12 @@ DIST rp-pppoe-3.8.tar.gz 212931 RMD160 039798154acae9e7a066172f23904d766ba68a9a
 EBUILD rp-pppoe-3.10-r1.ebuild 2452 RMD160 c14cb6416a54bf51a960f748b3f6ffcd7d2077ce SHA1 340dd5c3b4046d5c8e418294fa77acaaffd7ab70 SHA256 bc5c1a4f9b593b5ed723c6bece319bbbb9d5eeb0784ee3a8cac5c1db4acc9bf5
 EBUILD rp-pppoe-3.8-r1.ebuild 2398 RMD160 d26b515b82925c30324e2551724bafc5352269af SHA1 5bf0e82a94cea527f71ea5b7cbda920d2623668f SHA256 63a799995ac841926ea2cab94fe359ca08e8c9b46e38dcca6de0e8a67cffc5c6
 EBUILD rp-pppoe-3.8-r2.ebuild 2456 RMD160 c49a0697812c789b57ff15fc92b0290a68cb12c5 SHA1 cc0a35bf0015f213c1e483dd01714eaf78b3a7a6 SHA256 d6a6e6ad8cc46861832ef8786180e252c831c9b8d05b1e536f4ad77cbb1a2bd9
-MISC ChangeLog 15330 RMD160 aebfe69c724bd5fa3eafdc51c746c7f1ff2f7db0 SHA1 290d960d13478271a9041aeb2b5c23d4cef16f36 SHA256 5a6df3ad21bd04fd12523e21dfba88b2216dde7dcb6794df04c0478cafccd951
+MISC ChangeLog 15531 RMD160 2f81375c4b9b2835d2276568273d82369bb939b4 SHA1 6fe225d073200ef3cda54f6b8e20f938992dea28 SHA256 38116e741c6d28ab2be94ee1bae436eac939bd56fd4f3e4a4f11045efedb0208
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiviZkACgkQPrHvTlXvhttplQCgp4i/FjzVn5Dd5kOvGgLjQTn6
-DdIAniIe7YorzWDgbqStNUcPOnoOEX4i
-=0XmX
+iEYEARECAAYFAkjINJUACgkQPrHvTlXvhtu7YgCfa9YMHNNi55GdXUZoWuS5P+TT
+fKcAn1CUOkKZGzvSUIt2itGm2ATfEN4U
+=QLZQ
 -----END PGP SIGNATURE-----
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 */
 -