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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 2ac99f6a669c4bb439ec9dbbee853a6ace3f5af3..3785346bac0cabf5eb790d4ceb17f9a3763351cf 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -25,7 +25,6 @@ LoadPlugin processes
 LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
-LoadPlugin thermal
 LoadPlugin syslog
 #LoadPlugin wireless
 
@@ -82,14 +81,4 @@ LoadPlugin syslog
        LogLevel info
 </Plugin>
 
-<Plugin thermal>
-       Device "cooling_device0"
-       Device "cooling_device1"
-       Device "cooling_device2"
-       Device "cooling_device3"
-       Device "cooling_device4"
-       Device "cooling_device5"
-       Device "cooling_device6"
-       Device "cooling_device7"
-       IgnoreSelected true
-</Plugin>
+#include "/etc/collectd.thermal"

diff --git a/config/collectd/collectd.thermal b/config/collectd/collectd.thermal
new file mode 100644 (file)
index 0000000..97403fb
--- /dev/null
+++ b/config/collectd/collectd.thermal
@@ -0,0 +1,13 @@
+LoadPlugin thermal
+
+<Plugin thermal>
+       Device "cooling_device0"
+       Device "cooling_device1"
+       Device "cooling_device2"
+       Device "cooling_device3"
+       Device "cooling_device4"
+       Device "cooling_device5"
+       Device "cooling_device6"
+       Device "cooling_device7"
+       IgnoreSelected true
+</Plugin>

diff --git a/config/etc/inittab b/config/etc/inittab
index 7697daa61a3314309967e0392caf5bc49e2ff1b8..527a3f4de73ce138ce08fac832eb33dbbd111dd2 100644 (file)
--- a/config/etc/inittab
+++ b/config/etc/inittab
@@ -25,5 +25,7 @@ su:S016:once:/sbin/sulogin
 4:2345:respawn:/sbin/agetty tty4 9600
 5:2345:respawn:/sbin/agetty tty5 9600
 6:2345:respawn:/sbin/agetty tty6 9600
+# *** Uncomment for serial console
+#7:2345:respawn:/sbin/agetty ttyS0 38400
 
 # End /etc/inittab

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index ccb4a09ec5d0c439b706e91d331a332f81f1af39..b4e279669b03ec3d48b79341ceeaa1faaf5ef0e5 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,7 +3,12 @@ default saved
 foreground = 6d6963
 background = ffffff
 #hiddenmenu
+# *** If you want use serial console comment next line
 splashimage (hd0,0)/grub/ipfire.xpm.gz
+# *** add "console=ttyS0,38400n8" to kernel cmdline,
+# *** uncomment following lines and check also inittab
+#serial --unit=0 --speed=38400
+#terminal --timeout=1 serial console
 title IPFire
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 6a7d9e33e0adc53302833e3039f408ef2fa6fdb1..29160941da4dd74982d99d1d68231b0b136d4493 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,4 +1,5 @@
 etc/collectd.conf
+etc/collectd.thermal
 etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S21collectd

diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index 9b8ea8f27c9c5932084308742754a1c0427d805a..b8ecd2010ff8b458efc8a83ae7aded040adda4d7 100644 (file)
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -1,7 +1,13 @@
 bin/probenic.sh
+etc/collectd.conf
+etc/collectd.thermal
 etc/ntp
+etc/rc.d/init.d/beep
+etc/rc.d/init.d/console
+etc/rc.d/init.d/collectd
 etc/rc.d/init.d/snort
 etc/rc.d/init.d/networking/red
+etc/ppp/ip-up
 etc/ssh/moduli
 etc/ssh/ssh_config
 etc/ssh/sshd_config

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index d4ed7d0f8a593a368f3d61f4584350b08a06eab4..96f0ac80291d3345c5f4ed6a064f781fa45cdb42 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -1,6 +1,7 @@
 #usr/bin/clamav-config
 #usr/bin/clamconf
 usr/bin/clamdscan
+usr/bin/clamdtop
 usr/bin/clamscan
 usr/bin/freshclam
 usr/bin/sigtool
@@ -8,23 +9,24 @@ usr/bin/sigtool
 #usr/lib/libclamav.a
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
-usr/lib/libclamav.so.5
-usr/lib/libclamav.so.5.0.4
+usr/lib/libclamav.so.6
+usr/lib/libclamav.so.6.0.3
 #usr/lib/libclamunrar.a
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
-usr/lib/libclamunrar.so.5
-usr/lib/libclamunrar.so.5.0.4
+usr/lib/libclamunrar.so.6
+usr/lib/libclamunrar.so.6.0.3
 #usr/lib/libclamunrar_iface.a
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
-usr/lib/libclamunrar_iface.so.5
-usr/lib/libclamunrar_iface.so.5.0.4
+usr/lib/libclamunrar_iface.so.6
+usr/lib/libclamunrar_iface.so.6.0.3
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
 #usr/share/man/man1/clamconf.1
 #usr/share/man/man1/clamdscan.1
