Merge commit 'origin/master' into next

Conflicts:
	config/rootfiles/core/41/filelists/files

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 146744e8c7776eb2dadd08eccf2d321f417e1b27..7894e3d3c83df15a87de980727f1d8f89d4849e4 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -37,7 +37,7 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.23-ipfire
+* alsa-lib-1.0.23-kmod-2.6.32.24-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
@@ -67,20 +67,20 @@
 * clamav-0.96.2
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire-xen
+* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire
+* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-xen
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.23-ipfire
-* cryptodev-20091126-kmod-2.6.32.23-ipfire-xen
+* cryptodev-20091126-kmod-2.6.32.24-ipfire
+* cryptodev-20091126-kmod-2.6.32.24-ipfire-xen
 * cups-1.4.4
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.23-ipfire
-* dahdi-2.2.1-kmod-2.6.32.23-ipfire-xen
+* dahdi-2.2.1-kmod-2.6.32.24-ipfire
+* dahdi-2.2.1-kmod-2.6.32.24-ipfire-xen
 * db-4.4.20
 * dbus-1.0.3
 * ddrescue-1.12
@@ -90,10 +90,10 @@
 * dnsmasq-2.45
 * dosfstools-3.0.9
 * dracut-006
-* e1000-8.0.19-kmod-2.6.32.23-ipfire
-* e1000-8.0.19-kmod-2.6.32.23-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.23-ipfire
-* e1000e-1.1.19-kmod-2.6.32.23-ipfire-xen
+* e1000-8.0.19-kmod-2.6.32.24-ipfire
+* e1000-8.0.19-kmod-2.6.32.24-ipfire-xen
+* e1000e-1.1.19-kmod-2.6.32.24-ipfire
+* e1000e-1.1.19-kmod-2.6.32.24-ipfire-xen
 * e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -148,10 +148,10 @@
 * icecream-0.9.4.8
 * icegenerator-0.5.5-pre2
 * iftop-0.17
-* igb-2.3.4-kmod-2.6.32.23-ipfire
-* igb-2.3.4-kmod-2.6.32.23-ipfire-xen
+* igb-2.3.4-kmod-2.6.32.24-ipfire
+* igb-2.3.4-kmod-2.6.32.24-ipfire-xen
 * igmpproxy-0.1
-* imspector-0.9
+* imspector-20101008
 * inetutils-1.4.2
 * ipaddr-1.2
 * iperf-2.0.4
@@ -165,10 +165,10 @@
 * joe-3.7
 * jpegsrc.v6b
 * kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-xen
 * kudzu-1.2.64
-* kvm-kmod-2.6.34.1-kmod-2.6.32.23-ipfire
+* kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -201,8 +201,8 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.32.23-ipfire
-* linux-2.6.32.23-ipfire-xen
+* linux-2.6.32.24-ipfire
+* linux-2.6.32.24-ipfire-xen
 * linux-atm-2.4.1
 * linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
@@ -213,11 +213,11 @@
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.23-ipfire
-* mISDN-20100525-kmod-2.6.32.23-ipfire-xen
+* mISDN-20100525-kmod-2.6.32.24-ipfire
+* mISDN-20100525-kmod-2.6.32.24-ipfire-xen
 * mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -235,7 +235,7 @@
 * module-init-tools-3.5
 * motion-3.2.11
 * mpc-0.19
-* mpd-0.15.8
+* mpd-0.15.12
 * mpeg2dec-0.4.0b
 * mpfire-ipfire
 * mtd-CVS-20070507
@@ -286,12 +286,12 @@
 * psmisc-22.2
 * qemu-0.11.1-kqemu
 * qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.23-ipfire
-* r8101-1.016.00-kmod-2.6.32.23-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.23-ipfire
-* r8168-8.018.00-kmod-2.6.32.23-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.23-ipfire
-* r8169-6.013.00-kmod-2.6.32.23-ipfire-xen
+* r8101-1.016.00-kmod-2.6.32.24-ipfire
+* r8101-1.016.00-kmod-2.6.32.24-ipfire-xen
+* r8168-8.018.00-kmod-2.6.32.24-ipfire
+* r8168-8.018.00-kmod-2.6.32.24-ipfire-xen
+* r8169-6.013.00-kmod-2.6.32.24-ipfire
+* r8169-6.013.00-kmod-2.6.32.24-ipfire-xen
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
@@ -299,7 +299,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.5
+* samba-3.5.6
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01
@@ -346,8 +346,8 @@
 * usb-modeswitch-data-20100707
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire-xen
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire
+* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0
@@ -355,7 +355,7 @@
 * vlc-0.8.6i
 * vnstat-1.6
 * vnstati-beta3
