#usr/include/pppd/pathnames.h
#usr/include/pppd/pppcrypt.h
#usr/include/pppd/pppd.h
+#usr/include/pppd/session.h
#usr/include/pppd/sha1.h
#usr/include/pppd/spinlock.h
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
-#usr/lib/pppd
-#usr/lib/pppd/2.4.4
-usr/lib/pppd/2.4.4/minconn.so
-usr/lib/pppd/2.4.4/passprompt.so
-usr/lib/pppd/2.4.4/passwordfd.so
-usr/lib/pppd/2.4.4/pppoatm.so
-usr/lib/pppd/2.4.4/radattr.so
-usr/lib/pppd/2.4.4/radius.so
-usr/lib/pppd/2.4.4/radrealms.so
-usr/lib/pppd/2.4.4/rp-pppoe.so
-usr/lib/pppd/2.4.4/winbind.so
+usr/lib/pppd
+usr/lib/pppd/2.4.5
+usr/lib/pppd/2.4.5/minconn.so
+usr/lib/pppd/2.4.5/openl2tp.so
+usr/lib/pppd/2.4.5/passprompt.so
+usr/lib/pppd/2.4.5/passwordfd.so
+usr/lib/pppd/2.4.5/pppoatm.so
+usr/lib/pppd/2.4.5/pppol2tp.so
+usr/lib/pppd/2.4.5/radattr.so
+usr/lib/pppd/2.4.5/radius.so
+usr/lib/pppd/2.4.5/radrealms.so
+usr/lib/pppd/2.4.5/rp-pppoe.so
+usr/lib/pppd/2.4.5/winbind.so
usr/sbin/chat
usr/sbin/pppd
usr/sbin/pppdump
+++ /dev/null
-#etc/ppp/firewall-masq
-#etc/ppp/firewall-standalone
-#etc/ppp/plugins
-#etc/ppp/plugins/README
-#etc/ppp/pppoe-server-options
-etc/ppp/pppoe.conf
-#usr/man/man5/pppoe.conf.5
-#usr/man/man8/pppoe-connect.8
-#usr/man/man8/pppoe-relay.8
-#usr/man/man8/pppoe-server.8
-#usr/man/man8/pppoe-setup.8
-#usr/man/man8/pppoe-sniff.8
-#usr/man/man8/pppoe-start.8
-#usr/man/man8/pppoe-status.8
-#usr/man/man8/pppoe-stop.8
-#usr/man/man8/pppoe.8
-usr/sbin/pppoe
-usr/sbin/pppoe-connect
-#usr/sbin/pppoe-relay
-#usr/sbin/pppoe-server
-usr/sbin/pppoe-setup
-usr/sbin/pppoe-sniff
-usr/sbin/pppoe-start
-usr/sbin/pppoe-status
-usr/sbin/pppoe-stop
-#usr/share/doc/rp-pppoe-3.8
-#usr/share/doc/rp-pppoe-3.8/CHANGES
-#usr/share/doc/rp-pppoe-3.8/HOW-TO-CONNECT
-#usr/share/doc/rp-pppoe-3.8/KERNEL-MODE-PPPOE
-#usr/share/doc/rp-pppoe-3.8/LICENSE
-#usr/share/doc/rp-pppoe-3.8/README
-#usr/share/doc/rp-pppoe-3.8/SERVPOET
-#usr/share/doc/rp-pppoe-3.8/pap-secrets
$checked{'METHOD'}{'STATIC'} = '';
$checked{'METHOD'}{'PPPOE'} = '';
-$checked{'METHOD'}{'PPPOE_PLUGIN'} = '';
$checked{'METHOD'}{'DHCP'} = '';
$checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'";
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
- <td colspan='2' width='50%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE' $checked{'METHOD'}{'PPPOE'} />$Lang::tr{'pppoe'}</td>
- <td colspan='2' width='50%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
</tr>
<tr>
$pppsettings{'PPTP_PEER'} = '10.0.0.138';
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PROTOCOL'} = 'RFC2364';
- $pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
- if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) {
- $pppsettings{'MTU'} = '1492';
- $pppsettings{'MRU'} = '1492';
- } else {
- $pppsettings{'MTU'} = '1452';
- $pppsettings{'MRU'} = '1452';
- }
+ $pppsettings{'MTU'} = '1492';
+ $pppsettings{'MRU'} = '1492';
$pppsettings{'DIALMODE'} = 'T';
$pppsettings{'MAXRETRIES'} = 5;
$pppsettings{'HOLDOFF'} = 30;
include Config
-VER = 2.4.4
+VER = 2.4.5
THISAPP = ppp-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29
+$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
install : $(TARGET)
+++ /dev/null
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 3.8
-
-THISAPP = rp-pppoe-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 0e32760f498f9cde44081ee6aafc823b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP)/src && ./configure --disable-nls
- cd $(DIR_APP)/src && make $(MAKETUNING)
- cd $(DIR_APP)/src && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
ipfiremake libusb
ipfiremake libpcap
ipfiremake ppp
- ipfiremake rp-pppoe
ipfiremake pptp
ipfiremake unzip
ipfiremake which
fi
elif [ "$TYPE" == "PPPOE" ]; then
-
+
if ( ps ax | grep -q [p]ppd ); then
boot_mesg "pppd is still running." ${FAILURE}
echo_failure
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
[ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
-
+
+ # We force the plugin method, anyway.
+ METHOD="PPPOE_PLUGIN"
+
PPP_NIC=${DEVICE}
if [ "$TYPE" == "vdsl" ]; then