+#usr/share/man/man1/clamdtop.1
 #usr/share/man/man1/clamscan.1
 #usr/share/man/man1/freshclam.1
 #usr/share/man/man1/sigtool.1
@@ -35,6 +37,6 @@ usr/share/clamav
 #var/ipfire/clamav
 var/ipfire/clamav/clamd.conf
 var/ipfire/clamav/freshclam.conf
+var/run/clamav
 etc/rc.d/init.d/clamav
 usr/local/bin/clamavctrl
-var/run/clamav

diff --git a/config/rootfiles/packages/elinks b/config/rootfiles/packages/elinks
index 5b3cea4634feef71bceaf5d4dd6fa88d84e4e83d..3e71dc9a5a9cb66fd77d76bb42c4001aaab4d6f4 100644 (file)
--- a/config/rootfiles/packages/elinks
+++ b/config/rootfiles/packages/elinks
@@ -1,11 +1,7 @@
+usr/local/bin/elinks
 #usr/local/etc
 #usr/local/etc/elinks
 usr/local/etc/elinks/elinks.conf
-usr/local/bin/elinks
-#usr/local/man/man1/elinks.1
-#usr/local/man/man5
-#usr/local/man/man5/elinks.conf.5
-#usr/local/man/man5/elinkskeys.5
 #usr/local/share/locale/be
 #usr/local/share/locale/be/LC_MESSAGES
 #usr/local/share/locale/be/LC_MESSAGES/elinks.mo
@@ -97,3 +93,6 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
 #usr/local/share/locale/uk
 #usr/local/share/locale/uk/LC_MESSAGES
 #usr/local/share/locale/uk/LC_MESSAGES/elinks.mo
+#usr/local/share/man/man1/elinks.1
+#usr/local/share/man/man5/elinks.conf.5
+#usr/local/share/man/man5/elinkskeys.5

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index f316040381b0926f0e6f21a862ca049d383648ff..3c4c5129e51a76f6aae085eb1ab32fcb8dc1f32f 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -1,5 +1,7 @@
 usr/bin/git
+usr/bin/git-cvsserver
 usr/bin/git-receive-pack
+usr/bin/git-shell
 usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #usr/bin/gitk
@@ -16,6 +18,7 @@ usr/libexec/git-core/git-apply
 usr/libexec/git-core/git-archimport
 usr/libexec/git-core/git-archive
 usr/libexec/git-core/git-bisect
+usr/libexec/git-core/git-bisect--helper
 usr/libexec/git-core/git-blame
 usr/libexec/git-core/git-branch
 usr/libexec/git-core/git-bundle
@@ -42,6 +45,8 @@ usr/libexec/git-core/git-diff
 usr/libexec/git-core/git-diff-files
 usr/libexec/git-core/git-diff-index
 usr/libexec/git-core/git-diff-tree
+usr/libexec/git-core/git-difftool
+usr/libexec/git-core/git-difftool--helper
 usr/libexec/git-core/git-fast-export
 usr/libexec/git-core/git-fast-import
 usr/libexec/git-core/git-fetch
@@ -57,7 +62,9 @@ usr/libexec/git-core/git-gc
 usr/libexec/git-core/git-get-tar-commit-id
 usr/libexec/git-core/git-grep
 usr/libexec/git-core/git-gui
+usr/libexec/git-core/git-gui--askpass
 usr/libexec/git-core/git-hash-object
+usr/libexec/git-core/git-help
 usr/libexec/git-core/git-http-fetch
 usr/libexec/git-core/git-http-push
 usr/libexec/git-core/git-imap-send
@@ -84,6 +91,7 @@ usr/libexec/git-core/git-merge-resolve
 usr/libexec/git-core/git-merge-subtree
 usr/libexec/git-core/git-merge-tree
 usr/libexec/git-core/git-mergetool
+usr/libexec/git-core/git-mergetool--lib
 usr/libexec/git-core/git-mktag
 usr/libexec/git-core/git-mktree
 usr/libexec/git-core/git-mv
@@ -124,6 +132,7 @@ usr/libexec/git-core/git-show
 usr/libexec/git-core/git-show-branch
 usr/libexec/git-core/git-show-index
 usr/libexec/git-core/git-show-ref
+usr/libexec/git-core/git-stage
 usr/libexec/git-core/git-stash
 usr/libexec/git-core/git-status
 usr/libexec/git-core/git-stripspace
@@ -188,22 +197,29 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/index.tcl
 #usr/share/git-gui/lib/logo.tcl
 #usr/share/git-gui/lib/merge.tcl
+#usr/share/git-gui/lib/mergetool.tcl
 #usr/share/git-gui/lib/msgs
 #usr/share/git-gui/lib/msgs/de.msg
 #usr/share/git-gui/lib/msgs/fr.msg
 #usr/share/git-gui/lib/msgs/hu.msg
 #usr/share/git-gui/lib/msgs/it.msg
 #usr/share/git-gui/lib/msgs/ja.msg
+#usr/share/git-gui/lib/msgs/nb.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
 #usr/share/git-gui/lib/msgs/zh_cn.msg
 #usr/share/git-gui/lib/option.tcl
 #usr/share/git-gui/lib/remote.tcl
+#usr/share/git-gui/lib/remote_add.tcl
 #usr/share/git-gui/lib/remote_branch_delete.tcl
+#usr/share/git-gui/lib/search.tcl
 #usr/share/git-gui/lib/shortcut.tcl
 #usr/share/git-gui/lib/spellcheck.tcl
+#usr/share/git-gui/lib/sshkey.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
+#usr/share/git-gui/lib/tools.tcl
+#usr/share/git-gui/lib/tools_dlg.tcl
 #usr/share/git-gui/lib/transport.tcl
 #usr/share/git-gui/lib/win32.tcl
 #usr/share/git-gui/lib/win32_shortcut.js
@@ -213,18 +229,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs/de.msg
 #usr/share/gitk/lib/msgs/es.msg
 #usr/share/gitk/lib/msgs/it.msg
+#usr/share/gitk/lib/msgs/ru.msg
 #usr/share/gitk/lib/msgs/sv.msg
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/private-Error.3
-usr/bin/git-cvsserver
-usr/bin/git-shell
-usr/libexec/git-core/git-gui--askpass
-usr/libexec/git-core/git-help
-usr/libexec/git-core/git-stage
-#usr/share/git-gui/lib/mergetool.tcl
-#usr/share/git-gui/lib/msgs/nb.msg
-#usr/share/git-gui/lib/remote_add.tcl
-#usr/share/git-gui/lib/search.tcl
-#usr/share/git-gui/lib/sshkey.tcl
-#usr/share/git-gui/lib/tools.tcl
-#usr/share/git-gui/lib/tools_dlg.tcl

diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index d071d54c614bc9e04a600c75c1714ee1534dab25..8a2f616249cea5375a605c1687a6d661f7869c79 100644 (file)
--- a/config/rootfiles/packages/nano
+++ b/config/rootfiles/packages/nano
@@ -2,6 +2,24 @@
 etc/nano/nanorc.sample
 usr/bin/nano
 usr/bin/pico
-#usr/info/nano.info
-#usr/man/man1/nano.1
-#usr/man/man5/nanorc.5
+usr/bin/rnano
+#usr/share/info/nano.info
+#usr/share/man/man1/nano.1
+#usr/share/man/man1/rnano.1
+#usr/share/man/man5/nanorc.5
+#usr/share/nano
+usr/share/nano/asm.nanorc
+usr/share/nano/c.nanorc
+usr/share/nano/groff.nanorc
+usr/share/nano/html.nanorc
+usr/share/nano/java.nanorc
+usr/share/nano/man.nanorc
+usr/share/nano/mutt.nanorc
+usr/share/nano/nanorc.nanorc
+usr/share/nano/patch.nanorc
+usr/share/nano/perl.nanorc
+usr/share/nano/pov.nanorc
+usr/share/nano/python.nanorc
+usr/share/nano/ruby.nanorc
+usr/share/nano/sh.nanorc
+usr/share/nano/tex.nanorc

diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix
index 0b40fbad619c8d7f5b4e3602bac8e95f98cb9b84..e8f4890282f47bd48ea06499b9d1f8676ccc6977 100644 (file)
--- a/config/rootfiles/packages/postfix
+++ b/config/rootfiles/packages/postfix
@@ -2,8 +2,11 @@ etc/aliases
 #etc/postfix
 #etc/postfix/LICENSE
 #etc/postfix/TLS_LICENSE
+etc/postfix/access
 etc/postfix/body_checks
 #etc/postfix/bounce.cf.default
