cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to irssi-0.8.13: http://www.irssi.org/news/ChangeLog

Browse Source 
from Colin Didier, tweaks by maintainer Wiktor Izdebski and myself
tested by Simon Kuhnle, sthen@ and myself.  ok sthen@
This commit is contained in:
martynas 2009-05-23 17:47:00 +00:00
parent d6abeb2c66
commit efe386fc95
11 changed files with 33 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/irssi/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.38 2008/12/22 19:40:33 matthieu Exp $
# $OpenBSD: Makefile,v 1.39 2009/05/23 17:47:00 martynas Exp $
SHARED_ONLY= Yes
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
DISTNAME= irssi-0.8.12
PKGNAME= ${DISTNAME}p3
DISTNAME= irssi-0.8.13
CATEGORIES= net
HOMEPAGE= http://www.irssi.org/
@ -34,8 +33,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}
CONFIGURE_ARGS+=--enable-ipv6 \
--with-pic \
--with-proxy \
--without-included-gettext \
--enable-perl=yes \
--with-perl=yes \
--with-perl-lib=${PREFIX}/libdata/perl5/site_perl
FLAVORS= socks

10
net/irssi/distinfo
View File

@ -1,5 +1,5 @@
MD5 (irssi-0.8.12.tar.gz) = 3fcXpDDhwTonL1KMT1KUMA==
RMD160 (irssi-0.8.12.tar.gz) = fpdqLRCgpst4WGQBKWiTwlFCdqc=
SHA1 (irssi-0.8.12.tar.gz) = QOjU/OUs+0hwZdkMKHGU6UB4Hdc=
SHA256 (irssi-0.8.12.tar.gz) = Jsy+1WFcR+BdIBRi55lG9G1OiGMo8wQMD0E7Ng6oOl4=
SIZE (irssi-0.8.12.tar.gz) = 1335967
MD5 (irssi-0.8.13.tar.gz) = Im8ZRXaJX/MHXBZFI4BtBg==
RMD160 (irssi-0.8.13.tar.gz) = jVZRDPXUAocS2JjGLHnwcuE3264=
SHA1 (irssi-0.8.13.tar.gz) = E2xAfc6Hr0vGrfZXPrzIW+nxahs=
SHA256 (irssi-0.8.13.tar.gz) = l+/MFK1t+buADS7mi5Bc3fRDXNsU5/sR+bnxN46lecc=
SIZE (irssi-0.8.13.tar.gz) = 1351528

