From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Feb 2012 03:22:16 +0000 (+0000)
Subject: [packages_10.03.2] 6tunnel: merge r29809
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=ef5020e0dff9bd91a33cfea727d994b44e998b6c;p=10.03%2Fpackages.git

[packages_10.03.2] 6tunnel: merge r29809

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30171 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile
index 3ab60d6..f864cd9 100644
--- a/ipv6/6tunnel/Makefile
+++ b/ipv6/6tunnel/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6tunnel
 PKG_VERSION:=0.11rc2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=74e02d4f0704b3083a01feda66033449
 
 PKG_SOURCE_URL:=http://toxygen.net/6tunnel/
diff --git a/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch b/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch
new file mode 100644
index 0000000..e84da61
--- /dev/null
+++ b/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch
@@ -0,0 +1,11 @@
+--- a/6tunnel.c
++++ b/6tunnel.c
+@@ -508,7 +508,7 @@ int main(int argc, char **argv)
+ {
+ 	int force = 0, lsock, csock, one = 0, jeden = 1, local_port;
+ 	int detach = 1, listen6 = 0, sa_len, conn_limit = 0;
+-	char optc, *username = NULL, *bind_host = NULL;
++	char optc = -1, *username = NULL, *bind_host = NULL;
+ 	struct sockaddr *sa;
+ 	struct sockaddr_in laddr, caddr;
+ 	struct sockaddr_in6 laddr6;