Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
Conflicts:
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh

doc/packages-list.txt
lfs/openvpn

index e1ed310..ef6b635 100644 (file)
 * openmailadmin-1.0.0
 * openssh-5.4p1
 * openssl-0.9.8o
-* openvpn-2.1.1
+* openvpn-2.1.2
 * p7zip_4.65
 * pam_mysql-0.7RC1
 * patch-2.5.4
index b7d651f..8c8ad71 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.1
+VER        = 2.1.2
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b273ed2b5ec8616fb9834cde8634bce7
+$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755
 
 install : $(TARGET)