From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/openvpn/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/openvpn') diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index e6d853297..e7563483f 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= openvpn PKG_VERSION:= 2.3.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 9b70be9fb45e407117c3c9b118e4ba22 -PKG_DESCR:= VPN solution using SSL/TLS +PKG_DESCR:= vpn solution using ssl/tls PKG_SECTION:= net/security PKG_BUILDDEP:= autotool PKG_DEPENDS:= ip @@ -15,7 +15,7 @@ PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS -PKGFD_WITH_LZO:= enable LZO compression support +PKGFD_WITH_LZO:= enable lzo compression support PKGFS_WITH_LZO:= liblzo PKGFB_WITH_LZO:= liblzo PKGFD_WITH_MANAGEMENT:= enable management server support -- cgit v1.2.3