cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

miredo: Initial version 1.2.6

Browse Source 
Teredo IPv6 tunneling utility

Signed-off-by: Nikita Vostokov <yawosk@yandex.com>
This commit is contained in:
Nikita Vostokov
2020-03-01 15:13:58 +03:00
parent 09d0928cc2
commit 424aafc417
5 changed files with 179 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipv6/miredo/patches/001-fix-musl-pthread-non-portable.patch
+24
View File
@@ -0,0 +1,24 @@
--- a/libteredo/debug.h 2009-02-28 23:17:14.000000000 +0300
+++ b/libteredo/debug.h 2019-04-07 01:46:48.235087395 +0300
@@ -43,8 +43,10 @@
# ifdef __linux__
# include <errno.h>
# include <assert.h>
-# undef PTHREAD_MUTEX_INITIALIZER
-# define PTHREAD_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+# if defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP)
+# undef PTHREAD_MUTEX_INITIALIZER
+# define PTHREAD_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+# endif
static inline int
d_pthread_mutex_init (pthread_mutex_t *mutex, pthread_mutexattr_t *pattr)
@@ -57,7 +59,7 @@
pthread_mutexattr_init (&attr);
}
- pthread_mutexattr_settype (pattr, PTHREAD_MUTEX_ERRORCHECK_NP);
+ pthread_mutexattr_settype (pattr, PTHREAD_MUTEX_ERRORCHECK);
int res = pthread_mutex_init (mutex, pattr);
if (pattr == &attr)
ipv6/miredo/patches/002-fix-redefinition-ethadr.patch
+21
View File
@@ -0,0 +1,21 @@
--- a/libtun6/tun6.c 2012-09-12 17:03:59.000000000 +0400
+++ b/libtun6/tun6.c 2019-04-07 02:21:07.439952535 +0300
@@ -53,7 +53,7 @@
const char os_driver[] = "Linux";
# define USE_LINUX 1
-# include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver
+# include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver, ETH_P_IPV6
/*
* <linux/ipv6.h> conflicts with <netinet/in.h> and <arpa/inet.h>,
* so we've got to declare this structure by hand.
@@ -65,7 +65,7 @@
};
# include <net/route.h> // struct in6_rtmsg
-# include <netinet/if_ether.h> // ETH_P_IPV6
+//# include <netinet/if_ether.h> // ETH_P_IPV6
typedef struct
{
ipv6/miredo/patches/003-fix-warnings-portable-defined.patch
+47
View File
@@ -0,0 +1,47 @@
--- a/include/gettext.h 2012-09-12 16:57:52.000000000 +0400
+++ b/include/gettext.h 2019-04-07 01:11:52.492519796 +0300
@@ -182,7 +182,7 @@
(((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined(__STRICT_ANSI__)) \
/* || __STDC_VERSION__ >= 199901L */ )
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#if !defined(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS)
#include <stdlib.h>
#endif
@@ -206,7 +206,7 @@
size_t msgctxt_len = strlen (msgctxt) + 1;
size_t msgid_len = strlen (msgid) + 1;
const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#if defined(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS)
char msg_ctxt_id[msgctxt_len + msgid_len];
#else
char buf[1024];
@@ -221,7 +221,7 @@
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcgettext (domain, msg_ctxt_id, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#if !defined(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS)
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif
@@ -252,7 +252,7 @@
size_t msgctxt_len = strlen (msgctxt) + 1;
size_t msgid_len = strlen (msgid) + 1;
const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#if defined(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS)
char msg_ctxt_id[msgctxt_len + msgid_len];
#else
char buf[1024];
@@ -267,7 +267,7 @@
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
+#if !defined(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS)
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif