From c70ced3e35016eeaa3c4e2c10e911d2f9e7073e9 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 23 Apr 2013 11:12:43 +0000
Subject: [PATCH] AA: tinc: merge r36041 and r36402 (CVE-2013-1428)

SVN-Revision: 36403
---
 net/tinc/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 53f270fec7..b383365ebf 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages 
-PKG_MD5SUM:=5d97ee0f1ccf8fea5b492f6b54d5ac32
+PKG_MD5SUM:=d7bc9ca38672c9da08d74ff2a3e8e36d
 
 PKG_INSTALL:=1
 
-- 
2.30.2