-* vsftpd-2.1.2
+* vsftpd-2.2.2
 * w_scan-20080105
 * watchdog-5.9
 * wget-1.10.2

diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
index f99468e4fcdec808b548641c9f4ebe1700facc33..a00db2a7411e06fb3f6322d8ab534374fc190ac5 100644 (file)
--- a/html/cgi-bin/outgoinggrp.cgi
+++ b/html/cgi-bin/outgoinggrp.cgi
@@ -137,7 +137,7 @@ $ipgroupcontent =~ s/\n/<br \/>/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall ip groups'});
 
 print <<END
-<a name="outgoing showipgroup"</a>
+<a name="outgoing showipgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
 <table width='95%' cellspacing='0'>
@@ -214,7 +214,7 @@ $macgroupcontent =~ s/\n/<br \/>/g;
 &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall mac groups'});
 
 print <<END
-<a name="outgoing showmacgroup"</a>
+<a name="outgoing showmacgroup"></a>
 <br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
 <table width='95%' cellspacing='0'>

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index eea32bff2226d4df1863b76c03937fb5318ef156..1bfc0392cd6c788cf5115f48d99538c9dded0170 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1213,6 +1213,10 @@ print <<END
        <td colspan='2'>$Lang::tr{'urlfilter blocked domains'}&nbsp;<img src='/blob.gif' alt='*' /></td>
        <td colspan='2'>$Lang::tr{'urlfilter blocked urls'}&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
+<tr>
+       <td colspan='2'>$Lang::tr{'urlfilter example'}</td>
+       <td colspan='2'>$Lang::tr{'urlfilter example ads'}</td>
+</tr>
 <tr>
        <td colspan='2' width='50%'><textarea name='CUSTOM_BLACK_DOMAINS' cols='32' rows='6' wrap='off'>
 END
@@ -1252,6 +1256,10 @@ print <<END
        <td colspan='2'>$Lang::tr{'urlfilter allowed domains'}&nbsp;<img src='/blob.gif' alt='*' /></td>
        <td colspan='2'>$Lang::tr{'urlfilter allowed urls'}&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
+<tr>
+       <td colspan='2'>$Lang::tr{'urlfilter example'}</td>
+       <td colspan='2'>$Lang::tr{'urlfilter example ads'}</td>
+</tr>
 <tr>
        <td colspan='2' width='50%'><textarea name='CUSTOM_WHITE_DOMAINS' cols='32' rows='6' wrap='off'>
 END

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 8a740635a01f0eb5e3e3f02d2682d417a532a7c4..f303cfbc2cb0ead196690353b841788b1efe57e9 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1988,7 +1988,7 @@ END
        print <<END
        <table width='100%' cellpadding='0' cellspacing='5' border='0'>
        <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td>
-           <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td>
+           <td class='base' width='50%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td>
        </tr>
        </table>
 END
@@ -2006,7 +2006,7 @@ END
        <table width='100%' cellpadding='0' cellspacing='5' border='0'>
        <tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} $pskdisabled/></td>
            <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td>
-           <td class='base' width='40%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
+           <td class='base' width='40%'><input type='password' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
        <tr><td colspan='3' bgcolor='#000000'></td></tr>
        <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
            <td class='base'><hr />$Lang::tr{'upload a certificate request'}</td>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6b01831d5a8833b92f5dd6137fd65e13d472c079..0936af009cd6d9c8fc173fcb77cacf63da532f3a 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1886,6 +1886,8 @@
 'urlfilter enable log' => 'Aktiviere Protokoll',
 'urlfilter enable rewrite rules' => 'Aktiviere lokale Dateiumleitung',
 'urlfilter enabled' => 'Aktiviert:',
+'urlfilter example' => 'Beispiel: www.domain.com',
+'urlfilter example ads' => 'Beispiel: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Blacklist exportieren',
 'urlfilter export error' => 'Kann Exportdatei nicht erstellen',
 'urlfilter expressions' => 'Ausdrücke (einen pro Zeile)',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 907de5d800d8a8eef9f60bf052592f0dda8e6c2c..b35a23a7818e56eb72b400c141914cfe26c6fb4d 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1920,6 +1920,8 @@
 'urlfilter enable log' => 'Enable log',
 'urlfilter enable rewrite rules' => 'Enable local file redirection',
 'urlfilter enabled' => 'Enabled:',
