From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 21 Mar 2011 08:34:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-core49~44
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5ec2c61ab08b41cf01f7f144c92d8c2d4581aae0;hp=25942c277cb9c7485cb9aa6e2b20662031a127b5

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

diff --git a/lfs/nano b/lfs/nano
index 1bd26a3206..b0346770fa 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.9
+VER        = 2.2.6
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2be94dc43fb60fff4626a2401a977220
+$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807
 
 install : $(TARGET)
 
diff --git a/lfs/nmap b/lfs/nmap
index f746b21c50..5ff3221ab5 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.50
+VER        = 5.51
 
 THISAPP    = nmap-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388
+$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
 
 install : $(TARGET)
 
diff --git a/lfs/vsftpd b/lfs/vsftpd
index d5e809399e..f3e74a00e1 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.2
+VER        = 2.3.4
 
 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    = 6
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
+$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
 
 install : $(TARGET)