18
net/irssi/patches/patch-src_core_network-openssl_c
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_core_network-openssl_c,v 1.1 2008/12/22 19:40:33 matthieu Exp $
--- src/core/network-openssl.c.orig Sat Oct 6 11:38:20 2007
+++ src/core/network-openssl.c Wed Dec 3 23:21:23 2008
@@ -40,6 +40,8 @@ typedef struct
SSL_CTX *ctx;
$OpenBSD: patch-src_core_network-openssl_c,v 1.2 2009/05/23 17:47:01 martynas Exp $
--- src/core/network-openssl.c.orig Tue Mar 31 22:50:02 2009
+++ src/core/network-openssl.c Sun Apr 5 01:25:29 2009
@@ -41,6 +41,8 @@ typedef struct
unsigned int verify:1;
} GIOSSLChannel;
+
+void irssi_redraw(void);
+
static SSL_CTX *ssl_ctx = NULL;
@@ -201,6 +203,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
static void irssi_ssl_free(GIOChannel *handle)
@@ -225,6 +227,17 @@ static GIOFuncs irssi_ssl_channel_funcs = {
irssi_ssl_get_flags
};
@ -28,7 +28,7 @@ $OpenBSD: patch-src_core_network-openssl_c,v 1.1 2008/12/22 19:40:33 matthieu Ex
static gboolean irssi_ssl_init(void)
{
SSL_library_init();
@@ -242,6 +255,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
@@ -266,6 +279,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel
scert = convert_home(mycert);
if (mypkey && *mypkey)
spkey = convert_home(mypkey);

8
net/irssi/patches/patch-src_core_settings_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_settings_c,v 1.3 2008/12/22 19:40:33 matthieu Exp $
--- src/core/settings.c.orig Sat Oct 6 11:38:20 2007
+++ src/core/settings.c Wed Dec 3 21:35:57 2008
@@ -638,7 +638,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
$OpenBSD: patch-src_core_settings_c,v 1.4 2009/05/23 17:47:01 martynas Exp $
--- src/core/settings.c.orig Tue Mar 31 22:50:02 2009
+++ src/core/settings.c Sun Apr 5 01:22:16 2009
@@ -647,7 +647,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
else {
/* user configuration file not found, use the default one
from sysconfdir */

10
net/irssi/patches/patch-src_fe-common_core_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.3 2008/12/22 19:40:33 matthieu Exp $
--- src/fe-common/core/Makefile.in.orig Sat Oct 6 11:41:21 2007
+++ src/fe-common/core/Makefile.in Wed Dec 3 21:35:57 2008
@@ -252,7 +252,7 @@ INCLUDES = \
$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
--- src/fe-common/core/Makefile.in.orig Tue Mar 31 23:02:13 2009
+++ src/fe-common/core/Makefile.in Sun Apr 5 01:22:16 2009
@@ -235,7 +235,7 @@ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \
@ -9,4 +9,4 @@ $OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.3 2008/12/22 19:40:33 matthie
+ -DTHEMESDIR=\""$(sysconfdir)/irssi/themes"\"
libfe_common_core_a_SOURCES = \
autorun.c \
chat-completion.c \

13
net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_fe-common_core_fe-common-core_c,v 1.3 2008/12/22 19:40:33 matthieu Exp $
--- src/fe-common/core/fe-common-core.c.orig Sat Oct 6 11:38:19 2007
+++ src/fe-common/core/fe-common-core.c Wed Dec 3 21:35:58 2008
@@ -164,7 +164,8 @@ void fe_common_core_init(void)
settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
settings_add_str("lookandfeel", "term_charset",
- *nl_langinfo(CODESET) != '\0' ?
+ ((*nl_langinfo(CODESET) != '\0') &&
+ (strcmp(nl_langinfo(CODESET), "646") != 0)) ? /* ASCII */
nl_langinfo(CODESET) : "ISO8859-1");
#else
settings_add_str("lookandfeel", "term_charset", "ISO8859-1");

14
net/irssi/patches/patch-src_fe-common_core_fe-recode_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_fe-common_core_fe-recode_c,v 1.2 2008/12/22 19:40:33 matthieu Exp $
--- src/fe-common/core/fe-recode.c.orig Sat Oct 6 11:38:19 2007
+++ src/fe-common/core/fe-recode.c Wed Dec 3 21:35:58 2008
@@ -181,8 +181,8 @@ static void read_settings(void)
g_free(term_charset);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) :
- *nl_langinfo(CODESET) != '\0' ? g_strdup(nl_langinfo(CODESET)) :
- "ISO8859-1";
+ ((*nl_langinfo(CODESET) != '\0') && (strcmp(nl_langinfo(CODESET), "646") != 0)) ?
+ g_strdup(nl_langinfo(CODESET)) : "ISO8859-1";
#else
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : "ISO8859-1";
#endif

12
net/irssi/patches/patch-src_fe-common_irc_fe-irc-messages_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_fe-common_irc_fe-irc-messages_c,v 1.1 2007/10/20 14:12:26 sthen Exp $
--- src/fe-common/irc/fe-irc-messages.c.orig Sat Oct 20 14:45:59 2007
+++ src/fe-common/irc/fe-irc-messages.c Sat Oct 20 14:46:21 2007
@@ -44,7 +44,7 @@ static const char *skip_target(IRC_SERVER_REC *server,
const char *val, *chars;
/* Quick check */
- if (server->prefix[(int)(unsigned char)*target] == 0)
+ if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
return target;
/* Hack: for bahamut 1.4 which sends neither STATUSMSG nor

12
net/irssi/patches/patch-src_irc_proxy_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_irc_proxy_Makefile_in,v 1.4 2008/12/22 19:40:33 matthieu Exp $
--- src/irc/proxy/Makefile.in.orig Sat Oct 6 11:41:23 2007
+++ src/irc/proxy/Makefile.in Wed Dec 3 21:35:58 2008
@@ -239,7 +239,7 @@ INCLUDES = \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
-libirc_proxy_la_LDFLAGS = -module
+libirc_proxy_la_LDFLAGS = -module -avoid-version
libirc_proxy_la_DEPENDENCIES = libirc_proxy.a
libirc_proxy_la_SOURCES = \
proxy.c \

8
net/irssi/patches/patch-src_perl_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_perl_Makefile_in,v 1.3 2008/12/22 19:40:33 matthieu Exp $
--- src/perl/Makefile.in.orig Sat Oct 6 11:41:23 2007
+++ src/perl/Makefile.in Wed Dec 3 21:35:58 2008
@@ -261,7 +261,7 @@ INCLUDES = \
$OpenBSD: patch-src_perl_Makefile_in,v 1.4 2009/05/23 17:47:01 martynas Exp $
--- src/perl/Makefile.in.orig Tue Mar 31 23:02:14 2009
+++ src/perl/Makefile.in Sun Apr 5 01:22:16 2009
@@ -252,7 +252,7 @@ INCLUDES = \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \
$(GLIB_CFLAGS) \

8
net/irssi/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2008/12/22 19:40:33 matthieu Exp $
@comment $OpenBSD: PLIST,v 1.18 2009/05/23 17:47:01 martynas Exp $
@bin bin/irssi
lib/irssi/
lib/irssi/modules/
@ -25,7 +25,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Irssi/UI/UI.so
@man man/man1/irssi.1
share/doc/irssi/
share/doc/irssi/botnet.txt
share/doc/irssi/design.txt
share/doc/irssi/faq.html
share/doc/irssi/faq.txt
@ -63,6 +62,8 @@ share/examples/irssi/scripts/quitmsg.pl
@sample ${SYSCONFDIR}/irssi/scripts/quitmsg.pl
share/examples/irssi/scripts/redirect.pl
@sample ${SYSCONFDIR}/irssi/scripts/redirect.pl
share/examples/irssi/scripts/sb_search.pl
@sample ${SYSCONFDIR}/irssi/scripts/sb_search.pl
share/examples/irssi/scripts/scriptassist.pl
@sample ${SYSCONFDIR}/irssi/scripts/scriptassist.pl
share/examples/irssi/scripts/splitlong.pl
@ -93,7 +94,6 @@ share/irssi/help/completion
share/irssi/help/connect
share/irssi/help/ctcp
share/irssi/help/cycle
share/irssi/help/date
share/irssi/help/dcc
share/irssi/help/dehilight
share/irssi/help/deop
@ -104,7 +104,6 @@ share/irssi/help/echo
share/irssi/help/eval
share/irssi/help/exec
share/irssi/help/flushbuffer
share/irssi/help/flushbuffers
share/irssi/help/format
share/irssi/help/hash
share/irssi/help/help
@ -192,7 +191,6 @@ share/irssi/help/version
share/irssi/help/voice
share/irssi/help/wait
share/irssi/help/wall
share/irssi/help/wallchops
share/irssi/help/wallops
share/irssi/help/watch
share/irssi/help/who