From 4268d2a24f801d928dd628f8fa6832437ecbccf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Mon, 19 Apr 2021 20:51:54 +0200 Subject: groups/241.native_packages_inet.group: irssi: bump to v1.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- groups/241.native_packages_inet.group | 4 +- patches/irssi-1.2.2.local.patch | 87 ----------------------------------- patches/irssi-1.2.3.local.patch | 87 +++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 patches/irssi-1.2.2.local.patch create mode 100644 patches/irssi-1.2.3.local.patch diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 573b4a52..c817eeab 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -90,8 +90,8 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_INETUTILS_URL:=https://ftp.gnu.org/gnu/inetutils/inetutils-${PKG_INETUTILS_VERSION}.tar.xz}; : ${PKG_INETUTILS_CONFIGURE_ARGS_EXTRA:="--disable-ftpd --enable-inetd --disable-rexecd --disable-rlogind --disable-rshd --disable-syslogd --enable-talkd --enable-telnetd --disable-tftpd --disable-uucpd --disable-dnsdomainname --disable-ping --disable-ping6 --disable-rcp --disable-rexec --disable-rlogin --disable-rsh --disable-logger --enable-hostname --enable-talk --enable-telnet --disable-tftp --disable-whois --disable-ifconfig --disable-traceroute"}; : ${PKG_IRSSI_DEPENDS:="glib libressl ncurses"}; -: ${PKG_IRSSI_SHA256SUM:=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c}; -: ${PKG_IRSSI_VERSION:=1.2.2}; +: ${PKG_IRSSI_SHA256SUM:=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25}; +: ${PKG_IRSSI_VERSION:=1.2.3}; : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz}; : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}}; : ${PKG_ISYNC_DEPENDS:="libressl"}; diff --git a/patches/irssi-1.2.2.local.patch b/patches/irssi-1.2.2.local.patch deleted file mode 100644 index 0dfa06df..00000000 --- a/patches/irssi-1.2.2.local.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- irssi-0.8.20/src/core/pidwait.c.orig 2016-08-11 14:59:21.000000000 +0200 -+++ irssi-0.8.20/src/core/pidwait.c 2016-12-18 01:14:30.017866300 +0100 -@@ -39,8 +39,10 @@ - void pidwait_add(int pid) - { - if (g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid)) == NULL) { -+#ifndef __midipix__ - int id = g_child_watch_add_full(10, pid, sig_child, NULL, NULL); - g_hash_table_insert(child_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(id)); -+#endif - pids = g_slist_append(pids, GINT_TO_POINTER(pid)); - } - } ---- irssi-0.8.20/src/core/servers.c.orig 2016-09-14 13:46:13.000000000 +0200 -+++ irssi-0.8.20/src/core/servers.c 2016-12-18 01:17:03.451031500 +0100 -@@ -407,6 +407,36 @@ - /* connect with unix socket */ - server_real_connect(server, NULL, server->connrec->address); - } else { -+ #ifdef __midipix__ -+ IPADDR ip4, ip6, *ip; -+ -+ connect_address = server->connrec->proxy != NULL ? -+ server->connrec->proxy : server->connrec->address; -+ if (net_gethostbyname(connect_address, &ip4, &ip6) == -1) { -+ g_warning("net_gethostbyname(): -1"); -+ g_free(server->tag); -+ g_free(server->nick); -+ return FALSE; -+ } else if (server->connrec->family == 0) { -+ /* prefer IPv4 addresses */ -+ ip = ip4.family != 0 ? &ip4 : &ip6; -+ } else if (server->connrec->family == AF_INET6) { -+ /* IPv6 address, use if possible */ -+ if (ip6.family != 0) { -+ ip = &ip6; -+ } else { -+ ip = &ip4; -+ } -+ } else { -+ /* IPv4 address, use if possible */ -+ if (ip4.family != 0) { -+ ip = &ip4; -+ } else { -+ ip = &ip6; -+ } -+ } -+ server_real_connect(server, ip, NULL); -+ #else - /* resolve host name */ - if (pipe(fd) != 0) { - g_warning("server_connect(): pipe() failed."); -@@ -433,6 +463,7 @@ - lookup_servers = g_slist_append(lookup_servers, server); - - signal_emit("server looking", 1, server); -+ #endif - } - return TRUE; - } ---- irssi-0.8.20/src/fe-common/core/fe-exec.c.orig 2016-09-14 13:46:13.000000000 +0200 -+++ irssi-0.8.20/src/fe-common/core/fe-exec.c 2016-12-18 01:14:30.018866300 +0100 -@@ -288,6 +288,9 @@ - } - } - -+#ifdef __midipix__ -+static void sig_pidwait(void *pid, void *statusp); -+#endif - static void process_exec(PROCESS_REC *rec, const char *cmd) - { - const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL }; -@@ -535,6 +538,14 @@ - (GInputFunction) sig_exec_input_reader, - rec); - processes = g_slist_append(processes, rec); -+#ifdef __midipix__ -+ int status; -+ waitpid(rec->pid, &status, 0); -+ while (rec->read_tag != -1) { -+ sig_exec_input_reader(rec); -+ } -+ sig_pidwait((void *)rec->pid, &status); -+#endif - - if (rec->target == NULL && interactive) - rec->target_item = exec_wi_create(active_win, rec); diff --git a/patches/irssi-1.2.3.local.patch b/patches/irssi-1.2.3.local.patch new file mode 100644 index 00000000..0dfa06df --- /dev/null +++ b/patches/irssi-1.2.3.local.patch @@ -0,0 +1,87 @@ +--- irssi-0.8.20/src/core/pidwait.c.orig 2016-08-11 14:59:21.000000000 +0200 ++++ irssi-0.8.20/src/core/pidwait.c 2016-12-18 01:14:30.017866300 +0100 +@@ -39,8 +39,10 @@ + void pidwait_add(int pid) + { + if (g_hash_table_lookup(child_pids, GINT_TO_POINTER(pid)) == NULL) { ++#ifndef __midipix__ + int id = g_child_watch_add_full(10, pid, sig_child, NULL, NULL); + g_hash_table_insert(child_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(id)); ++#endif + pids = g_slist_append(pids, GINT_TO_POINTER(pid)); + } + } +--- irssi-0.8.20/src/core/servers.c.orig 2016-09-14 13:46:13.000000000 +0200 ++++ irssi-0.8.20/src/core/servers.c 2016-12-18 01:17:03.451031500 +0100 +@@ -407,6 +407,36 @@ + /* connect with unix socket */ + server_real_connect(server, NULL, server->connrec->address); + } else { ++ #ifdef __midipix__ ++ IPADDR ip4, ip6, *ip; ++ ++ connect_address = server->connrec->proxy != NULL ? ++ server->connrec->proxy : server->connrec->address; ++ if (net_gethostbyname(connect_address, &ip4, &ip6) == -1) { ++ g_warning("net_gethostbyname(): -1"); ++ g_free(server->tag); ++ g_free(server->nick); ++ return FALSE; ++ } else if (server->connrec->family == 0) { ++ /* prefer IPv4 addresses */ ++ ip = ip4.family != 0 ? &ip4 : &ip6; ++ } else if (server->connrec->family == AF_INET6) { ++ /* IPv6 address, use if possible */ ++ if (ip6.family != 0) { ++ ip = &ip6; ++ } else { ++ ip = &ip4; ++ } ++ } else { ++ /* IPv4 address, use if possible */ ++ if (ip4.family != 0) { ++ ip = &ip4; ++ } else { ++ ip = &ip6; ++ } ++ } ++ server_real_connect(server, ip, NULL); ++ #else + /* resolve host name */ + if (pipe(fd) != 0) { + g_warning("server_connect(): pipe() failed."); +@@ -433,6 +463,7 @@ + lookup_servers = g_slist_append(lookup_servers, server); + + signal_emit("server looking", 1, server); ++ #endif + } + return TRUE; + } +--- irssi-0.8.20/src/fe-common/core/fe-exec.c.orig 2016-09-14 13:46:13.000000000 +0200 ++++ irssi-0.8.20/src/fe-common/core/fe-exec.c 2016-12-18 01:14:30.018866300 +0100 +@@ -288,6 +288,9 @@ + } + } + ++#ifdef __midipix__ ++static void sig_pidwait(void *pid, void *statusp); ++#endif + static void process_exec(PROCESS_REC *rec, const char *cmd) + { + const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL }; +@@ -535,6 +538,14 @@ + (GInputFunction) sig_exec_input_reader, + rec); + processes = g_slist_append(processes, rec); ++#ifdef __midipix__ ++ int status; ++ waitpid(rec->pid, &status, 0); ++ while (rec->read_tag != -1) { ++ sig_exec_input_reader(rec); ++ } ++ sig_pidwait((void *)rec->pid, &status); ++#endif + + if (rec->target == NULL && interactive) + rec->target_item = exec_wi_create(active_win, rec); -- cgit v1.2.3