diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2023-08-03 12:49:00 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2023-08-03 12:49:00 +0200 |
commit | c138c77f5915f5efed917fa9d95c5c6c35a6eeea (patch) | |
tree | 3703752e1e96166bc2ba187ec00a9f79414fadde /patches | |
parent | de30b79bc3786268988228e873fbc09c5d9f855c (diff) | |
download | i486tcc-linux-c138c77f5915f5efed917fa9d95c5c6c35a6eeea.tar.gz i486tcc-linux-c138c77f5915f5efed917fa9d95c5c6c35a6eeea.tar.bz2 |
tried xauth/xhost, dont work (too new?)
Diffstat (limited to 'patches')
-rw-r--r-- | patches/xauth-ipv6.patch | 50 | ||||
-rw-r--r-- | patches/xhost-ipv6.patch | 82 |
2 files changed, 132 insertions, 0 deletions
diff --git a/patches/xauth-ipv6.patch b/patches/xauth-ipv6.patch new file mode 100644 index 0000000..7488c53 --- /dev/null +++ b/patches/xauth-ipv6.patch @@ -0,0 +1,50 @@ +diff -rauN xauth/gethost.c xauth-ipv6-patch/gethost.c +--- xauth/gethost.c 2022-04-20 04:04:52.000000000 +0200 ++++ xauth-ipv6-patch/gethost.c 2023-08-03 12:08:37.729435452 +0200 +@@ -64,6 +64,8 @@ + #include <arpa/inet.h> + #endif + ++#undef IPv6 ++ + const char * + get_hostname (Xauth *auth) + { +diff -rauN xauth/parsedpy.c xauth-ipv6-patch/parsedpy.c +--- xauth/parsedpy.c 2022-04-20 04:04:52.000000000 +0200 ++++ xauth-ipv6-patch/parsedpy.c 2023-08-03 12:11:14.119664828 +0200 +@@ -45,6 +45,8 @@ + #include <sys/stat.h> + #include <limits.h> + ++#undef IPv6 ++ + #if defined(UNIXCONN) || defined(LOCALCONN) + #define UNIX_CONNECTION "unix" + #define UNIX_CONNECTION_LENGTH 4 +@@ -141,11 +143,13 @@ + family = FamilyInternet; + } + #endif ++#if defined(IPv6) && defined(AF_INET6) + } else if (!dnet && (*displayname == '[') && (*(ptr - 1) == ']')) { + /* Allow RFC2732-like [<IPv6NumericAddress>]:display syntax */ + family = FamilyInternet6; + host = copystring (displayname + 1, len - 2); + } else { ++#endif + host = copystring (displayname, len); + if (dnet) { + family = dnet; +diff -rauN xauth/process.c xauth-ipv6-patch/process.c +--- xauth/process.c 2022-04-20 04:04:52.000000000 +0200 ++++ xauth-ipv6-patch/process.c 2023-08-03 12:11:46.849712832 +0200 +@@ -51,6 +51,8 @@ + #include <X11/Xlib.h> + #include <X11/extensions/security.h> + ++#undef IPv6 ++ + #ifndef DEFAULT_PROTOCOL_ABBREV /* to make add command easier */ + #define DEFAULT_PROTOCOL_ABBREV "." + #endif diff --git a/patches/xhost-ipv6.patch b/patches/xhost-ipv6.patch new file mode 100644 index 0000000..67ec92a --- /dev/null +++ b/patches/xhost-ipv6.patch @@ -0,0 +1,82 @@ +diff -rauN xhost/xhost.c xhost-ipv6-patch/xhost.c +--- xhost/xhost.c 2022-12-13 00:44:28.000000000 +0100 ++++ xhost-ipv6-patch/xhost.c 2023-08-03 12:17:50.820246665 +0200 +@@ -119,6 +119,9 @@ + #endif + #endif + ++#undef IPv6 ++#define _X_UNUSED ++ + #ifdef USE_GETTEXT + # include <locale.h> /* setlocale() */ + # include <libintl.h> /* gettext(), textdomain(), etc. */ +@@ -232,9 +235,11 @@ + case FamilyInternet: + printf("INET:"); + break; ++#if defined(IPv6) && defined(AF_INET6) + case FamilyInternet6: + printf("INET6:"); + break; ++#endif + case FamilyDECnet: + printf("DNET:"); + break; +@@ -247,9 +252,11 @@ + case FamilyLocalHost: + printf("LOCAL:"); + break; ++#if 0 + case FamilyServerInterpreted: + printf("SI:"); + break; ++#endif + default: + printf(gettext("<unknown family type %d>:"), list[i].family); + break; +@@ -411,10 +418,12 @@ + else if (!strncmp("local:", lname, 6)) { + family = FamilyLocalHost; + } ++#if 0 + else if (!strncmp("si:", lname, 3)) { + family = FamilyServerInterpreted; + name += 3; + } ++#endif + if (family == FamilyWild && (cp = strchr(lname, ':'))) { + #ifdef IPv6 + /* +@@ -434,6 +443,7 @@ + } + free(lname); + ++#if 0 + if (family == FamilyServerInterpreted) { + XServerInterpretedAddress siaddr; + int rc; +@@ -461,6 +471,7 @@ + return 0; + return 1; + } ++#endif + + #ifdef K5AUTH + if (family == FamilyKrb5Principal) { +@@ -826,6 +837,7 @@ + if (ha->family == FamilyLocalHost) { + return ""; + } ++#if 0 + if (ha->family == FamilyServerInterpreted) { + XServerInterpretedAddress *sip; + static char *addressString; +@@ -854,6 +866,7 @@ + } + return addressString; + } ++#endif + return (NULL); + } + |