Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 364a5f7f9e533c5cbff597a0d5bacd3a58d418d2..b4d15fadd21c27091c52caa92836a7622e128144 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -357,7 +357,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/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/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
                ;;