23209616 Upgrade irssi to 0.8.19
authorRich Burridge <rich.burridge@oracle.com>
Thu, 05 May 2016 16:41:13 -0700
changeset 5931 79be2389471d
parent 5930 d23d52b0c303
child 5932 707ac80a571d
23209616 Upgrade irssi to 0.8.19
components/irssi/Makefile
components/irssi/irssi.p5m
components/irssi/patches/01-ssl.patch
--- a/components/irssi/Makefile	Thu May 05 14:17:50 2016 -0700
+++ b/components/irssi/Makefile	Thu May 05 16:41:13 2016 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         irssi
-COMPONENT_VERSION=	0.8.15
+COMPONENT_VERSION=	0.8.19
 COMPONENT_PROJECT_URL=	https://irssi.org/
-COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=\
-	sha256:c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
-COMPONENT_ARCHIVE_URL=	https://github.com/irssi-import/irssi/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+	sha256:fe4f4b778698de8e1c319b9cd9b9ed5534f0ece7ac2bfa0af351a3157c6ec85b
+COMPONENT_ARCHIVE_URL=	https://github.com/irssi/irssi/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
-TPNO=		7900
+TPNO=		28118
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
--- a/components/irssi/irssi.p5m	Thu May 05 14:17:50 2016 -0700
+++ b/components/irssi/irssi.p5m	Thu May 05 16:41:13 2016 -0700
@@ -112,6 +112,7 @@
 file path=usr/include/irssi/src/fe-common/irc/dcc/fe-dcc.h
 file path=usr/include/irssi/src/fe-common/irc/dcc/module-formats.h
 file path=usr/include/irssi/src/fe-common/irc/dcc/module.h
+file path=usr/include/irssi/src/fe-common/irc/fe-irc-channels.h
 file path=usr/include/irssi/src/fe-common/irc/fe-irc-server.h
 file path=usr/include/irssi/src/fe-common/irc/module-formats.h
 file path=usr/include/irssi/src/fe-common/irc/module.h
@@ -121,6 +122,7 @@
 file path=usr/include/irssi/src/irc/core/bans.h
 file path=usr/include/irssi/src/irc/core/channel-rejoin.h
 file path=usr/include/irssi/src/irc/core/ctcp.h
+file path=usr/include/irssi/src/irc/core/irc-cap.h
 file path=usr/include/irssi/src/irc/core/irc-channels.h
 file path=usr/include/irssi/src/irc/core/irc-chatnets.h
 file path=usr/include/irssi/src/irc/core/irc-commands.h
@@ -134,6 +136,7 @@
 file path=usr/include/irssi/src/irc/core/modes.h
 file path=usr/include/irssi/src/irc/core/module.h
 file path=usr/include/irssi/src/irc/core/netsplit.h
+file path=usr/include/irssi/src/irc/core/sasl.h
 file path=usr/include/irssi/src/irc/core/servers-idle.h
 file path=usr/include/irssi/src/irc/core/servers-redirect.h
 file path=usr/include/irssi/src/irc/dcc/dcc-chat.h
@@ -207,8 +210,7 @@
 file path=usr/share/irssi/help/ignore
 file path=usr/share/irssi/help/info
 file path=usr/share/irssi/help/invite
-file path=usr/share/irssi/help/invitelist
-file path=usr/share/irssi/help/ircnet
+file path=usr/share/irssi/help/irssiproxy
 file path=usr/share/irssi/help/ison
 file path=usr/share/irssi/help/join
 file path=usr/share/irssi/help/kick
@@ -235,7 +237,6 @@
 file path=usr/share/irssi/help/netsplit
 file path=usr/share/irssi/help/network
 file path=usr/share/irssi/help/nick
-file path=usr/share/irssi/help/note
 file path=usr/share/irssi/help/notice
 file path=usr/share/irssi/help/notify
 file path=usr/share/irssi/help/op
@@ -253,17 +254,13 @@
 file path=usr/share/irssi/help/restart
 file path=usr/share/irssi/help/rmreconns
 file path=usr/share/irssi/help/rmrejoins
-file path=usr/share/irssi/help/rping
 file path=usr/share/irssi/help/save
-file path=usr/share/irssi/help/say
 file path=usr/share/irssi/help/sconnect
 file path=usr/share/irssi/help/script
 file path=usr/share/irssi/help/scrollback
 file path=usr/share/irssi/help/server
-file path=usr/share/irssi/help/servlist
 file path=usr/share/irssi/help/set
 file path=usr/share/irssi/help/silence
-file path=usr/share/irssi/help/squery
 file path=usr/share/irssi/help/squit
 file path=usr/share/irssi/help/stats
 file path=usr/share/irssi/help/statusbar
@@ -280,7 +277,7 @@
 file path=usr/share/irssi/help/unquery
 file path=usr/share/irssi/help/unsilence
 file path=usr/share/irssi/help/upgrade
-file path=usr/share/irssi/help/uping
+file path=usr/share/irssi/help/uptime
 file path=usr/share/irssi/help/userhost
 file path=usr/share/irssi/help/ver
 file path=usr/share/irssi/help/version
@@ -288,13 +285,10 @@
 file path=usr/share/irssi/help/wait
 file path=usr/share/irssi/help/wall
 file path=usr/share/irssi/help/wallops
-file path=usr/share/irssi/help/watch
 file path=usr/share/irssi/help/who
 file path=usr/share/irssi/help/whois
 file path=usr/share/irssi/help/whowas
 file path=usr/share/irssi/help/window
-file path=usr/share/irssi/help/wjoin
-file path=usr/share/irssi/help/wquery
 file path=usr/share/irssi/scripts/autoop.pl
 file path=usr/share/irssi/scripts/autorejoin.pl
 file path=usr/share/irssi/scripts/buf.pl
@@ -306,9 +300,7 @@
 file path=usr/share/irssi/scripts/msg-event.pl
 file path=usr/share/irssi/scripts/quitmsg.pl
 file path=usr/share/irssi/scripts/redirect.pl
-file path=usr/share/irssi/scripts/sb_search.pl
 file path=usr/share/irssi/scripts/scriptassist.pl
-file path=usr/share/irssi/scripts/splitlong.pl
 file path=usr/share/irssi/scripts/usercount.pl
 file path=usr/share/irssi/themes/colorless.theme
 file path=usr/share/irssi/themes/default.theme
--- a/components/irssi/patches/01-ssl.patch	Thu May 05 14:17:50 2016 -0700
+++ b/components/irssi/patches/01-ssl.patch	Thu May 05 16:41:13 2016 -0700
@@ -1,13 +1,14 @@
 # Disable SSLv2, SSLv3, and TLSv1.
 # Upstream has disabled SSLv2 and SSLv3. Disabling of TLSv1 will not go upstream
 
---- irssi-0.8.15/src/core/network-openssl.c.orig	Wed Dec 16 10:30:52 2015
-+++ irssi-0.8.15/src/core/network-openssl.c	Wed Dec 16 10:30:27 2015
[email protected]@ -406,6 +406,7 @@
+--- irssi-0.8.19/src/core/network-openssl.c.orig	2016-05-02 14:21:25.586859407 -0700
++++ irssi-0.8.19/src/core/network-openssl.c	2016-05-02 14:39:25.570411376 -0700
[email protected]@ -479,7 +479,7 @@
  		g_error("Could not allocate memory for SSL context");
  		return NULL;
  	}
+-	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 +	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1);
- 
- 	if (mycert && *mycert) {
- 		char *scert = NULL, *spkey = NULL;
+ 	SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback);
+ 	SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass);
+ 	if (ciphers && *ciphers) {