From f3549ba5f84effa22db6d4fbdf939de80f6c7cdf Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 22 Jul 2010 10:20:33 +0200 Subject: [PATCH 1/6] Fixed description of init script --- src/initscripts/init.d/openvmtools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools index c1588e1dc..a3bd0736e 100755 --- 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 : # From f66be830476f44b89dbe8dca1236f8aa7aa4fa62 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 22 Jul 2010 10:21:56 +0200 Subject: [PATCH 2/6] Fixes for VDRAdmin Version 2.6.7 --- src/initscripts/init.d/vdradmin | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin index c7a565d0e..a0858de35 100644 --- 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 ;; From 3ed577a5418e69562f98df617abe0f501d12faef Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 22 Jul 2010 10:23:06 +0200 Subject: [PATCH 3/6] Updated vsftpd to 2.2.2 --- doc/packages-list.txt | 2 +- lfs/vsftpd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 470bbc0f6..62353d7f2 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -354,7 +354,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/lfs/vsftpd b/lfs/vsftpd index e4cb67c4e..d5e809399 100644 --- 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) From a2ee81406ff7e6847ad17670c7b11766da6c5ce3 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 9 Oct 2010 16:08:33 +0200 Subject: [PATCH 4/6] Fixes bug #0000722 pre-shared key is now a password field. --- html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8a740635a..f303cfbc2 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1988,7 +1988,7 @@ END print < $Lang::tr{'use a pre-shared key'} - + END @@ -2006,7 +2006,7 @@ END - + From 97c3590c6faaea8c31ae5d4139e98cbecb22fd49 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sat, 9 Oct 2010 16:38:00 +0200 Subject: [PATCH 5/6] Fixes bug #0000697 added example for blacklist --- html/cgi-bin/urlfilter.cgi | 4 ++++ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ langs/es/cgi-bin/es.pl | 2 ++ langs/fr/cgi-bin/fr.pl | 2 ++ 5 files changed, 12 insertions(+) diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index eea32bff2..24102c206 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -1213,6 +1213,10 @@ print <$Lang::tr{'urlfilter blocked domains'} * + + + +
$Lang::tr{'use a pre-shared key'}
$Lang::tr{'upload a certificate request'}		$Lang::tr{'urlfilter blocked urls'} *
$Lang::tr{'urlfilter example'}$Lang::tr{'urlfilter example ads'}