+etc/postfix/canonical
+etc/postfix/generic
 etc/postfix/header_checks
 etc/postfix/main.cf
 #etc/postfix/makedefs.out
@@ -15,6 +18,9 @@ etc/postfix/post-install
 etc/postfix/postfix-files
 etc/postfix/postfix-script
 etc/rc.d/init.d/postfix
+etc/postfix/relocated
+etc/postfix/transport
+etc/postfix/virtual
 usr/bin/mailq
 usr/bin/newaliases
 #usr/lib/postfix

diff --git a/config/updxlrator/download b/config/updxlrator/download
index ff86155b5538b546d42ca25969174bbef4315da4..29548708ca1effd6868a0445f7d31c6c1d375280 100644 (file)
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -49,7 +49,6 @@ $vendorid =~ tr/A-Z/a-z/;
 unless (-d "$repository/download/$vendorid")
 {
        system("mkdir -p $repository/download/$vendorid");
-       system("chown -R nobody.squid $repository/download/$vendorid");
        system("chmod 775 $repository/download/$vendorid");
 }
 
@@ -159,15 +158,13 @@ if ($_ == 0)
 
        unless (-d "$repository/$vendorid")
        {
-  system("mkdir -p $repository/$vendorid");
-               system("chown -R nobody.squid $repository/$vendorid");
+               system("mkdir -p $repository/$vendorid");
                system("chmod 775 $repository/$vendorid");
        }
 
        unless (-d "$repository/$vendorid/$uuid")
        {
                system("mkdir -p $repository/$vendorid/$uuid");
-               system("chown -R nobody.squid $repository/$vendorid/$uuid");
                system("chmod 775 $repository/$vendorid/$uuid");
        }
 
@@ -183,7 +180,7 @@ if ($_ == 0)
        &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
        &UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
 
-       system("chown -R nobody.squid $repository/$vendorid/$uuid/*");
+       system("/usr/local/bin/squidctrl setperms");
        system("chmod 775 $repository/$vendorid/$uuid/*");
 
        unlink ("$repository/download/$vendorid/$updatefile.info");

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c0c91e40bbc454b795e5ee3122dd05ba28892295..966d732f9c8e1d9cf12c0a99760fca4b6de57c3a 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -36,15 +36,15 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.19
-* alsa-lib-1.0.19-kmod-2.6.27.21-ipfire
+* alsa-lib-1.0.19-kmod-2.6.27.23-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.18
-* atl2-2.0.5-kmod-2.6.27.21-ipfire
-* atl2-2.0.5-kmod-2.6.27.21-ipfire-xen
+* atl2-2.0.5-kmod-2.6.27.23-ipfire
+* atl2-2.0.5-kmod-2.6.27.23-ipfire-xen
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -66,11 +66,11 @@
 * ccache-2.4
 * cdrtools-2.01.01
 * centerim-4.22.1
-* clamav-0.94.2
+* clamav-0.95.1
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire
-* compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire-xen
+* compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire
+* compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
@@ -89,7 +89,7 @@
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * ed-0.2
-* elinks-0.11.4rc0
+* elinks-0.11.6
 * esniper-2-19-0
 * espgs-8.15.1
 * etherwake-1.09
@@ -115,7 +115,7 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
-* git-1.6.1.2
+* git-1.6.3
 * glib-2.16.5
 * glibc-2.3.6
 * gmp-4.2
@@ -151,8 +151,8 @@
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire-xen
 * kudzu-1.2.64
 * l7-protocols-2008-12-18
 * lame-3.97
@@ -183,8 +183,8 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.27.21-ipfire
-* linux-2.6.27.21-ipfire-xen
+* linux-2.6.27.23-ipfire
+* linux-2.6.27.23-ipfire-xen
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.0.3
@@ -194,11 +194,11 @@
 * lynis-1.2.3
 * lzo-2.02
 * m4-1.4.4
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire
-* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire-xen
+* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire
+* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire-xen
 * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
-* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire
-* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire-xen
+* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire
+* madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -241,8 +241,8 @@
 * openssh-5.2p1
 * openssl-0.9.8k
 * openswan-2.6.21
-* openswan-2.6.21-kmod-2.6.27.21-ipfire
-* openswan-2.6.21-kmod-2.6.27.21-ipfire-xen
+* openswan-2.6.21-kmod-2.6.27.23-ipfire
+* openswan-2.6.21-kmod-2.6.27.23-ipfire-xen
 * openvpn-2.0.9
 * p7zip_4.65
 * pam_mysql-0.7RC1
@@ -257,7 +257,7 @@
 * pkg-config-0.20
 * popt-1.10.4
 * portmap_6.0
