Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index d50af877a154dddff0d064a26d75a3cdb457492f..180666fe7759b15952c116f74b23df10d9f86a6c 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -78,6 +78,7 @@ etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
+#etc/rc.d/init.d/openvmtools
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
 #etc/rc.d/init.d/nut

diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index beb732afe4f116ea12cfda531c4a40452a3afd24..60e6f5b0806a81b8272851f83760d7bdff2d36fd 100644 (file)
--- 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 (file)
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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..778cdf7b54e4a9e42782d9cbf33fc5deaee32f87 100644 (file)
--- 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 0037af183326a74f3cbb5f65b2cf4c007eea7bed..5b9c93405783b2cbb0238cbfe8ca71e6debbf579 100644 (file)
--- a/config/rootfiles/core/39/filelists/files
+++ b/config/rootfiles/core/39/filelists/files
@@ -1 +1,5 @@
 etc/system-release
+etc/rc.d/init.d/dnsmasq
+etc/rc.d/init.d/networking/red
+etc/rc.d/helper/getdnsfromdhcpc.pl
+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 (symlink)
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 (file)
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/doc/packages-list.txt b/doc/packages-list.txt
index ee4aa7305bbb62ca829fc6b516cbf767b4570a76..1f0f4d3f1f46085e76c3b07bfe635d0ed9a5ec57 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -184,7 +184,6 @@
 * libogg-1.1.4
 * liboping-1.3.4
 * libpcap-1.0.0
-* libpng-1.2.12
 * libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16
@@ -225,6 +224,7 @@
 * mediatomb-svn2020
 * memtest86+-4.10
 * miau-0.6.5
+* minicom-2.4
 * misc-progs
 * mkinitcpio-0.5.9
 * mktemp-1.5
@@ -277,7 +277,7 @@
 * popt-1.10.4
 * portmap_6.0
 * postfix-2.6.5
-* ppp-2.4.4
+* ppp-2.4.5
 * pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
@@ -292,7 +292,6 @@
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
-* rp-pppoe-3.8
 * rrdtool-1.2.30
 * rssdler-0.4.0a
 * rsync-3.0.7
@@ -333,7 +332,6 @@
 * teamspeak-2.0.24.1
 * texinfo-4.8
 * tftp-hpa-0.48
-* tiff-3.8.2
 * tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index bb0b2cbd12e6d9cd8290f5793e749b3dcbbefa56..a39d4f722c99249da6d98ea41521f4e3b6530480 100644 (file)
--- 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'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td width='25%'>$Lang::tr{'service name'}&nbsp;<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'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td width='25%'>$Lang::tr{'concentrator name'}&nbsp;<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/rp-pppoe b/lfs/minicom
similarity index 89%
rename from lfs/rp-pppoe
rename to lfs/minicom
index 869b1240a36ad7c546f544ad9aab82ea71c619e5..8af78e274cc2c1de73683f62c56b1bd7bd5f127a 100644 (file)
--- a/lfs/rp-pppoe
+++ b/lfs/minicom
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -24,13 +24,17 @@
 
 include Config
 
-VER        = 3.8
+VER        = 2.4
 
-THISAPP    = rp-pppoe-$(VER)
+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
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0e32760f498f9cde44081ee6aafc823b
+$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b
 
 install : $(TARGET)
 
@@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+       @$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -70,8 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(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
+       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 8954639014e654284a472af550afbd92fb8c06e5..e667b1ee053601757dadd1774407a32009a22a6a 100644 (file)
--- 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/make.sh b/make.sh
index 574f9f25ca168866c5f88396faa610d8fca12fd3..c4511edffaa913975e10bf6d713ce21a768a3e53 100755 (executable)
--- 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/helper/getdnsfromdhcpc.pl b/src/initscripts/helper/getdnsfromdhcpc.pl
index 980d87a8422707ece97495bcd0ac0af0e6f117c0..e4d461d5734c1bcf4cc91790718f0e667a037a9f 100644 (file)
--- a/src/initscripts/helper/getdnsfromdhcpc.pl
+++ b/src/initscripts/helper/getdnsfromdhcpc.pl
@@ -42,6 +42,6 @@ if (open(FILE, "${General::swroot}/red/iface")) {
 
 $dns = $dhcpc{'domain_name_servers'};
 
-@alldns = split(',', $dns);
+@alldns = split(' ', $dns);
 
 print "$alldns[$count - 1]\n";

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index eaa55cef923a30f1f5780495613251ec5550c735..0dfb1f4e3b441b0aa77d5f7f96590b2cde91769e 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -28,11 +28,15 @@ case "${1}" in
                echo > /var/ipfire/red/resolv.conf # Clear it
                if [ -e "/var/ipfire/red/dns1" ]; then
                    DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
-                   echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+                   if [ ! -z ${DNS1} ]; then
+                       echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+                   fi
                fi
                if [ -e "/var/ipfire/red/dns2" ]; then
                    DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)
-                   echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+                   if [ ! -z ${DNS2} ]; then
+                       echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+                   fi
                fi
                [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
                

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index f60c0d1591154b5274f77e965f28772fbffdf7d4..a574050d74010392d11f0e09ab8c10cc98a27e60 100644 (file)
--- 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
@@ -370,7 +373,7 @@ case "${1}" in
                        #                       
                        if [ "$TYPE" == "pppoe" ]; then
                                [ "${METHOD}" == "PPPOE_PLUGIN" ] && \
-                                       PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+                                       PLUGOPTS="plugin rp-pppoe.so"
                        fi
 
                        ### Synchronous Mode