Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/rp-pppoe/files: rp-pppoe-3.10-username-charset.patch rp-pppoe-3.10-gentoo-netscripts.patch rp-pppoe-3.10-autotools.patch rp-pppoe-3.10-linux-headers.patch rp-pppoe-3.10-session-offset.patch rp-pppoe-3.10-plugin-options.patch
Date: Mon, 30 Jun 2008 21:40:32
Message-Id: E1KDR6o-0002L5-Kr@stork.gentoo.org
1 mrness 08/06/30 21:40:26
2
3 Added: rp-pppoe-3.10-username-charset.patch
4 rp-pppoe-3.10-gentoo-netscripts.patch
5 rp-pppoe-3.10-autotools.patch
6 rp-pppoe-3.10-linux-headers.patch
7 rp-pppoe-3.10-session-offset.patch
8 rp-pppoe-3.10-plugin-options.patch
9 Log:
10 Version bump (#230013). Depend on <sys-kernel/linux-headers-2.6.24 (#227197).
11 (Portage version: 2.1.4.4)
12
13 Revision Changes Path
14 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch?rev=1.1&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch?rev=1.1&content-type=text/plain
18
19 Index: rp-pppoe-3.10-username-charset.patch
20 ===================================================================
21 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-setup.in rp-pppoe-3.10/scripts/pppoe-setup.in
22 --- rp-pppoe-3.10.orig/scripts/pppoe-setup.in 2008-06-30 16:00:42.000000000 +0200
23 +++ rp-pppoe-3.10/scripts/pppoe-setup.in 2008-06-30 22:23:40.000000000 +0200
24 @@ -86,11 +86,13 @@
25 $ECHO "USER NAME"
26 $ECHO ""
27 printf "%s" ">>> Enter your PPPoE user name (default $USER): "
28 - read U
29 + read Uu
30
31 - if [ "$U" = "" ] ; then
32 - U="$USER"
33 + if [ "$Uu" = "" ] ; then
34 + Uu="$USER"
35 fi
36 +
37 + U=`echo $Uu | sed -e "s/&/\\\\\&/g"`
38
39 # Under Linux, "fix" the default interface if eth1 is not available
40 if test `uname -s` = "Linux" ; then
41 @@ -221,7 +223,7 @@
42 $ECHO "** Summary of what you entered **"
43 $ECHO ""
44 $ECHO "Ethernet Interface: $E"
45 - $ECHO "User name: $U"
46 + $ECHO "User name: $Uu"
47 if [ "$D" = "no" ] ; then
48 $ECHO "Activate-on-demand: No"
49 else
50 @@ -288,7 +290,12 @@
51 fi
52
53 # Some #$(*& ISP's use a slash in the user name...
54 -sed -e "s&^USER=.*&USER='$U'&" \
55 +for SEP in ':' ';' '/' '!' '|' '_' '-' '@' ; do
56 + if [ "$U" = `echo $U | sed "sI${SEP}II"` ]; then
57 + break;
58 + fi
59 +done
60 +sed -e "s${SEP}^USER=.*${SEP}USER='$U'${SEP}"\
61 -e "s&^ETH=.*&ETH='$E'&" \
62 -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-pppoe.pid\"&" \
63 -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
64 @@ -337,10 +344,10 @@
65 cp /dev/null /etc/ppp/chap-secrets-bak
66 fi
67
68 -egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
69 -$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/pap-secrets
70 -egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
71 -$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/chap-secrets
72 +egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
73 +$ECHO "\"$Uu\" * \"$PWD1\"" >> /etc/ppp/pap-secrets
74 +egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
75 +$ECHO "\"$Uu\" * \"$PWD1\"" >> /etc/ppp/chap-secrets
76
77 $ECHO ""
78 $ECHO ""
79
80
81
82 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch
83
84 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch?rev=1.1&view=markup
85 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch?rev=1.1&content-type=text/plain
86
87 Index: rp-pppoe-3.10-gentoo-netscripts.patch
88 ===================================================================
89 diff -Nru rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf
90 --- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-06-30 16:00:42.000000000 +0200
91 +++ rp-pppoe-3.10/configs/pppoe.conf 2008-06-30 22:22:32.000000000 +0200
92 @@ -21,6 +21,9 @@
93 # When you configure a variable, DO NOT leave spaces around the "=" sign.
94
95 # Ethernet card connected to DSL modem
96 +#
97 +# NB: Gentoo overrides ETH when pppoe-start is called from the
98 +# networking scripts. This setting has no effect in that case.
99 ETH=eth1
100
101 # PPPoE user name. You may have to supply "@provider.com" Sympatico
102 @@ -86,8 +89,10 @@
103 # $PIDFILE contains PID of pppoe-connect script
104 # $PIDFILE.pppoe contains PID of pppoe process
105 # $PIDFILE.pppd contains PID of pppd process
106 -CF_BASE=`basename $CONFIG`
107 -PIDFILE="/var/run/$CF_BASE-pppoe.pid"
108 +#
109 +# NB: Gentoo overrides PIDFILE when pppoe-start is run from the
110 +# networking scripts. This setting has no effect in that case.
111 +PIDFILE="/var/run/rp-pppoe.pid"
112
113 # Do you want to use synchronous PPP? "yes" or "no". "yes" is much
114 # easier on CPU usage, but may not work for you. It is safer to use
115 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in
116 --- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-06-30 16:00:42.000000000 +0200
117 +++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-06-30 22:22:32.000000000 +0200
118 @@ -62,12 +62,17 @@
119 ;;
120 esac
121
122 -if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then
123 +# In Gentoo, CONFIG is a named pipe when pppoe is started by the
124 +# network scripts. Testing -r is allowed; testing -f is not.
125 +if test ! -r "$CONFIG" ; then
126 echo "$0: Cannot read configuration file '$CONFIG'" >& 2
127 exit 1
128 fi
129 -export CONFIG
130 -. $CONFIG
131 +
132 +# Read the named pipe (/dev/fd/foo) into a variable so we can use it
133 +# again later (since reading once from the pipe will exhaust it)
134 +CONFREAD=$(<$CONFIG)
135 +eval "$CONFREAD"
136
137 PPPOE_PIDFILE="$PIDFILE.pppoe"
138 PPPD_PIDFILE="$PIDFILE.pppd"
139 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-start.in rp-pppoe-3.10/scripts/pppoe-start.in
140 --- rp-pppoe-3.10.orig/scripts/pppoe-start.in 2008-06-30 16:00:42.000000000 +0200
141 +++ rp-pppoe-3.10/scripts/pppoe-start.in 2008-06-30 22:22:32.000000000 +0200
142 @@ -1,4 +1,4 @@
143 -#!/bin/sh
144 +#!/bin/bash
145 # @configure_input@
146 #***********************************************************************
147 #
148 @@ -113,12 +113,17 @@
149 ;;
150 esac
151
152 -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
153 +# In Gentoo, CONFIG is a named pipe when pppoe is started by the
154 +# network scripts. Testing -r is allowed; testing -f is not.
155 +if [ ! -r "$CONFIG" ] ; then
156 $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2
157 exit 1
158 fi
159 -export CONFIG
160 -. $CONFIG
161 +
162 +# Read the named pipe (/dev/fd/foo) into a variable so we can use it
163 +# again later (since reading once from the pipe will exhaust it)
164 +CONFREAD=$(<$CONFIG)
165 +eval "$CONFREAD"
166
167 # Check for command-line overriding of ETH and USER
168 case "$#" in
169 @@ -145,11 +150,11 @@
170
171 # Start the connection in the background unless we're debugging
172 if [ "$DEBUG" != "" ] ; then
173 - $CONNECT "$@"
174 + $CONNECT <(echo "$CONFREAD")
175 exit 0
176 fi
177
178 -$CONNECT "$@" > /dev/null 2>&1 &
179 +$CONNECT <(echo "$CONFREAD") >/dev/null 2>&1 &
180 CONNECT_PID=$!
181
182 if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then
183 @@ -164,7 +169,7 @@
184 # Monitor connection
185 TIME=0
186 while [ true ] ; do
187 - @sbindir@/pppoe-status $CONFIG > /dev/null 2>&1
188 + @sbindir@/pppoe-status <(echo "$CONFREAD") >/dev/null 2>&1
189
190 # Looks like the interface came up
191 if [ $? = 0 ] ; then
192 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-status rp-pppoe-3.10/scripts/pppoe-status
193 --- rp-pppoe-3.10.orig/scripts/pppoe-status 2008-06-30 16:00:42.000000000 +0200
194 +++ rp-pppoe-3.10/scripts/pppoe-status 2008-06-30 22:22:32.000000000 +0200
195 @@ -28,12 +28,17 @@
196 ;;
197 esac
198
199 -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
200 +# In Gentoo, CONFIG is a named pipe when pppoe is started by the
201 +# network scripts. Testing -r is allowed; testing -f is not.
202 +if [ ! -r "$CONFIG" ] ; then
203 echo "$0: Cannot read configuration file '$CONFIG'" >& 2
204 exit 1
205 fi
206
207 -. $CONFIG
208 +# Read the named pipe (/dev/fd/foo) into a variable so we can use it
209 +# again later (since reading once from the pipe will exhaust it)
210 +CONFREAD=$(<$CONFIG)
211 +eval "$CONFREAD"
212
213 PPPOE_PIDFILE="$PIDFILE.pppoe"
214 PPPD_PIDFILE="$PIDFILE.pppd"
215 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-stop.in rp-pppoe-3.10/scripts/pppoe-stop.in
216 --- rp-pppoe-3.10.orig/scripts/pppoe-stop.in 2008-06-30 16:00:42.000000000 +0200
217 +++ rp-pppoe-3.10/scripts/pppoe-stop.in 2008-06-30 22:22:32.000000000 +0200
218 @@ -31,12 +31,17 @@
219 CONFIG=/etc/ppp/pppoe.conf
220 fi
221
222 -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
223 +# In Gentoo, CONFIG is a named pipe when pppoe is started by the
224 +# network scripts. Testing -r is allowed; testing -f is not.
225 +if [ ! -r "$CONFIG" ] ; then
226 echo "$ME: Cannot read configuration file '$CONFIG'" >& 2
227 exit 1
228 fi
229 -export CONFIG
230 -. $CONFIG
231 +
232 +# Read the named pipe (/dev/fd/foo) into a variable so we can use it
233 +# again later (since reading once from the pipe will exhaust it)
234 +CONFREAD=$(<$CONFIG)
235 +eval "$CONFREAD"
236
237 PPPOE_PIDFILE="$PIDFILE.pppoe"
238 PPPD_PIDFILE="$PIDFILE.pppd"
239
240
241
242 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
243
244 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch?rev=1.1&view=markup
245 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch?rev=1.1&content-type=text/plain
246
247 Index: rp-pppoe-3.10-autotools.patch
248 ===================================================================
249 diff -Nru rp-pppoe-3.10.orig/gui/Makefile.in rp-pppoe-3.10/gui/Makefile.in
250 --- rp-pppoe-3.10.orig/gui/Makefile.in 2008-06-30 16:00:41.000000000 +0200
251 +++ rp-pppoe-3.10/gui/Makefile.in 2008-06-30 22:30:56.000000000 +0200
252 @@ -46,7 +46,7 @@
253 -mkdir -p $(DESTDIR)$(sbindir)
254 -mkdir -p $(DESTDIR)$(bindir)
255 -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui
256 - $(install) -m 4755 -s pppoe-wrapper $(DESTDIR)$(sbindir)
257 + $(install) -m 4755 pppoe-wrapper $(DESTDIR)$(sbindir)
258 $(install) -m 755 tkpppoe $(DESTDIR)$(bindir)
259 -mkdir -p $(DESTDIR)$(mandir)/man1
260 $(install) -m 644 pppoe-wrapper.1 $(DESTDIR)$(mandir)/man1
261 diff -Nru rp-pppoe-3.10.orig/src/configure.in rp-pppoe-3.10/src/configure.in
262 --- rp-pppoe-3.10.orig/src/configure.in 2008-06-30 16:00:42.000000000 +0200
263 +++ rp-pppoe-3.10/src/configure.in 2008-06-30 22:29:53.000000000 +0200
264 @@ -45,7 +45,7 @@
265 AC_MSG_RESULT($ac_cv_struct_sockaddr_ll)
266
267 if test "$ac_cv_struct_sockaddr_ll" = yes ; then
268 -AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL)
269 +AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL, 1, [Define if you have struct sockaddr_ll])
270 fi
271
272 dnl Check for N_HDLC line discipline
273 @@ -56,7 +56,7 @@
274 ac_cv_n_hdlc=no)
275 AC_MSG_RESULT($ac_cv_n_hdlc)
276 if test "$ac_cv_n_hdlc" = yes ; then
277 -AC_DEFINE(HAVE_N_HDLC)
278 +AC_DEFINE(HAVE_N_HDLC, 1, [Define if you have the N_HDLC line discipline in linux/termios.h])
279 fi
280
281 AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no)
282 @@ -104,7 +104,7 @@
283 if test "$ac_cv_header_linux_if_pppox_h" = yes ; then
284 if test "$ac_cv_pluginpath" != no ; then
285 LINUX_KERNELMODE_PLUGIN=rp-pppoe.so
286 - AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE)
287 + AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE, 1, [Define if you have kernel-mode PPPoE in Linux file])
288 PPPD_INCDIR=$ac_cv_pluginpath
289 fi
290 fi
291 @@ -114,7 +114,7 @@
292 fi
293
294 if test "$ac_cv_debugging" = "yes" ; then
295 - AC_DEFINE(DEBUGGING_ENABLED)
296 + AC_DEFINE(DEBUGGING_ENABLED, 1, [Define to include debugging code])
297 fi
298
299 AC_SUBST(LINUX_KERNELMODE_PLUGIN)
300 @@ -154,15 +154,15 @@
301 AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support)
302 AC_CACHE_VAL(ac_cv_linux_kernel_pppoe,[
303 if test "`uname -s`" = "Linux" ; then
304 -if test $cross_compiling = "no"; then
305 +dnl if test $cross_compiling = "no"; then
306
307 dnl Do a bunch of modprobes. Can't hurt; might help.
308 -modprobe ppp_generic > /dev/null 2>&1
309 -modprobe ppp_async > /dev/null 2>&1
310 -modprobe n_hdlc > /dev/null 2>&1
311 -modprobe ppp_synctty > /dev/null 2>&1
312 -modprobe pppoe > /dev/null 2>&1
313 -fi
314 +dnl modprobe ppp_generic > /dev/null 2>&1
315 +dnl modprobe ppp_async > /dev/null 2>&1
316 +dnl modprobe n_hdlc > /dev/null 2>&1
317 +dnl modprobe ppp_synctty > /dev/null 2>&1
318 +dnl modprobe pppoe > /dev/null 2>&1
319 +dnl fi
320 AC_TRY_RUN([#include <sys/socket.h>
321 #include <net/ethernet.h>
322 #include <linux/if.h>
323 @@ -258,7 +258,7 @@
324
325 if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
326 AC_MSG_RESULT(reversed)
327 - AC_DEFINE(PACK_BITFIELDS_REVERSED)
328 + AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order])
329 else
330 AC_MSG_RESULT(normal)
331 fi
332 diff -Nru rp-pppoe-3.10.orig/src/plugin.c rp-pppoe-3.10/src/plugin.c
333 --- rp-pppoe-3.10.orig/src/plugin.c 2008-06-30 16:00:43.000000000 +0200
334 +++ rp-pppoe-3.10/src/plugin.c 2008-06-30 22:27:18.000000000 +0200
335 @@ -27,7 +27,6 @@
336 static char const RCSID[] =
337 "$Id: rp-pppoe-3.10-autotools.patch,v 1.1 2008/06/30 21:40:26 mrness Exp $";
338
339 -#define _GNU_SOURCE 1
340 #include "pppoe.h"
341
342 #include "pppd/pppd.h"
343 diff -Nru rp-pppoe-3.10.orig/src/relay.c rp-pppoe-3.10/src/relay.c
344 --- rp-pppoe-3.10.orig/src/relay.c 2008-06-30 16:00:43.000000000 +0200
345 +++ rp-pppoe-3.10/src/relay.c 2008-06-30 22:27:18.000000000 +0200
346 @@ -17,8 +17,6 @@
347 static char const RCSID[] =
348 "$Id: rp-pppoe-3.10-autotools.patch,v 1.1 2008/06/30 21:40:26 mrness Exp $";
349
350 -#define _GNU_SOURCE 1 /* For SA_RESTART */
351 -
352 #include "relay.h"
353
354 #include <signal.h>
355
356
357
358 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch
359
360 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch?rev=1.1&view=markup
361 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch?rev=1.1&content-type=text/plain
362
363 Index: rp-pppoe-3.10-linux-headers.patch
364 ===================================================================
365 diff -Nru rp-pppoe-3.10.orig/src/pppoe.h rp-pppoe-3.10/src/pppoe.h
366 --- rp-pppoe-3.10.orig/src/pppoe.h 2008-06-30 16:00:43.000000000 +0200
367 +++ rp-pppoe-3.10/src/pppoe.h 2008-06-30 23:25:54.000000000 +0200
368 @@ -19,6 +19,13 @@
369
370 extern int IsSetID;
371
372 +/* Ugly header files on some Linux boxes... */
373 +#if defined(HAVE_LINUX_IF_H)
374 +#include <linux/if.h>
375 +#elif defined(HAVE_NET_IF_H)
376 +#include <net/if.h>
377 +#endif
378 +
379 #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H)
380 #define _POSIX_SOURCE 1 /* For sigaction defines */
381 #endif
382 @@ -51,13 +58,6 @@
383 #include <sys/socket.h>
384 #endif
385
386 -/* Ugly header files on some Linux boxes... */
387 -#if defined(HAVE_LINUX_IF_H)
388 -#include <linux/if.h>
389 -#elif defined(HAVE_NET_IF_H)
390 -#include <net/if.h>
391 -#endif
392 -
393 #ifdef HAVE_NET_IF_TYPES_H
394 #include <net/if_types.h>
395 #endif
396
397
398
399 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch
400
401 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch?rev=1.1&view=markup
402 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch?rev=1.1&content-type=text/plain
403
404 Index: rp-pppoe-3.10-session-offset.patch
405 ===================================================================
406 diff -Nru rp-pppoe-3.10.orig/src/pppoe-server.c rp-pppoe-3.10/src/pppoe-server.c
407 --- rp-pppoe-3.10.orig/src/pppoe-server.c 2008-06-30 16:00:43.000000000 +0200
408 +++ rp-pppoe-3.10/src/pppoe-server.c 2008-06-30 22:35:11.000000000 +0200
409 @@ -1751,7 +1751,7 @@
410 }
411 if (PassUnitOptionToPPPD) {
412 argv[c++] = "unit";
413 - sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset));
414 + sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1));
415 argv[c++] = buffer;
416 }
417 argv[c++] = NULL;
418 @@ -1834,7 +1834,7 @@
419 argv[c++] = "default-asyncmap";
420 if (PassUnitOptionToPPPD) {
421 argv[c++] = "unit";
422 - sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset));
423 + sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1));
424 argv[c++] = buffer;
425 }
426 argv[c++] = NULL;
427
428
429
430 1.1 net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch
431
432 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch?rev=1.1&view=markup
433 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch?rev=1.1&content-type=text/plain
434
435 Index: rp-pppoe-3.10-plugin-options.patch
436 ===================================================================
437 diff -Nru rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf
438 --- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-06-30 22:23:11.000000000 +0200
439 +++ rp-pppoe-3.10/configs/pppoe.conf 2008-06-30 22:33:08.000000000 +0200
440 @@ -120,7 +120,7 @@
441 FIREWALL=NONE
442
443 # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode
444 -# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
445 +# plugin, use LINUX_PLUGIN=rp-pppoe.so
446 LINUX_PLUGIN=
447
448 # Any extra arguments to pass to pppoe. Normally, use a blank string
449 diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in
450 --- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-06-30 22:23:11.000000000 +0200
451 +++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-06-30 22:33:08.000000000 +0200
452 @@ -202,7 +202,7 @@
453
454 # If we're using kernel-mode PPPoE on Linux...
455 if test "$LINUX_PLUGIN" != "" ; then
456 - PLUGIN_OPTS="plugin $LINUX_PLUGIN nic-$ETH"
457 + PLUGIN_OPTS="plugin $LINUX_PLUGIN"
458 if test -n "$SERVICENAME" ; then
459 PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME"
460 fi
461 @@ -297,7 +297,7 @@
462 $SETSID $OVERRIDE_PPPD_COMMAND &
463 echo "$!" > $PPPD_PIDFILE
464 elif test "$LINUX_PLUGIN" != "" ; then
465 - $SETSID $PPPD $PPP_STD_OPTIONS $DEMAND &
466 + $SETSID $PPPD $DEMAND $PPP_STD_OPTIONS &
467 echo "$!" > $PPPD_PIDFILE
468 else
469 $SETSID $PPPD pty "$PPPOE_CMD" \
470
471
472
473 --
474 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups