don't use locales when retrieving subversion release number (closes: #54)

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

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index f6a0b5a..037cb0d 100644 (file)
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn

-PKG_VERSION:=2.0.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=fad7a08c0d68371c2c0e6428bcb98fa5
+PKG_VERSION:=2.0.5
+PKG_RELEASE:=1
+PKG_MD5SUM:=4bd7a42991c93db23842a0992debe53b

 
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -19,17 +19,20 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 PKG_DEPEND:="libopenssl, kmod-tun"
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 PKG_DEPEND:="libopenssl, kmod-tun"

-ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)

 DISABLE_LZO:=--disable-lzo
 else
 PKG_DEPEND+=", liblzo"
 endif
 
 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
 DISABLE_SERVER:=--disable-server
 endif

+ifneq ($(BR2_COMPILE_OPENVPN_WITH_HTTP),y)
+DISABLE_HTTP:=--disable-http
+endif

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \


@@ -62,13 +65,13 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --disable-plugins \
                  --disable-management \
                  --disable-socks \
                  --disable-plugins \
                  --disable-management \
                  --disable-socks \

-                 --disable-http \

                  $(DISABLE_LZO) \
                  $(DISABLE_SERVER) \
                  $(DISABLE_LZO) \
                  $(DISABLE_SERVER) \

+                 $(DISABLE_HTTP) \

        );
        touch $(PKG_BUILD_DIR)/.configured
 
        );
        touch $(PKG_BUILD_DIR)/.configured
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:

        $(MAKE) -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \