X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Ftinc%2FMakefile;h=67501767fb4659fdf0da0a9d06226dd4765f0d02;hb=055150e074b0ffa34f624504fba6d026f9a532a5;hp=290a8a19e5b1229ce8ff8632dd1f10bc9475f316;hpb=eb32141e9f995ee1b4297373c74a7a2407de0a0e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 290a8a19e5..67501767fb 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,21 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.13
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
 	http://ftp.yi.se/pub/tinc/ \
 	http://www.mirrors.wiretapped.net/security/network-security/tinc/
-PKG_MD5SUM:=ee0b1a3366c6e379cae34be6fa5dcb15
+PKG_MD5SUM:=86263994d38c750431efd17e9a91a248
 
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-TARGET_CFLAGS+=-std=gnu99
-
 define Package/tinc
   SECTION:=net
   CATEGORY:=Network
@@ -37,13 +35,17 @@ define Package/tinc/description
   encryption to create a secure private network between hosts on the Internet.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--with-kernel="$(LINUX_DIR)" \
-		--with-zlib="$(STAGING_DIR)/usr" \
-		--with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \
-	)
-endef
+TARGET_CFLAGS += -std=gnu99
+
+CONFIGURE_ARGS += \
+	--with-kernel="$(LINUX_DIR)" \
+	--with-zlib="$(STAGING_DIR)/usr" \
+	--with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \
+
+# XXX: checking for SHA1_version(), which is a variable, not a function,
+# fails on PowerPC, so just override it for now
+CONFIGURE_VARS += \
+	ac_cv_lib_crypto_SHA1_version="yes" \
 
 define Package/tinc/install
 	$(INSTALL_DIR) $(1)/usr/sbin