From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/strongswan/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'package/strongswan') diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 1052ff7b1..996bddd06 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -9,12 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f624ab041c306af0f5f57c927e9ea2e4 PKG_DESCR:= IPsec software PKG_SECTION:= net/security -PKG_DEPENDS:= ip libpthread kmod-net-key kmod-xfrm-user -PKG_DEPENDS+= kmod-inet-ah kmod-inet-esp -PKG_DEPENDS+= kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport -PKG_DEPENDS+= kmod-crypto-sha1 kmod-crypto-md5 -PKG_DEPENDS+= kmod-crypto-null kmod-crypto-des kmod-crypto-aes -PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc +PKG_DEPENDS:= ip libpthread PKG_URL:= http://strongswan.org/index.htm PKG_SITES:= http://download.strongswan.org/ -- cgit v1.2.3