This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via caf4eb1adc5c18fb54a5296e85e3726439b34abe (commit) via 821b6a65649391e6b36b729e24e1c183c8693dc9 (commit) via d97b2de4a135b323612a0d7c24760ce9f9ff5040 (commit) via 09e756f8f2ec9485f7b87b87e8a00f44482f7854 (commit) via 3ed577a5418e69562f98df617abe0f501d12faef (commit) via f66be830476f44b89dbe8dca1236f8aa7aa4fa62 (commit) via f3549ba5f84effa22db6d4fbdf939de80f6c7cdf (commit) from 34ba75f4c0d1d28986c46c97caca9cf743194f5f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit caf4eb1adc5c18fb54a5296e85e3726439b34abe Merge: 821b6a6 34ba75f Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Oct 9 13:04:02 2010 +0200

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

commit 821b6a65649391e6b36b729e24e1c183c8693dc9 Merge: d97b2de 1f10d16 Author: Jan Paul Tuecking earl@ipfire.org Date: Fri Aug 20 14:29:07 2010 +0200

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

commit d97b2de4a135b323612a0d7c24760ce9f9ff5040 Merge: 09e756f 40228ef Author: Jan Paul Tuecking earl@ipfire.org Date: Mon Aug 16 19:20:21 2010 +0200

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

commit 09e756f8f2ec9485f7b87b87e8a00f44482f7854 Merge: 3ed577a b6de676 Author: Jan Paul Tuecking earl@ipfire.org Date: Mon Jul 26 19:19:11 2010 +0200

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

commit 3ed577a5418e69562f98df617abe0f501d12faef Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Jul 22 10:23:06 2010 +0200

Updated vsftpd to 2.2.2

commit f66be830476f44b89dbe8dca1236f8aa7aa4fa62 Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Jul 22 10:21:56 2010 +0200

Fixes for VDRAdmin Version 2.6.7

commit f3549ba5f84effa22db6d4fbdf939de80f6c7cdf Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Jul 22 10:20:33 2010 +0200

Fixed description of init script

-----------------------------------------------------------------------

Summary of changes: doc/packages-list.txt | 2 +- lfs/vsftpd | 6 +++--- src/initscripts/init.d/openvmtools | 4 ++-- src/initscripts/init.d/vdradmin | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-)

Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 364a5f7..b4d15fa 100644 --- 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/lfs/vsftpd b/lfs/vsftpd index e4cb67c..d5e8093 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)

diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools index c1588e1..a3bd073 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 : # diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin index c7a565d..a0858de 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 ;;

hooks/post-receive -- IPFire 2.x development tree