Here is an initial diff to update irssi to the 0.8.16-rc1 release
for testing. This doesn't bring in much over what was already in
the port/package since I had already backported practically everything
from SVN.
Stuart,
It looks like patch-src_fe-common_core_fe-core-commands_c might
need to be modified since the time_t bump?
Any irssi users?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/irssi/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 21 Mar 2013 08:46:34 -0000 1.55
+++ Makefile 17 Dec 2013 11:46:47 -0000
@@ -4,9 +4,10 @@ SHARED_ONLY= Yes
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
-DISTNAME= irssi-0.8.15
-REVISION= 3
+DISTNAME= irssi-0.8.16-rc1
CATEGORIES= net
+MASTER_SITES= ${HOMEPAGE}files/
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.irssi.org/
@@ -15,9 +16,8 @@ MAINTAINER= Wiktor Izdebski <vicviq@gmai
# GPL
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}files/
-
-WANTLIB= c crypto m ncurses perl ssl util pcre glib-2.0 gmodule-2.0
+WANTLIB+= c crypto glib-2.0 gmodule-2.0 m ncurses pcre perl pthread ssl
+WANTLIB+= util
MODULES= devel/gettext
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/irssi/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 19 May 2010 15:04:28 -0000 1.18
+++ distinfo 17 Dec 2013 11:37:12 -0000
@@ -1,5 +1,2 @@
-MD5 (irssi-0.8.15.tar.gz) = hw244xn2QMK/RGww0MJO9g==
-RMD160 (irssi-0.8.15.tar.gz) = 3U7IDntAxNESGxid+4UZ4urevU4=
-SHA1 (irssi-0.8.15.tar.gz) = t83L0DmfrG4d0U1WBMQ1o9Lj6xg=
-SHA256 (irssi-0.8.15.tar.gz) = wVlXzYmMxx7q44m1pxBVaTuVeUZn5jfaMydVNmHkxt4=
-SIZE (irssi-0.8.15.tar.gz) = 1298691
+SHA256 (irssi-0.8.16-rc1.tar.bz2) =
ZNPty14A9jx5JsD1lAPVqx3MQUqFObhg4VLz+4fTFnQ=
+SIZE (irssi-0.8.16-rc1.tar.bz2) = 980941
Index: patches/patch-src_core_commands_c
===================================================================
RCS file: patches/patch-src_core_commands_c
diff -N patches/patch-src_core_commands_c
--- patches/patch-src_core_commands_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_core_commands_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/commands.c.orig Sun Nov 6 04:50:28 2011
-+++ src/core/commands.c Sun Nov 6 04:50:42 2011
-@@ -325,7 +325,7 @@ void command_runsub(const char *cmd, const char *data,
-
- subcmd = g_strconcat("command ", newcmd, NULL);
-
-- g_strdown(subcmd);
-+ ascii_strdown(subcmd);
- if (!signal_emit(subcmd, 3, args, server, item)) {
- defcmd = g_strdup_printf("default command %s", cmd);
- if (!signal_emit(defcmd, 3, data, server, item)) {
-@@ -891,7 +891,7 @@ static void parse_command(const char *command, int exp
- }
-
- cmd = g_strconcat("command ", newcmd, NULL);
-- g_strdown(cmd);
-+ ascii_strdown(cmd);
-
- oldcmd = current_command;
- current_command = cmd+8;
Index: patches/patch-src_core_misc_c
===================================================================
RCS file: patches/patch-src_core_misc_c
diff -N patches/patch-src_core_misc_c
--- patches/patch-src_core_misc_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-src_core_misc_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/misc.c.orig Sun Nov 6 04:51:36 2011
-+++ src/core/misc.c Sun Nov 6 04:51:50 2011
-@@ -756,17 +756,22 @@ int expand_escape(const char **data)
- /* control character (\cA = ^A) */
- (*data)++;
- return i_toupper(**data) - 64;
-- default:
-- if (!i_isdigit(**data))
-- return -1;
--
-+ case '0': case '1': case '2': case '3':
-+ case '4': case '5': case '6': case '7':
- /* octal */
-+ digit[1] = digit[2] = digit[3] = '\0';
- digit[0] = (*data)[0];
-- digit[1] = (*data)[1];
-- digit[2] = (*data)[2];
-- digit[3] = '\0';
-- *data += 2;
-+ if ((*data)[1] >= '0' && (*data)[1] <= '7') {
-+ ++*data;
-+ digit[1] = **data;
-+ if ((*data)[1] >= '0' && (*data)[1] <= '7') {
-+ ++*data;
-+ digit[2] = **data;
-+ }
-+ }
- return strtol(digit, NULL, 8);
-+ default:
-+ return -1;
- }
- }
-
-@@ -942,4 +947,22 @@ int parse_size(const char *size, int *bytes)
- }
-
- return TRUE;
-+}
-+
-+char *ascii_strup(char *str)
-+{
-+ char *s;
-+
-+ for (s = str; *s; s++)
-+ *s = g_ascii_toupper (*s);
-+ return str;
-+}
-+
-+char *ascii_strdown(char *str)
-+{
-+ char *s;
-+
-+ for (s = str; *s; s++)
-+ *s = g_ascii_tolower (*s);
-+ return str;
- }
Index: patches/patch-src_core_misc_h
===================================================================
RCS file: patches/patch-src_core_misc_h
diff -N patches/patch-src_core_misc_h
--- patches/patch-src_core_misc_h 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_core_misc_h,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/misc.h.orig Sun Nov 6 04:52:00 2011
-+++ src/core/misc.h Sun Nov 6 04:52:03 2011
-@@ -92,6 +92,9 @@ char *stristr(const char *data, const char *key);
- char *strstr_full(const char *data, const char *key);
- char *stristr_full(const char *data, const char *key);
-
-+char *ascii_strup(char *str);
-+char *ascii_strdown(char *str);
-+
- /* Escape all '"', "'" and '\' chars with '\' */
- char *escape_string(const char *str);
-
Index: patches/patch-src_core_net-nonblock_c
===================================================================
RCS file: patches/patch-src_core_net-nonblock_c
diff -N patches/patch-src_core_net-nonblock_c
--- patches/patch-src_core_net-nonblock_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-$OpenBSD: patch-src_core_net-nonblock_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/net-nonblock.c.orig Sun Nov 6 04:52:20 2011
-+++ src/core/net-nonblock.c Sun Nov 6 04:52:27 2011
-@@ -35,38 +35,37 @@ typedef struct {
- int tag;
- } SIMPLE_THREAD_REC;
-
--#define is_fatal_error(err) \
-- (err != 0 && err != G_IO_ERROR_AGAIN && errno != EINTR)
--
- static int g_io_channel_write_block(GIOChannel *channel, void *data, int len)
- {
- gsize ret;
-- int err, sent;
-+ int sent;
-+ GIOStatus status;
-
- sent = 0;
- do {
-- err = g_io_channel_write(channel, (char *) data + sent,
-- len-sent, &ret);
-+ status = g_io_channel_write_chars(channel, (char *) data + sent,
-+ len-sent, &ret, NULL);
- sent += ret;
-- } while (sent < len && !is_fatal_error(err));
-+ } while (sent < len && status != G_IO_STATUS_ERROR);
-
-- return err != 0 ? -1 : 0;
-+ return sent < len ? -1 : 0;
- }
-
- static int g_io_channel_read_block(GIOChannel *channel, void *data, int len)
- {
- time_t maxwait;
- gsize ret;
-- int err, received;
-+ int received;
-+ GIOStatus status;
-
- maxwait = time(NULL)+2;
- received = 0;
- do {
-- err = g_io_channel_read(channel, (char *) data + received,
-- len-received, &ret);
-+ status = g_io_channel_read_chars(channel, (char *) data +
received,
-+ len-received, &ret, NULL);
- received += ret;
- } while (received < len && time(NULL) < maxwait &&
-- (ret != 0 || !is_fatal_error(err)));
-+ status != G_IO_STATUS_ERROR && status != G_IO_STATUS_EOF);
-
- return received < len ? -1 : 0;
- }
-@@ -282,8 +281,8 @@ int net_connect_nonblock(const char *server, int port,
- }
- rec->func = func;
- rec->data = data;
-- rec->pipes[0] = g_io_channel_unix_new(fd[0]);
-- rec->pipes[1] = g_io_channel_unix_new(fd[1]);
-+ rec->pipes[0] = g_io_channel_new(fd[0]);
-+ rec->pipes[1] = g_io_channel_new(fd[1]);
-
- /* start nonblocking host name lookup */
- net_gethostbyname_nonblock(server, rec->pipes[1], 0);
Index: patches/patch-src_core_network-openssl_c
===================================================================
RCS file: /home/cvs/ports/net/irssi/patches/patch-src_core_network-openssl_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_core_network-openssl_c
--- patches/patch-src_core_network-openssl_c 16 Nov 2011 10:16:57 -0000
1.4
+++ patches/patch-src_core_network-openssl_c 17 Dec 2013 11:34:46 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_core_network-openssl_c,v 1.4 2011/11/16 10:16:57 sthen Exp
$
---- src/core/network-openssl.c.orig Sun Nov 6 04:52:49 2011
-+++ src/core/network-openssl.c Sun Nov 6 05:11:41 2011
-@@ -43,6 +43,8 @@ typedef struct
- const char *hostname;
+--- src/core/network-openssl.c.orig Tue Jun 25 17:50:42 2013
++++ src/core/network-openssl.c Tue Dec 17 06:34:33 2013
+@@ -50,6 +50,8 @@ typedef struct
+ int port;
} GIOSSLChannel;
+void irssi_redraw(void);
@@ -10,132 +10,7 @@ $OpenBSD: patch-src_core_network-openssl
static int ssl_inited = FALSE;
static void irssi_ssl_free(GIOChannel *handle)
-@@ -97,28 +99,28 @@ static char *tls_text_name(X509_NAME *name, int nid)
-
- if (name == 0 || (pos = X509_NAME_get_index_by_NID(name, nid, -1)) < 0)
{
- return NULL;
-- }
-+ }
-
-- entry = X509_NAME_get_entry(name, pos);
-- g_return_val_if_fail(entry != NULL, NULL);
-- entry_str = X509_NAME_ENTRY_get_data(entry);
-- g_return_val_if_fail(entry_str != NULL, NULL);
-+ entry = X509_NAME_get_entry(name, pos);
-+ g_return_val_if_fail(entry != NULL, NULL);
-+ entry_str = X509_NAME_ENTRY_get_data(entry);
-+ g_return_val_if_fail(entry_str != NULL, NULL);
-
-- /* Convert everything into UTF-8. It's up to OpenSSL to do something
-+ /* Convert everything into UTF-8. It's up to OpenSSL to do something
- reasonable when converting ASCII formats that contain non-ASCII
- content. */
-- if ((utf8_length = ASN1_STRING_to_UTF8(&utf8_value, entry_str)) < 0) {
-- g_warning("Error decoding ASN.1 type=%d", ASN1_STRING_type(entry_str));
-- return NULL;
-- }
-+ if ((utf8_length = ASN1_STRING_to_UTF8(&utf8_value, entry_str)) < 0) {
-+ g_warning("Error decoding ASN.1 type=%d",
ASN1_STRING_type(entry_str));
-+ return NULL;
-+ }
-
-- if (has_internal_nul((char *)utf8_value, utf8_length)) {
-- g_warning("NUL character in hostname in certificate");
-- OPENSSL_free(utf8_value);
-- return NULL;
-- }
-+ if (has_internal_nul((char *)utf8_value, utf8_length)) {
-+ g_warning("NUL character in hostname in certificate");
-+ OPENSSL_free(utf8_value);
-+ return NULL;
-+ }
-
-- result = g_strdup((char *) utf8_value);
-+ result = g_strdup((char *) utf8_value);
- OPENSSL_free(utf8_value);
- return result;
- }
-@@ -168,10 +170,10 @@ static gboolean irssi_ssl_verify_hostname(X509 *cert,
- if (cert_dns_name && *cert_dns_name) {
- matched = match_hostname(cert_dns_name,
hostname);
- }
-- }
-+ }
-
-- /* Free stack *and* member GENERAL_NAME objects */
-- sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-+ /* Free stack *and* member GENERAL_NAME objects */
-+ sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
- }
-
- if (has_dns_name) {
-@@ -182,15 +184,15 @@ static gboolean irssi_ssl_verify_hostname(X509 *cert,
- return matched;
- } else { /* No subjectAltNames, look at CommonName */
- cert_subject_cn = tls_text_name(X509_get_subject_name(cert),
NID_commonName);
-- if (cert_subject_cn && *cert_subject_cn) {
-- matched = match_hostname(cert_subject_cn, hostname);
-- if (! matched) {
-+ if (cert_subject_cn && *cert_subject_cn) {
-+ matched = match_hostname(cert_subject_cn, hostname);
-+ if (! matched) {
- g_warning("SSL certificate common name '%s'
doesn't match host name '%s'", cert_subject_cn, hostname);
-- }
-- } else {
-- g_warning("No subjectAltNames and no valid common name in
certificate");
-- }
-- free(cert_subject_cn);
-+ }
-+ } else {
-+ g_warning("No subjectAltNames and no valid common name
in certificate");
-+ }
-+ free(cert_subject_cn);
- }
-
- return matched;
-@@ -247,6 +249,7 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gc
- GIOSSLChannel *chan = (GIOSSLChannel *)handle;
- gint ret1, err;
- const char *errstr;
-+ gchar *errmsg;
-
- ret1 = SSL_read(chan->ssl, buf, len);
- if(ret1 <= 0)
-@@ -271,9 +274,10 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gc
- if (errstr == NULL)
- errstr = "unknown SSL error";
- }
-- g_warning("SSL read error: %s", errstr);
-+ errmsg = g_strdup_printf("SSL read error: %s", errstr);
- *gerr = g_error_new_literal(G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED,
-- errstr);
-+ errmsg);
-+ g_free(errmsg);
- return G_IO_STATUS_ERROR;
- }
- else
-@@ -290,6 +294,7 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, c
- GIOSSLChannel *chan = (GIOSSLChannel *)handle;
- gint ret1, err;
- const char *errstr;
-+ gchar *errmsg;
-
- ret1 = SSL_write(chan->ssl, (const char *)buf, len);
- if(ret1 <= 0)
-@@ -314,9 +319,10 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, c
- if (errstr == NULL)
- errstr = "unknown SSL error";
- }
-- g_warning("SSL write error: %s", errstr);
-+ errmsg = g_strdup_printf("SSL write error: %s", errstr);
- *gerr = g_error_new_literal(G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED,
-- errstr);
-+ errmsg);
-+ g_free(errmsg);
- return G_IO_STATUS_ERROR;
- }
- else
-@@ -374,6 +380,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
+@@ -418,6 +420,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
irssi_ssl_get_flags
};
@@ -153,14 +28,7 @@ $OpenBSD: patch-src_core_network-openssl
static gboolean irssi_ssl_init(void)
{
SSL_library_init();
-@@ -406,12 +423,15 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
- g_error("Could not allocate memory for SSL context");
- return NULL;
- }
-+ SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
-
- if (mycert && *mycert) {
- char *scert = NULL, *spkey = NULL;
+@@ -463,6 +476,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
scert = convert_home(mycert);
if (mypkey && *mypkey)
spkey = convert_home(mypkey);
Index: patches/patch-src_core_network_c
===================================================================
RCS file: patches/patch-src_core_network_c
diff -N patches/patch-src_core_network_c
--- patches/patch-src_core_network_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-$OpenBSD: patch-src_core_network_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/network.c.orig Sun Nov 6 04:53:30 2011
-+++ src/core/network.c Sun Nov 6 04:53:34 2011
-@@ -42,11 +42,18 @@ union sockaddr_union {
- # define SIZEOF_SOCKADDR(so) (sizeof(so.sin))
- #endif
-
-+GIOChannel *g_io_channel_new(int handle)
-+{
-+ GIOChannel *chan;
- #ifdef WIN32
--# define g_io_channel_new(handle)
g_io_channel_win32_new_stream_socket(handle)
-+ chan = g_io_channel_win32_new_socket(handle);
- #else
--# define g_io_channel_new(handle) g_io_channel_unix_new(handle)
-+ chan = g_io_channel_unix_new(handle);
- #endif
-+ g_io_channel_set_encoding(chan, NULL, NULL);
-+ g_io_channel_set_buffered(chan, FALSE);
-+ return chan;
-+}
-
- /* Cygwin need this, don't know others.. */
- /*#define BLOCKING_SOCKETS 1*/
-@@ -341,36 +348,42 @@ GIOChannel *net_accept(GIOChannel *handle, IPADDR *add
- int net_receive(GIOChannel *handle, char *buf, int len)
- {
- gsize ret;
-- int err;
-+ GIOStatus status;
-+ GError *err = NULL;
-
- g_return_val_if_fail(handle != NULL, -1);
- g_return_val_if_fail(buf != NULL, -1);
-
-- err = g_io_channel_read(handle, buf, len, &ret);
-- if (err == 0 && ret == 0)
-+ status = g_io_channel_read_chars(handle, buf, len, &ret, &err);
-+ if (err != NULL) {
-+ g_warning(err->message);
-+ g_error_free(err);
-+ }
-+ if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF)
- return -1; /* disconnected */
-
-- if (err == G_IO_ERROR_AGAIN || (err != 0 && errno == EINTR))
-- return 0; /* no bytes received */
--
-- return err == 0 ? (int)ret : -1;
-+ return ret;
- }
-
- /* Transmit data, return number of bytes sent, -1 = error */
- int net_transmit(GIOChannel *handle, const char *data, int len)
- {
- gsize ret;
-- int err;
-+ GIOStatus status;
-+ GError *err = NULL;
-
- g_return_val_if_fail(handle != NULL, -1);
- g_return_val_if_fail(data != NULL, -1);
-
-- err = g_io_channel_write(handle, (char *) data, len, &ret);
-- if (err == G_IO_ERROR_AGAIN ||
-- (err != 0 && (errno == EINTR || errno == EPIPE)))
-- return 0;
-+ status = g_io_channel_write_chars(handle, (char *) data, len, &ret,
&err);
-+ if (err != NULL) {
-+ g_warning(err->message);
-+ g_error_free(err);
-+ }
-+ if (status == G_IO_STATUS_ERROR)
-+ return -1;
-
-- return err == 0 ? (int)ret : -1;
-+ return ret;
- }
-
- /* Get socket address/port */
Index: patches/patch-src_core_network_h
===================================================================
RCS file: patches/patch-src_core_network_h
diff -N patches/patch-src_core_network_h
--- patches/patch-src_core_network_h 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_core_network_h,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/network.h.orig Sun Nov 6 04:53:54 2011
-+++ src/core/network.h Sun Nov 6 04:53:57 2011
-@@ -41,6 +41,8 @@ struct _IPADDR {
-
- extern IPADDR ip4_any;
-
-+GIOChannel *g_io_channel_new(int handle);
-+
- /* returns 1 if IPADDRs are the same */
- int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
-
Index: patches/patch-src_core_servers_c
===================================================================
RCS file: patches/patch-src_core_servers_c
diff -N patches/patch-src_core_servers_c
--- patches/patch-src_core_servers_c 16 Nov 2011 10:16:57 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_core_servers_c,v 1.4 2011/11/16 10:16:57 sthen Exp $
---- src/core/servers.c.orig Sun Nov 6 04:54:16 2011
-+++ src/core/servers.c Sun Nov 6 04:54:22 2011
-@@ -419,8 +419,8 @@ int server_start_connect(SERVER_REC *server)
- return FALSE;
- }
-
-- server->connect_pipe[0] = g_io_channel_unix_new(fd[0]);
-- server->connect_pipe[1] = g_io_channel_unix_new(fd[1]);
-+ server->connect_pipe[0] = g_io_channel_new(fd[0]);
-+ server->connect_pipe[1] = g_io_channel_new(fd[1]);
-
- connect_address = server->connrec->proxy != NULL ?
- server->connrec->proxy : server->connrec->address;
Index: patches/patch-src_core_session_c
===================================================================
RCS file: patches/patch-src_core_session_c
diff -N patches/patch-src_core_session_c
--- patches/patch-src_core_session_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_core_session_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/core/session.c.orig Sun Nov 6 04:54:35 2011
-+++ src/core/session.c Sun Nov 6 04:54:40 2011
-@@ -22,6 +22,7 @@
- #include "signals.h"
- #include "commands.h"
- #include "args.h"
-+#include "network.h"
- #include "net-sendbuffer.h"
- #include "pidwait.h"
- #include "lib-config/iconfig.h"
-@@ -259,7 +260,7 @@ static void session_restore_server(CONFIG_NODE *node)
- chatnet, password, nick);
- if (conn != NULL) {
- conn->reconnection = TRUE;
-- conn->connect_handle = g_io_channel_unix_new(handle);
-+ conn->connect_handle = g_io_channel_new(handle);
-
- server = proto->server_init_connect(conn);
- server->version = g_strdup(config_node_get_str(node, "version",
NULL));
Index: patches/patch-src_fe-common_core_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/irssi/patches/patch-src_fe-common_core_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_fe-common_core_Makefile_in
--- patches/patch-src_fe-common_core_Makefile_in 19 May 2010 15:04:28
-0000 1.5
+++ patches/patch-src_fe-common_core_Makefile_in 17 Dec 2013 11:33:09
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.5 2010/05/19 15:04:28 sthen
Exp $
---- src/fe-common/core/Makefile.in.orig Sat Apr 3 18:21:28 2010
-+++ src/fe-common/core/Makefile.in Sun Apr 4 16:31:38 2010
-@@ -258,7 +258,7 @@ INCLUDES = \
+--- src/fe-common/core/Makefile.in.orig Sun Sep 15 14:59:49 2013
++++ src/fe-common/core/Makefile.in Tue Dec 17 06:31:04 2013
+@@ -365,7 +365,7 @@ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
Index: patches/patch-src_fe-common_core_chat-completion_c
===================================================================
RCS file: patches/patch-src_fe-common_core_chat-completion_c
diff -N patches/patch-src_fe-common_core_chat-completion_c
--- patches/patch-src_fe-common_core_chat-completion_c 16 Nov 2011 10:16:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_chat-completion_c,v 1.1 2011/11/16 10:16:57
sthen Exp $
---- src/fe-common/core/chat-completion.c.orig Sun Nov 6 04:55:54 2011
-+++ src/fe-common/core/chat-completion.c Sun Nov 6 04:56:11 2011
-@@ -355,7 +355,7 @@ static void complete_from_nicklist(GList **outlist, CH
- if (g_strncasecmp(rec->nick, nick, len) == 0 &&
- glist_find_icase_string(*outlist, rec->nick) == NULL) {
- str = g_strconcat(rec->nick, suffix, NULL);
-- if (completion_lowercase) g_strdown(str);
-+ if (completion_lowercase) ascii_strdown(str);
- if (rec->own)
- ownlist = g_list_append(ownlist, str);
- else
-@@ -407,7 +407,7 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *
- if (g_strncasecmp(str, nick, len) == 0) {
- tnick = g_strconcat(rec->nick, suffix, NULL);
- if (completion_lowercase)
-- g_strdown(tnick);
-+ ascii_strdown(tnick);
-
- if (glist_find_icase_string(list, tnick) == NULL)
- list = g_list_append(list, tnick);
-@@ -451,7 +451,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *ch
- rec != channel->ownnick) {
- str = g_strconcat(rec->nick, suffix, NULL);
- if (completion_lowercase)
-- g_strdown(str);
-+ ascii_strdown(str);
- if (glist_find_icase_string(list, str) == NULL)
- list = g_list_append(list, str);
- else
Index: patches/patch-src_fe-common_core_completion_c
===================================================================
RCS file: patches/patch-src_fe-common_core_completion_c
diff -N patches/patch-src_fe-common_core_completion_c
--- patches/patch-src_fe-common_core_completion_c 16 Nov 2011 10:16:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_completion_c,v 1.1 2011/11/16 10:16:57
sthen Exp $
---- src/fe-common/core/completion.c.orig Sun Nov 6 04:56:28 2011
-+++ src/fe-common/core/completion.c Sun Nov 6 04:56:34 2011
-@@ -533,7 +533,7 @@ static char *line_get_command(const char *line, char *
- } while (ptr != NULL);
-
- if (cmd != NULL)
-- g_strdown(cmd);
-+ ascii_strdown(cmd);
- return cmd;
- }
-
Index: patches/patch-src_fe-common_core_fe-exec_c
===================================================================
RCS file: patches/patch-src_fe-common_core_fe-exec_c
diff -N patches/patch-src_fe-common_core_fe-exec_c
--- patches/patch-src_fe-common_core_fe-exec_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_fe-exec_c,v 1.1 2011/11/16 10:16:57 sthen
Exp $
---- src/fe-common/core/fe-exec.c.orig Sun Nov 6 04:58:05 2011
-+++ src/fe-common/core/fe-exec.c Sun Nov 6 04:58:12 2011
-@@ -197,11 +197,16 @@ static void process_destroy(PROCESS_REC *rec, int stat
- static void processes_killall(int signum)
- {
- GSList *tmp;
-+ int kill_ret;
-
- for (tmp = processes; tmp != NULL; tmp = tmp->next) {
- PROCESS_REC *rec = tmp->data;
-
-- kill(rec->pid, signum);
-+ kill_ret = kill(-rec->pid, signum);
-+ if (kill_ret != 0)
-+ printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-+ "Error sending signal %d to pid %d: %s",
-+ signum, rec->pid, g_strerror(errno));
- }
- }
-
-@@ -304,9 +309,9 @@ static void process_exec(PROCESS_REC *rec, const char
-
- if (rec->pid != 0) {
- /* parent process */
-- GIOChannel *outio = g_io_channel_unix_new(in[1]);
-+ GIOChannel *outio = g_io_channel_new(in[1]);
-
-- rec->in = g_io_channel_unix_new(out[0]);
-+ rec->in = g_io_channel_new(out[0]);
- rec->out = net_sendbuffer_create(outio, 0);
-
- close(out[1]);
-@@ -378,7 +383,7 @@ static void handle_exec(const char *args, GHashTable *
- PROCESS_REC *rec;
- SERVER_REC *target_server;
- char *target, *level;
-- int notice, signum, interactive, target_nick, target_channel;
-+ int notice, signum, interactive, target_nick, target_channel, kill_ret;
-
- /* check that there's no unknown options. we allowed them
- because signals can be used as options, but there should be
-@@ -445,8 +450,12 @@ static void handle_exec(const char *args, GHashTable *
- }
-
- if (signum != -1) {
-- /* send a signal to process */
-- kill(rec->pid, signum);
-+ /* send a signal to process group */
-+ kill_ret = kill(-rec->pid, signum);
-+ if (kill_ret != 0)
-+ printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-+ "Error sending signal %d to pid %d: %s",
-+ signum, rec->pid, g_strerror(errno));
- return;
- }
-
-@@ -529,8 +538,8 @@ static void handle_exec(const char *args, GHashTable *
- /* SYNTAX: EXEC [-] [-nosh] [-out | -msg <target> | -notice <target>]
- [-name <name>] <cmd line>
- EXEC -out | -window | -msg <target> | -notice <target> |
-- -close | -<signal> <id>
-- EXEC -in <id> <text to send to process> */
-+ -close | -<signal> %<id>
-+ EXEC -in %<id> <text to send to process> */
- static void cmd_exec(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
- {
- GHashTable *optlist;
Index: patches/patch-src_fe-common_core_fe-log_c
===================================================================
RCS file: patches/patch-src_fe-common_core_fe-log_c
diff -N patches/patch-src_fe-common_core_fe-log_c
--- patches/patch-src_fe-common_core_fe-log_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_fe-log_c,v 1.1 2011/11/16 10:16:57 sthen
Exp $
---- src/fe-common/core/fe-log.c.orig Sun Nov 6 04:58:47 2011
-+++ src/fe-common/core/fe-log.c Sun Nov 6 04:58:51 2011
-@@ -435,7 +435,7 @@ static void autolog_open(SERVER_REC *server, const cha
- '%' -> '%%' - so strftime() won't mess with them */
- fixed_target = escape_target(target);
- if (CHAT_PROTOCOL(server)->case_insensitive)
-- g_strdown(fixed_target);
-+ ascii_strdown(fixed_target);
-
- /* $0 = target, $1 = server tag */
- params = g_strconcat(fixed_target, " ", server_tag, NULL);
Index: patches/patch-src_fe-common_core_windows-layout_c
===================================================================
RCS file: patches/patch-src_fe-common_core_windows-layout_c
diff -N patches/patch-src_fe-common_core_windows-layout_c
--- patches/patch-src_fe-common_core_windows-layout_c 1 Dec 2011 17:51:10
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_windows-layout_c,v 1.1 2011/12/01 17:51:10
sthen Exp $
---- src/fe-common/core/windows-layout.c.orig Wed Nov 16 17:10:37 2011
-+++ src/fe-common/core/windows-layout.c Wed Nov 16 17:10:50 2011
-@@ -152,6 +152,7 @@ static void sig_layout_save_item(WINDOW_REC *window, W
- CONFIG_NODE *subnode;
- CHAT_PROTOCOL_REC *proto;
- const char *type;
-+ WINDOW_BIND_REC *rec;
-
- type = module_find_id_str("WINDOW ITEM TYPE", item->type);
- if (type == NULL)
-@@ -168,8 +169,11 @@ static void sig_layout_save_item(WINDOW_REC *window, W
-
- if (item->server != NULL) {
- iconfig_node_set_str(subnode, "tag", item->server->tag);
-- if (IS_CHANNEL(item))
-- window_bind_add(window, item->server->tag,
item->visible_name);
-+ if (IS_CHANNEL(item)) {
-+ rec = window_bind_add(window, item->server->tag,
item->visible_name);
-+ if (rec != NULL)
-+ rec->sticky = TRUE;
-+ }
- } else if (IS_QUERY(item)) {
- iconfig_node_set_str(subnode, "tag", QUERY(item)->server_tag);
- }
Index: patches/patch-src_fe-common_irc_dcc_fe-dcc-chat_c
===================================================================
RCS file: patches/patch-src_fe-common_irc_dcc_fe-dcc-chat_c
diff -N patches/patch-src_fe-common_irc_dcc_fe-dcc-chat_c
--- patches/patch-src_fe-common_irc_dcc_fe-dcc-chat_c 16 Nov 2011 10:16:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_fe-common_irc_dcc_fe-dcc-chat_c,v 1.1 2011/11/16 10:16:57
sthen Exp $
---- src/fe-common/irc/dcc/fe-dcc-chat.c.orig Sun Nov 6 05:01:00 2011
-+++ src/fe-common/irc/dcc/fe-dcc-chat.c Sun Nov 6 05:01:15 2011
-@@ -23,6 +23,7 @@
- #include "commands.h"
- #include "levels.h"
- #include "settings.h"
-+#include "misc.h"
-
- #include "irc.h"
- #include "irc-servers.h"
-@@ -330,7 +331,7 @@ static void cmd_ctcp(const char *data, SERVER_REC *ser
- printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
- IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
- } else {
-- g_strup(ctcpcmd);
-+ ascii_strup(ctcpcmd);
- signal_emit("message dcc own_ctcp", 3, dcc, ctcpcmd, ctcpdata);
- }
-
Index: patches/patch-src_fe-common_irc_fe-irc-commands_c
===================================================================
RCS file: patches/patch-src_fe-common_irc_fe-irc-commands_c
diff -N patches/patch-src_fe-common_irc_fe-irc-commands_c
--- patches/patch-src_fe-common_irc_fe-irc-commands_c 16 Nov 2011 10:16:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_fe-common_irc_fe-irc-commands_c,v 1.1 2011/11/16 10:16:57
sthen Exp $
---- src/fe-common/irc/fe-irc-commands.c.orig Sun Nov 6 05:01:38 2011
-+++ src/fe-common/irc/fe-irc-commands.c Sun Nov 6 05:01:50 2011
-@@ -131,7 +131,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC
- return;
- }
-
-- g_strup(ctcpcmd);
-+ ascii_strup(ctcpcmd);
- signal_emit("message irc own_ctcp", 4,
- server, ctcpcmd, ctcpdata, target);
-
Index: patches/patch-src_fe-text_statusbar-config_c
===================================================================
RCS file: patches/patch-src_fe-text_statusbar-config_c
diff -N patches/patch-src_fe-text_statusbar-config_c
--- patches/patch-src_fe-text_statusbar-config_c 16 Nov 2011 10:16:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_fe-text_statusbar-config_c,v 1.1 2011/11/16 10:16:57 sthen
Exp $
---- src/fe-text/statusbar-config.c.orig Sun Nov 6 05:02:18 2011
-+++ src/fe-text/statusbar-config.c Sun Nov 6 05:02:34 2011
-@@ -25,6 +25,7 @@
- #include "settings.h"
- #include "levels.h"
- #include "lib-config/iconfig.h"
-+#include "misc.h"
-
- #include "statusbar.h"
- #include "printtext.h"
-@@ -550,7 +551,7 @@ static void cmd_statusbar(const char *data)
-
- /* call the subcommand */
- signal = g_strconcat("command statusbar ", cmd, NULL);
-- g_strdown(signal);
-+ ascii_strdown(signal);
- if (!signal_emit(signal, 4, params, NULL, NULL, node)) {
- printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
- TXT_STATUSBAR_UNKNOWN_COMMAND, cmd);
Index: patches/patch-src_irc_core_ctcp_c
===================================================================
RCS file: patches/patch-src_irc_core_ctcp_c
diff -N patches/patch-src_irc_core_ctcp_c
--- patches/patch-src_irc_core_ctcp_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_irc_core_ctcp_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/irc/core/ctcp.c.orig Sun Nov 6 05:03:20 2011
-+++ src/irc/core/ctcp.c Sun Nov 6 05:03:36 2011
-@@ -238,7 +238,7 @@ static void ctcp_msg(IRC_SERVER_REC *server, const cha
- args = strchr(str+9, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
-
-- g_strdown(str+9);
-+ ascii_strdown(str+9);
- if (!signal_emit(str, 5, server, args, nick, addr, target)) {
- signal_emit("default ctcp msg", 5,
- server, data, nick, addr, target);
-@@ -258,7 +258,7 @@ static void ctcp_reply(IRC_SERVER_REC *server, const c
- args = strchr(str+11, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
-
-- g_strdown(str+11);
-+ ascii_strdown(str+11);
- if (!signal_emit(str, 5, server, args, nick, addr, target)) {
- signal_emit("default ctcp reply", 5,
- server, data, nick, addr, target);
Index: patches/patch-src_irc_core_irc-commands_c
===================================================================
RCS file: patches/patch-src_irc_core_irc-commands_c
diff -N patches/patch-src_irc_core_irc-commands_c
--- patches/patch-src_irc_core_irc-commands_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_irc_core_irc-commands_c,v 1.1 2011/11/16 10:16:57 sthen
Exp $
---- src/irc/core/irc-commands.c.orig Sun Nov 6 05:04:02 2011
-+++ src/irc/core/irc-commands.c Sun Nov 6 05:04:09 2011
-@@ -104,7 +104,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC
- if (*target == '\0' || *ctcpcmd == '\0')
- cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-
-- g_strup(ctcpcmd);
-+ ascii_strup(ctcpcmd);
- if (*ctcpdata == '\0')
- g_string_printf(tmpstr, "PRIVMSG %s :\001%s\001", target,
ctcpcmd);
- else {
-@@ -138,7 +138,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC
- if (*target == '\0' || *ctcpcmd == '\0')
- cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-
-- g_strup(ctcpcmd);
-+ ascii_strup(ctcpcmd);
- recoded = recode_out(SERVER(server), ctcpdata, target);
- g_string_printf(tmpstr, "NOTICE %s :\001%s %s\001", target, ctcpcmd,
recoded);
- g_free(recoded);
Index: patches/patch-src_irc_core_irc-expandos_c
===================================================================
RCS file: patches/patch-src_irc_core_irc-expandos_c
diff -N patches/patch-src_irc_core_irc-expandos_c
--- patches/patch-src_irc_core_irc-expandos_c 1 Dec 2011 17:51:10 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_irc_core_irc-expandos_c,v 1.1 2011/12/01 17:51:10 sthen
Exp $
---- src/irc/core/irc-expandos.c.orig Wed Nov 16 17:11:24 2011
-+++ src/irc/core/irc-expandos.c Wed Nov 16 17:11:37 2011
-@@ -87,11 +87,13 @@ static char *expando_cumode(SERVER_REC *server, void *
- {
- if (IS_IRC_CHANNEL(item) && CHANNEL(item)->ownnick) {
- char prefix = NICK(CHANNEL(item)->ownnick)->prefixes[0];
-- char *cumode = g_malloc(2);
-- cumode[0] = prefix;
-- cumode[1] = '\0';
-- *free_ret = TRUE;
-- return cumode; /* will be "\0\0" = "" if there is no prefix */
-+ if (prefix != '\0') {
-+ char *cumode = g_malloc(2);
-+ cumode[0] = prefix;
-+ cumode[1] = '\0';
-+ *free_ret = TRUE;
-+ return cumode;
-+ }
- }
- return "";
- }
Index: patches/patch-src_irc_core_irc_c
===================================================================
RCS file: patches/patch-src_irc_core_irc_c
diff -N patches/patch-src_irc_core_irc_c
--- patches/patch-src_irc_core_irc_c 16 Nov 2011 10:16:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_irc_core_irc_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/irc/core/irc.c.orig Sun Nov 6 05:06:32 2011
-+++ src/irc/core/irc.c Sun Nov 6 05:06:36 2011
-@@ -290,7 +290,7 @@ static void irc_server_event(IRC_SERVER_REC *server, c
- args = strchr(event+6, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
- while (*args == ' ') args++;
-- g_strdown(event);
-+ ascii_strdown(event);
-
- /* check if event needs to be redirected */
- signal = server_redirect_get_signal(server, nick, event, args);
Index: patches/patch-src_irc_dcc_dcc-chat_c
===================================================================
RCS file: patches/patch-src_irc_dcc_dcc-chat_c
diff -N patches/patch-src_irc_dcc_dcc-chat_c
--- patches/patch-src_irc_dcc_dcc-chat_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_irc_dcc_dcc-chat_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/irc/dcc/dcc-chat.c.orig Sun Nov 6 05:07:13 2011
-+++ src/irc/dcc/dcc-chat.c Sun Nov 6 05:07:20 2011
-@@ -281,7 +281,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC
-
- dcc = dcc_chat_find_id(target+1);
- if (dcc != NULL) {
-- g_strup(ctcpcmd);
-+ ascii_strup(ctcpcmd);
-
- str = g_strconcat(ctcpcmd, " ", ctcpdata, NULL);
- dcc_ctcp_message(server, dcc->nick, dcc, FALSE, str);
-@@ -719,7 +719,7 @@ static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char
-
- cmd = g_ascii_strup(cmd, -1);
-
-- g_strdown(event+9);
-+ ascii_strdown(event+9);
- if (!signal_emit(event, 2, dcc, ptr)) {
- signal_emit(reply ? "default dcc reply" :
- "default dcc ctcp", 3, dcc, cmd, ptr);
Index: patches/patch-src_irc_dcc_dcc_c
===================================================================
RCS file: patches/patch-src_irc_dcc_dcc_c
diff -N patches/patch-src_irc_dcc_dcc_c
--- patches/patch-src_irc_dcc_dcc_c 16 Nov 2011 10:16:57 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_irc_dcc_dcc_c,v 1.3 2011/11/16 10:16:57 sthen Exp $
---- src/irc/dcc/dcc.c.orig Sun Nov 6 05:07:38 2011
-+++ src/irc/dcc/dcc.c Sun Nov 6 05:07:42 2011
-@@ -367,7 +367,7 @@ static void ctcp_msg_dcc(IRC_SERVER_REC *server, const
- args = strchr(str+13, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
-
-- g_strdown(str+13);
-+ ascii_strdown(str+13);
- if (!signal_emit(str, 6, server, args, nick, addr, target, chat)) {
- signal_emit("default ctcp msg dcc", 6,
- server, data, nick, addr, target, chat);
-@@ -389,7 +389,7 @@ static void ctcp_reply_dcc(IRC_SERVER_REC *server, con
- args = strchr(str+15, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
-
-- g_strdown(str+15);
-+ ascii_strdown(str+15);
- if (!signal_emit(str, 5, server, args, nick, addr, target)) {
- signal_emit("default ctcp reply dcc", 5,
- server, data, nick, addr, target);
-@@ -502,7 +502,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *
-
- if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-
-- g_strup(typestr);
-+ ascii_strup(typestr);
- type = dcc_str2type(typestr);
- if (type == -1) {
- signal_emit("dcc error unknown type", 1, typestr);
Index: patches/patch-src_irc_proxy_listen_c
===================================================================
RCS file: patches/patch-src_irc_proxy_listen_c
diff -N patches/patch-src_irc_proxy_listen_c
--- patches/patch-src_irc_proxy_listen_c 16 Nov 2011 10:16:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_irc_proxy_listen_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
---- src/irc/proxy/listen.c.orig Sat Apr 3 12:19:43 2010
-+++ src/irc/proxy/listen.c Sun Nov 6 05:19:47 2011
-@@ -24,6 +24,7 @@
- #include "servers-redirect.h"
- #include "levels.h"
- #include "settings.h"
-+#include "misc.h"
-
- #include "irc.h"
- #include "irc-channels.h"
-@@ -317,7 +318,7 @@ static void sig_listen_client(CLIENT_REC *client)
- args = strchr(cmd, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
- if (*args == ':') args++;
-- g_strup(cmd);
-+ ascii_strup(cmd);
-
- handle_client_cmd(client, cmd, args, str);
-
-@@ -391,7 +392,7 @@ static void sig_server_event(IRC_SERVER_REC *server, c
- args = strchr(event+6, ' ');
- if (args != NULL) *args++ = '\0'; else args = "";
- while (*args == ' ') args++;
-- g_strdown(event);
-+ ascii_strdown(event);
-
- signal = server_redirect_peek_signal(server, nick, event, args,
&redirected);
- if ((signal != NULL && strncmp(signal, "proxy ", 6) != 0) ||
Index: patches/patch-src_perl_Makefile_in
===================================================================
RCS file: /home/cvs/ports/net/irssi/patches/patch-src_perl_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_perl_Makefile_in
--- patches/patch-src_perl_Makefile_in 19 May 2010 15:04:28 -0000 1.5
+++ patches/patch-src_perl_Makefile_in 17 Dec 2013 11:33:09 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_perl_Makefile_in,v 1.5 2010/05/19 15:04:28 sthen Exp $
---- src/perl/Makefile.in.orig Sat Apr 3 18:21:29 2010
-+++ src/perl/Makefile.in Sun Apr 4 16:31:38 2010
-@@ -275,7 +275,7 @@ INCLUDES = \
+--- src/perl/Makefile.in.orig Sun Sep 15 14:59:49 2013
++++ src/perl/Makefile.in Tue Dec 17 06:31:04 2013
+@@ -378,7 +378,7 @@ INCLUDES = \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \
$(GLIB_CFLAGS) \
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
