add a patch to use cppflags when compiling and ldflags when linking,

[openwrt.git] / openwrt / package / openvpn / Makefile

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index d7ae22e..5ae1a31 100644 (file)
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0.2
+PKG_VERSION:=2.0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=862f8788f080f669b1ae00a74ef68001
+PKG_MD5SUM:=4bd7a42991c93db23842a0992debe53b
 
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -18,19 +18,32 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-PKG_DEPEND:="libopenssl, kmod-tun"
-ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+PKG_DEPEND:="kmod-tun"
+
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_OPENSSL),y)
+DISABLE_OPENSSL:=--disable-ssl --disable-crypto
+else
+PKG_DEPEND+=", libopenssl"
+endif
+
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)
 DISABLE_LZO:=--disable-lzo
 else
 PKG_DEPEND+=", liblzo"
 endif
 
-ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
-ifneq ($(BR2_PACKAGE_OPENVPN_HTTP),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
+ifeq ($(BR2_COMPILE_OPENVPN_WITH_PASSWORD_SAVE),y)
+ENABLE_PASSWORD_SAVE:=--enable-password-save
+endif
+ifeq ($(BR2_COMPILE_OPENVPN_WITH_SMALL),y)
+ENABLE_SMALL:=--enable-small
+endif
 
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -66,8 +79,11 @@ $(PKG_BUILD_DIR)/.configured:
                  --disable-management \
                  --disable-socks \
                  $(DISABLE_LZO) \
+                 $(DISABLE_OPENSSL) \
                  $(DISABLE_SERVER) \
                  $(DISABLE_HTTP) \
+                 $(ENABLE_PASSWORD_SAVE) \
+                 $(ENABLE_SMALL) \
        );
        touch $(PKG_BUILD_DIR)/.configured
 
@@ -81,7 +97,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_OPENVPN):
        install -d -m0755 $(IDIR_OPENVPN)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
        $(RSTRIP) $(IDIR_OPENVPN)
        echo "Depends: $(PKG_DEPEND)" >> $(IDIR_OPENVPN)/CONTROL/control
        $(IPKG_BUILD) $(IDIR_OPENVPN) $(PACKAGE_DIR)