-* postfix-2.5.5
+* postfix-2.5.6
 * ppp-2.4.4
 * pptp-1.7.2
 * procps-3.2.6
@@ -271,7 +271,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.4
 * rtorrent-0.8.4
-* samba-3.3.3
+* samba-3.3.4
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
@@ -317,8 +317,8 @@
 * urlgrabber-3.1.0
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire
-* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire-xen
+* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire
+* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.4
 * vim-7.0

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 8d32b72fcbbe427f056b44700a3371a65b8e8e3f..331032b8300c9c006781432d03fd8a90e27f6843 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -315,7 +315,7 @@ END
 close FILE;
        }
 
-       if ($sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' )
+       if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' )
        {
        open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!";
        flock (FILE, 2);
@@ -334,12 +334,12 @@ END
 
 if ( -e "/var/ipfire/cups/enable")
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
        else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
        }
 else
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
        else{system("/usr/local/bin/sambactrl smbsafeconf");}
        }
 
@@ -1206,12 +1206,12 @@ close FILE;
 
 if ( -e "/var/ipfire/cups/enable")
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
        else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
        }
 else
        {
-       if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
        else{system("/usr/local/bin/sambactrl smbsafeconf");}
        }
 

diff --git a/lfs/clamav b/lfs/clamav
index d82acf388cc9b148fdbb3653c558f434a0375dc5..ab38a24dfcfaa288b7d5e9e84107d01ab3503c8d 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.94.2
+VER        = 0.95.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1181e6d62341b84708f126cc353f7ebf
+$(DL_FILE)_MD5 = c802d4b372e455849cfcb0d776fc72d8
 
 install : $(TARGET)
 

diff --git a/lfs/collectd b/lfs/collectd
index 7154b1cd542bd7ea43e247662775bd6ad70d73ab..07dc4d96ed1315f2e4bb3a9291f4f27176b10c2e 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-{tcpconns,unixsock,users,wireless} \
                --with-rrdtool=/usr/share/rrdtool-1.2.15
        cd $(DIR_APP) && make install
-       cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
+       cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
        ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
        ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd
        ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd 

diff --git a/lfs/elinks b/lfs/elinks
index a6e2d6eaa4c365828b8dcb1cf79d97d55ebdee72..4fc4d9d81bf34f2c41d1134384cbbcd16b6d5037 100644 (file)
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.11.4rc0
+VER        = 0.11.6
 
 THISAPP    = elinks-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 718137aa45ddb2e7137edb8fb4f646a6
+$(DL_FILE)_MD5 = 463ec007b013822a82d197580117ea16
 
 install : $(TARGET)
 

diff --git a/lfs/fetchmail b/lfs/fetchmail
index dbab16f362441f049bd2dc65a674910fd2e6dec0..e60c30beabbb6cd7acaf69c51ce4dec3bc2cfc1e 100644 (file)
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 

diff --git a/lfs/git b/lfs/git
index 0dc8b4de7db3e652a52ff99a92d67c3d6afb1a96..dedac7b75790fedeb819ddc01c019e3a940925da 100644 (file)
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.1.2
+VER        = 1.6.3
 
 THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 72a9d88932190ff3523678eec88844ae
+$(DL_FILE)_MD5 = a5e6165506cddd94954277cf81f44b14
 
 install : $(TARGET)
 

diff --git a/lfs/linux b/lfs/linux
index 12275354bcdfbccc0b218ee6dda1070d16d02ccc..b45997dafadf277fcb41fe8d7b9f10f723389fed 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .21
-VER        = 2.6.27.21
+PATCHLEVEL = .23
+VER        = 2.6.27.23
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -62,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2          = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz                     = $(URL_IPFIRE)/squashfs3.4.tar.gz
 reiser4-for-2.6.27.19.patch.bz2                = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
 
-$(DL_FILE)_MD5                         = 2912af7938fae1a3f2a9a6bcf8c0009f
+$(DL_FILE)_MD5                         = 42db72b93641da2fe9fb0eb2ae6388d6
 netfilter-layer7-v2.21.tar.gz_MD5      = 838422e7d9a06b42e682e9064e5210b5
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6

diff --git a/lfs/perl-gettext b/lfs/perl-gettext
index 63ec9703ee24b986bcc1ff21c5248cb10c4ce21f..3869b4c9d06556ebcb3a69b035808bd2d407ea3b 100644 (file)
--- a/lfs/perl-gettext
+++ b/lfs/perl-gettext
@@ -34,6 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-gettext
 DEPS       = ""
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/postfix b/lfs/postfix
index 626140137dc36e42919a3901ea01bfd09edd4e0a..c9f58b438cf5d6509ef92823539cff07f40879eb 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.5.5
+VER        = 2.5.6
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "amavisd mysql"
 
@@ -46,7 +46,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch
 
-$(DL_FILE)_MD5 = 6b4b848bdd2239dddfc9d385e57e19ef
+$(DL_FILE)_MD5 = ec2cb63b53f5f36c3ca91da8f3bc9407
 postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8
 
 install : $(TARGET)

diff --git a/lfs/samba b/lfs/samba
index 00211b1a8fc73871a1fd8bd6044e12b60d80cd7c..c3608500f73a5dbe5a4d2b699a29a4020ec70236 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.3
+VER        = 3.3.4
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed
+$(DL_FILE)_MD5 = 1443165edb7cb3f56f1e77aec1ee3266
 
 install : $(TARGET)
 

diff --git a/lfs/streamripper b/lfs/streamripper
index 050e8a9835641b4ebcac0320743f40b1803a5d89..ed8452dcbfc6c044d002b7d8d8d813de41eed9e2 100644 (file)
--- a/lfs/streamripper
+++ b/lfs/streamripper
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = streamripper
 PAK_VER    = 1
 
-DEPS       = "libmad libogg libvorbis"
+DEPS       = "glib libmad libogg libvorbis"
 
 ###############################################################################
 # Top-level Rules

diff --git a/src/initscripts/init.d/beep b/src/initscripts/init.d/beep
index de6666edf404c84ba8053d28d2b95f0427407c9a..6498e293ad7f56017d41c221c6c3a19a2eb5382e 100644 (file)
--- a/src/initscripts/init.d/beep
+++ b/src/initscripts/init.d/beep
@@ -19,7 +19,7 @@ LENGTH=40
 
 play () {
 
-       beep -l $LENGTH -f $1
+       beep -l $LENGTH -f $1 2> /dev/null
 
 }
 

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 801db9a4322ecfa476c56148e009cf5244e05e0a..74ff3fdc82e84722bc3d9988b74aefa96edc7dcf 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -13,6 +13,13 @@ fi
 
 case "$1" in
        start)
+               # If run from init and collectd alrady started then exit silent
+               if [ "$(basename $0)" != "collectd" ]; then
+                       if [ "$(ps -A | grep " collectd$")" != "" ]; then
+                               exit 0
+                       fi
+               fi
+
                # At first run search for sensors with sensors-detect
                if [ ! -e /etc/sysconfig/lm_sensors ]; then
                        boot_mesg "Searching for Sensors..."
@@ -35,20 +42,24 @@ case "$1" in
                        fi
                fi
 
-               boot_mesg -n "Loading Sensor Modules: "
-               for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
-               modprobe $modul > /dev/null 2>&1;
-                       if [ ${?} = 0 ]; then
-                               boot_mesg -n "$SUCCESS$modul$NORMAL ";
-                       else
-                               boot_mesg -n "$WARNING$modul$NORMAL ";
-                       fi
-               done
-               boot_mesg;
-               echo_ok;
+               # Load sensor modules only first start
+               if [ ! -e /var/lock/sensors_modules ]; then
+                       touch /var/lock/sensors_modules
+                       boot_mesg -n "Loading Sensor Modules: "
+                       for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+                       modprobe $modul > /dev/null 2>&1;
+                               if [ ${?} = 0 ]; then
+                                       boot_mesg -n "$SUCCESS$modul$NORMAL ";
+                               else
+                                       boot_mesg -n "$WARNING$modul$NORMAL ";
+                               fi
+                       done
+                       boot_mesg;
+                       echo_ok;
+               fi
 
                # Enable sensors plugin if sensors found
-               if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then
+               if [ "$( sensors 2>&1 | grep 'No sensors found!' | wc -l )" == "1" ]; then
                        sed -i -e "s|^LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
                else
                        sed -i -e "s|^#LoadPlugin sensors|LoadPlugin sensors|g" /etc/collectd.conf
@@ -56,9 +67,9 @@ case "$1" in
 
                # Enable thermal plugin if thermal_zone found
                if [ ! -e  /sys/class/thermal/thermal_zone0 ]; then
-                       sed -i -e "s|^LoadPlugin thermal|#LoadPlugin thermal|g" /etc/collectd.conf
+                       sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf
                else
-                       sed -i -e "s|^#LoadPlugin thermal|LoadPlugin thermal|g" /etc/collectd.conf
+                       sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf
                fi
 
                # Enable swap plugin if swap found
