This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 6aa1e273ddf8451e569ce6537af6211d52c062f4 (commit) via 871956e932f429b5e20b68e03e00d7886feab5d2 (commit) via e63ca421f9a7ea76ee9b8561b81613e429a4009e (commit) via 7afbf8c47a96ac8cb575a2aaa7b8e98b2996dfa1 (commit) via 0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1 (commit) via 06b912c5c5706a4dffa16543c66a2d7f06a4da8d (commit) via be24d6b32f46f97242da308c5c625c0f34d8ff3b (commit) via 33134fc44b607d1692707a61a72559c6e9b7d9aa (commit) via df3943b0297da787571c9f1eb9079a8dcca0e64a (commit) via 6af867f6bbef7670eb7014a1c1643dbcb63c2f48 (commit) from 608f644801bdf68b3de76142c51ff6dd85e9a911 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6aa1e273ddf8451e569ce6537af6211d52c062f4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 6 07:44:03 2010 +0200
Add ppp update to core39.
commit 871956e932f429b5e20b68e03e00d7886feab5d2 Merge: e63ca421f9a7ea76ee9b8561b81613e429a4009e 0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 5 22:53:59 2010 +0200
Merge commit 'ms/ppp-update'
commit e63ca421f9a7ea76ee9b8561b81613e429a4009e Merge: 608f644801bdf68b3de76142c51ff6dd85e9a911 7afbf8c47a96ac8cb575a2aaa7b8e98b2996dfa1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 5 22:53:47 2010 +0200
Merge commit 'ms/minicom'
commit 7afbf8c47a96ac8cb575a2aaa7b8e98b2996dfa1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 1 17:01:53 2010 +0200
New package: minicom.
commit 0b83e5a52e38b9d763f4236d3b1d20e3c79cf4e1 Merge: 06b912c5c5706a4dffa16543c66a2d7f06a4da8d f0f385de20cf378a9e8f74dac6819ab289fb71a9 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 30 11:36:50 2010 +0200
Merge branch 'master' into ppp-update
commit 06b912c5c5706a4dffa16543c66a2d7f06a4da8d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 30 11:36:06 2010 +0200
Enforce the pppoe plugin method in the networking scripts.
commit be24d6b32f46f97242da308c5c625c0f34d8ff3b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 27 09:52:27 2010 +0200
Remove pppoe-plugin option from webinterface.
commit 33134fc44b607d1692707a61a72559c6e9b7d9aa Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 26 23:12:59 2010 +0200
Rootfile update.
commit df3943b0297da787571c9f1eb9079a8dcca0e64a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 26 16:31:09 2010 +0200
Remove rp-pppoe.
commit 6af867f6bbef7670eb7014a1c1643dbcb63c2f48 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 26 15:58:15 2010 +0200
Update ppp to 2.4.5.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/ppp | 25 +++++---- config/rootfiles/common/rp-pppoe | 33 ------------- config/rootfiles/core/39/exclude | 2 + config/rootfiles/core/39/filelists/files | 2 + config/rootfiles/core/39/filelists/ppp | 1 + config/rootfiles/packages/minicom | 26 ++++++++++ html/cgi-bin/pppsetup.cgi | 19 ++----- lfs/{sslh => minicom} | 15 ++++-- lfs/ppp | 4 +- lfs/rp-pppoe | 77 ------------------------------ make.sh | 2 +- src/initscripts/init.d/networking/red | 7 ++- 12 files changed, 68 insertions(+), 145 deletions(-) delete mode 100644 config/rootfiles/common/rp-pppoe create mode 120000 config/rootfiles/core/39/filelists/ppp create mode 100644 config/rootfiles/packages/minicom copy lfs/{sslh => minicom} (93%) delete mode 100644 lfs/rp-pppoe
Difference in files: diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp index beb732a..60e6f5b 100644 --- a/config/rootfiles/common/ppp +++ b/config/rootfiles/common/ppp @@ -25,21 +25,24 @@ etc/ppp/standardloginscript #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 diff --git a/config/rootfiles/common/rp-pppoe b/config/rootfiles/common/rp-pppoe deleted file mode 100644 index 3a77732..0000000 --- a/config/rootfiles/common/rp-pppoe +++ /dev/null @@ -1,33 +0,0 @@ -#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 diff --git a/config/rootfiles/core/39/exclude b/config/rootfiles/core/39/exclude index e69de29..778cdf7 100644 --- a/config/rootfiles/core/39/exclude +++ b/config/rootfiles/core/39/exclude @@ -0,0 +1,2 @@ +etc/ppp/chap-secrets +etc/ppp/pap-secrets diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index 0037af1..8341b40 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -1 +1,3 @@ etc/system-release +etc/init.d/networking/red +srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/config/rootfiles/core/39/filelists/ppp b/config/rootfiles/core/39/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/core/39/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/packages/minicom b/config/rootfiles/packages/minicom new file mode 100644 index 0000000..53266e6 --- /dev/null +++ b/config/rootfiles/packages/minicom @@ -0,0 +1,26 @@ +usr/bin/ascii-xfr +usr/bin/minicom +usr/bin/runscript +usr/bin/xminicom +#usr/share/locale/cs/LC_MESSAGES/minicom.mo +#usr/share/locale/da/LC_MESSAGES/minicom.mo +#usr/share/locale/de/LC_MESSAGES/minicom.mo +#usr/share/locale/es/LC_MESSAGES/minicom.mo +#usr/share/locale/fi/LC_MESSAGES/minicom.mo +#usr/share/locale/fr/LC_MESSAGES/minicom.mo +#usr/share/locale/hu/LC_MESSAGES/minicom.mo +#usr/share/locale/id/LC_MESSAGES/minicom.mo +#usr/share/locale/ja/LC_MESSAGES/minicom.mo +#usr/share/locale/nb/LC_MESSAGES/minicom.mo +#usr/share/locale/pl/LC_MESSAGES/minicom.mo +#usr/share/locale/pt_BR/LC_MESSAGES/minicom.mo +#usr/share/locale/ro/LC_MESSAGES/minicom.mo +#usr/share/locale/ru/LC_MESSAGES/minicom.mo +#usr/share/locale/rw/LC_MESSAGES/minicom.mo +#usr/share/locale/sv/LC_MESSAGES/minicom.mo +#usr/share/locale/vi/LC_MESSAGES/minicom.mo +#usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo +#usr/share/man/man1/ascii-xfr.1 +#usr/share/man/man1/minicom.1 +#usr/share/man/man1/runscript.1 +#usr/share/man/man1/xminicom.1 diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index bb0b2cb..a39d4f7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -394,7 +394,6 @@ $selected{'ENCAP'}{$pppsettings{'ENCAP'}} = "selected='selected'";
$checked{'METHOD'}{'STATIC'} = ''; $checked{'METHOD'}{'PPPOE'} = ''; -$checked{'METHOD'}{'PPPOE_PLUGIN'} = ''; $checked{'METHOD'}{'DHCP'} = ''; $checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'";
@@ -765,13 +764,13 @@ print <<END <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> @@ -897,14 +896,8 @@ sub initprofile $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; diff --git a/lfs/minicom b/lfs/minicom new file mode 100644 index 0000000..8af78e2 --- /dev/null +++ b/lfs/minicom @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 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 = 2.4 + +THISAPP = minicom-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = minicom +PAK_VER = 0 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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) && \ + ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ppp b/lfs/ppp index 8954639..e667b1e 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -24,7 +24,7 @@
include Config
-VER = 2.4.4 +VER = 2.4.5
THISAPP = ppp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29 +$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
install : $(TARGET)
diff --git a/lfs/rp-pppoe b/lfs/rp-pppoe deleted file mode 100644 index 869b124..0000000 --- a/lfs/rp-pppoe +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# 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) diff --git a/make.sh b/make.sh index 574f9f2..c4511ed 100755 --- a/make.sh +++ b/make.sh @@ -337,7 +337,6 @@ buildipfire() { ipfiremake libusb ipfiremake libpcap ipfiremake ppp - ipfiremake rp-pppoe ipfiremake pptp ipfiremake unzip ipfiremake which @@ -641,6 +640,7 @@ buildipfire() { ipfiremake mdadm ipfiremake eject ipfiremake pound + ipfiremake minicom echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index f60c0d1..0a642f8 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -220,7 +220,7 @@ case "${1}" in fi elif [ "$TYPE" == "PPPOE" ]; then - + if ( ps ax | grep -q [p]ppd ); then boot_mesg "pppd is still running." ${FAILURE} echo_failure @@ -230,7 +230,10 @@ case "${1}" in 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
hooks/post-receive -- IPFire 2.x development tree