+'urlfilter example' => 'Example: www.domain.com',
+'urlfilter example ads' => 'Example: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Export blacklist',
 'urlfilter export error' => 'Unable to create export file',
 'urlfilter expressions' => 'Expressions (one per line)',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 8074cd29dc95a7bb78c547d724ae98fe00239275..ca2b9348dc7dffd707768ed27ad4e1170e20509c 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1907,6 +1907,8 @@
 'urlfilter enable log' => 'Activar registro',
 'urlfilter enable rewrite rules' => 'Activar redirección de archivos locales',
 'urlfilter enabled' => 'Activado:',
+'urlfilter example' => 'Ejemplo: www.domain.com',
+'urlfilter example ads' => 'Ejemplo: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Exportar lista negra',
 'urlfilter export error' => 'Imposible crear archivo de exportación',
 'urlfilter expressions' => 'Frases (una por línea)',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 7904bb631d2ec812384513181d219989dcdc02aa..0179e73da8100c0e9c3e4300ca0a16cfef895742 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1916,6 +1916,8 @@
 'urlfilter enable log' => 'Activer log',
 'urlfilter enable rewrite rules' => 'Activer fichier local de redirection',
 'urlfilter enabled' => 'Activé:',
+'urlfilter example' => 'Exemple: www.domain.com',
+'urlfilter example ads' => 'Exemple: www.domain.com/ads/',
 'urlfilter export blacklist' => 'Exporter Blackliste',
 'urlfilter export error' => 'Impossible de créer fichier d\'exportation',
 'urlfilter expressions' => 'Expressions (une par ligne)',

diff --git a/lfs/imspector b/lfs/imspector
index 31e358dcbd97f39bc4917ac46ed7d6aa48e7a1e3..092211bc8c9b8398fd2ce8f8a3b4a4dca990e0fe 100644 (file)
--- a/lfs/imspector
+++ b/lfs/imspector
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9
+VER        = 20101008
 
 THISAPP    = imspector-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = imspector
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 626abf7c2b8f15d56df679ad66624575
+$(DL_FILE)_MD5 = 032407bb13ccddb77328f83eded102ee
 
 install : $(TARGET)
 
@@ -77,9 +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) && make install
+       cd $(DIR_SRC)/imspector && make install
        -mv /usr/etc/imspector /etc/imspector
-       install -v -m 755  $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
+       -mv /etc/imspector/imspector /etc/imspector
+       install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
        install -v -m 644 $(DIR_SRC)/config/backup/includes/imspector /var/ipfire/backup/addons/includes/imspector
        chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
        chown nobody:nobody -R /var/log/imspector

diff --git a/lfs/samba b/lfs/samba
index 496a2bf06e7690407195855f38600304ef1d8820..8a354d85dff61410d7b768d91c4932b478cae326 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.5
+VER        = 3.5.6
 
 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    = 30
+PAK_VER    = 31
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 278728aeeef9db7e27fa6a2ce5b43509
+$(DL_FILE)_MD5 = bf6c09ea497a166df8bd672db1d8da8f
 
 install : $(TARGET)
 

diff --git a/lfs/vsftpd b/lfs/vsftpd
index e4cb67c4e55b4014e383b581d2a084f43126d845..d5e809399e185525202c7400110b8798a2089b1d 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.2
+VER        = 2.2.2
 
 THISAPP    = vsftpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6a8c8579d50adf0d0fc07226c03bfb52
+$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
 
 install : $(TARGET)
 

diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools
index c1588e1dcbdedbed287bcf98c140fe97b62b031e..a3bd0736ecf66fdf0128e4c9140f8171fdc757e3 100755 (executable)
--- a/src/initscripts/init.d/openvmtools
+++ b/src/initscripts/init.d/openvmtools
@@ -4,9 +4,9 @@
 #
 # Description : init-script for open-vm-tools
 #
-# Authors     : earl
+# Authors     : Jan Paul Tuecking (earl@ipfire.org)
 #
-# Version     : 00.01
+# Version     : 1.00
 #
 # Notes       :
 #

diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin
index c7a565d0ec1afaea43d62a62ee3d0e0a13d385fd..a0858de35f8077275f141d02b2ab1991cb2a36bc 100644 (file)
--- a/src/initscripts/init.d/vdradmin
+++ b/src/initscripts/init.d/vdradmin
@@ -8,7 +8,8 @@
 #
 # Version     : 01.00
 #
-# Notes       :
+# Notes       : Changes in 01.01
+#             : v.2.6.7 needs /var/run/vdradmin dir (earl@ipfire.org)
 #
 ########################################################################
 
@@ -18,6 +19,7 @@
 case "${1}" in
        start)
                boot_mesg "Starting VDR Webadministration Tool..."
+               mkdir /var/run/vdradmin -p
                loadproc /usr/bin/vdradmind > /dev/null
                evaluate_retval
                ;;