@@ -73,13 +84,13 @@ case "$1" in
                evaluate_retval
                ;;
        stop)
+               boot_mesg "Stopping Collection daemon..."
+               killproc /usr/sbin/collectd
+               evaluate_retval
                # Save the ramdisk at manual stop but not at shutdown
                if [ "$(basename $0)" == "collectd" ]; then
                    /etc/init.d/tmpfs backup
                fi
-               boot_mesg "Stopping Collection daemon..."
-               killproc /usr/sbin/collectd
-               evaluate_retval
                ;;
        restart)
                ${0} stop

diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index cb61a405ff03963723ad7598976ccd4b61a6e7f6..8d2e49dfbe63fcc7d6fe620d1ec315ff575f8370 100644 (file)
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -71,7 +71,7 @@ case "${1}" in
                        grep -o '\btty[[:digit:]]*\b'`
                do
                        openvt -f -w -c ${TTY#tty} -- \
-                               /bin/sh -c "${MODE_COMMAND}"
+                               /bin/sh -c "${MODE_COMMAND}" 2>/dev/null
                done
 
                # Set the font (if not already set above) and the keymap

diff --git a/src/initscripts/init.d/fetchmail b/src/initscripts/init.d/fetchmail
index 6084934dc334d802538c5e891a3b66342d89868d..be0d1263abd534a2590398545b3c1158d9158e46 100644 (file)
--- a/src/initscripts/init.d/fetchmail
+++ b/src/initscripts/init.d/fetchmail
@@ -18,7 +18,7 @@
 case "${1}" in
        start)
                boot_mesg "Starting fetchmail daemon..."
-               /usr/bin/fetchmail --daemon 300 >/dev/null 2>&1
+               /usr/bin/fetchmail --daemon 300 -f '/root/.fetchmailrc' >/dev/null 2>&1
                evaluate_retval
                ;;
 

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 5843903ebb63abb3e0dbd8621a4d7309eda19454..1a795830604e82411ebb4501f3b00db67bc84b42 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -73,6 +73,10 @@ fi
 
 case "${1}" in
        start)
+               # Stop collectd if running
+               if [ "$(ps -A | grep " collectd$")" != "" ]; then
+                       /etc/rc.d/init.d/collectd stop
+               fi
                if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
                        boot_mesg "Bringing up the ${DEVICE} interface..."
                        boot_mesg_flush
@@ -87,6 +91,7 @@ case "${1}" in
                        else
                                boot_mesg "Interface ${DEVICE} doesn't exist." ${FAILURE}
                                echo_failure
+                               /etc/rc.d/init.d/collectd start
                                exit 1
                        fi
                fi
@@ -132,6 +137,7 @@ case "${1}" in
                                else
                                        boot_mesg "dhcpcd already running!" ${WARNING}
                                        echo_warning
+                                       /etc/rc.d/init.d/collectd start
                                        exit 2
                                fi
                        fi
@@ -185,6 +191,7 @@ case "${1}" in
                        if ( ps ax | grep -q [p]ppd ); then 
                            boot_mesg "pppd is still running." ${FAILURE}
                            echo_failure
+                           /etc/init.d/collectd start
                            exit 1
                        fi
                        
@@ -220,6 +227,7 @@ case "${1}" in
                                if [ "$PPP_NIC" == "" ]; then
                                        boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
                                        echo_failure
+                                       /etc/rc.d/init.d/collectd start
                                        exit 0
                                fi
                                boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
@@ -357,7 +365,8 @@ case "${1}" in
                        ## Create & Enable vnstat
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
-
+                       /etc/rc.d/init.d/collectd start
+                       exit 0
                fi
                ;;
 

diff --git a/src/initscripts/init.d/postfix b/src/initscripts/init.d/postfix
index cc819754316ab4d1ae8da82f0e87fbc2068515f2..f7fc2dd73a3b1d509a9e278452fafe4d87cd73ec 100644 (file)
--- a/src/initscripts/init.d/postfix
+++ b/src/initscripts/init.d/postfix
@@ -47,7 +47,12 @@ case "$1" in
                $0 start
                ;;
        status)
-               statusproc /usr/lib/postfix/master
+               PID=`pidof /usr/lib/postfix/master`
+               MPID=`cat /var/spool/postfix/pid/master.pid`
+               if [ ${MPID} = ${PID} ]; then
+                       echo -e "${INFO}postfix is running with Process"\
+                       "ID(s) ${MPID}.${NORMAL}"
+               fi
                ;;
 
        *)

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 85c1a4311f611a6389710ad064c690a0617f3b39..35ad8a87ad5a324d42f4df58a16d719d9c8a395d 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -106,6 +106,9 @@ case "$1" in
                sleep 1
                $0 start
                ;;
+       setperms)
+               chown -R nobody.squid /var/updatecache/
+               ;;
 
        *)
                echo "Usage: $0 {start|stop|restart|status|flush}"

diff --git a/src/misc-progs/squidctrl.c b/src/misc-progs/squidctrl.c
index 9f3ba5dd9a3a9acc83e3a727174bd5cc7f356913..6493309989c7acee4918283a0ae5abe3168c911b 100644 (file)
--- a/src/misc-progs/squidctrl.c
+++ b/src/misc-progs/squidctrl.c
@@ -38,8 +38,10 @@ int main(int argc, char *argv[]) {
                safe_system("ln -fs ../init.d/squid /etc/rc.d/rc6.d/K00squid >/dev/null 2>&1");
        } else if (strcmp(argv[1], "disable") == 0) {
                safe_system("rm -f /etc/rc.d/rc*.d/*squid >/dev/null 2>&1");
+       } else if (strcmp(argv[1], "setperms") == 0) {
+               safe_system("/etc/rc.d/init.d/squid setperms");
        } else {
-               fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure)\n\n");
+               fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure|setperms)\n\n");
                exit(1);
        }
 

diff --git a/src/ppp/dialer b/src/ppp/dialer
index 208e3b96776b81c4b3f5d025d87367507ef237a7..c8aad46e7c8cb2583d65ac3bf05e5351476160f6 100644 (file)
--- a/src/ppp/dialer
+++ b/src/ppp/dialer
@@ -88,8 +88,9 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log                  \
        OK                      '$speaker'                              \
        OK                      '$add_at2'                              \
        ''                      '$add_at3'                              \
+       ''                      'sleep 5'                               \
        TIMEOUT                 '$modemsettings{'TIMEOUT'}'             \
-       OK                      '${dial}${telephone}'                   \
+       OK                      '\d${dial}${telephone}'                 \
        CONNECT                 '${btfudge}'                            ";
 
 if ($loginscript)

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 9168eef40c3dc393e92d57f31121f1472ef4a737..ab01ad38b71f8eea2216d8e64906cfed615f91db 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -32,14 +32,22 @@ if [ "$DNS" == "Automatic" ]; then
                echo -n "$MS_DNS1" > /var/ipfire/red/dns1
                echo -n "$MS_DNS2" > /var/ipfire/red/dns2
        else
-               echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
-               echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
+               if [ "$PRIMARY_DNS" == "10.11.12.13" ]; then
+                       echo -n "$DNS1" > /var/ipfire/red/dns1
+               else
+                       echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
+               fi
+               if [ "$SECONDARY_DNS" == "10.11.12.14" ]; then
+                       echo -n "$DNS2" > /var/ipfire/red/dns2
+               else
+                       echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
+               fi
        fi
 else
        echo -n "$DNS1" > /var/ipfire/red/dns1
        echo -n "$DNS2" > /var/ipfire/red/dns2
 fi
-
+7
 echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
@@ -65,7 +73,7 @@ else
            echo "$FIRE gateway" >> /tmp/hosts
        else
            #DNS lookup failed use direct ip
-           echo "85.88.28.124  gateway" >> /tmp/hosts
+           echo "85.88.28.125  gateway" >> /tmp/hosts
        fi
 fi
 mv /tmp/hosts /etc/hosts

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index 824af248abe6de932a017e3f00c048da931bcfa0..bc4d4eb6562302b5fc60c2600604bf3226213e5a 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -79,11 +79,11 @@ sub hangup
     return;
   }
 
-  # now wait for active triggerfile and ppp daemon to disappear
+  # now wait for active triggerfile and ppp daemon to disappear 
   # wait maximum 60 seconds
   my $counter = 60;
   sleep 1;
-  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 )
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) 
   {
     sleep 1;
     $counter--;
@@ -123,14 +123,12 @@ sub reconnect
   # wait maximum 60 seconds
   my $counter = 60;
   sleep 1;
-  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 )
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) 
   {
     sleep 1;
     $counter--;
   }
-  /etc/init.d/collectd stop
   &dial();
-  /etc/init.d/collectd start
 }
 
 
@@ -170,7 +168,7 @@ sub profile
     ## FIXME: do we need to do this ?
     sleep($sleep_after_profile);
     &dial();
-  }
+  }  
 }
 
 
@@ -202,7 +200,7 @@ sub timer
     }
 
 
-    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )
+    if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' )    
     {
       &reconnect()
     }