From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 19 Aug 2010 12:49:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~102
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b1d3e68d50513e0b119b455b652d80727060af0;hp=927eb20ae3c6ecaa0a5795335263f636fd549382

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e1ed31025c..ef6b6355a2 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -261,7 +261,7 @@
 * 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
diff --git a/lfs/openvpn b/lfs/openvpn
index b7d651f3a7..8c8ad71116 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -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)