From 00aa658adbaecb3cd550abe8acd1806d06e0f561 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Tue, 5 Apr 2016 15:30:34 +0000 Subject: Update to 0.8.19, and regen patches. --- irc/irssi/Makefile | 8 ++++---- irc/irssi/distinfo | 4 ++-- irc/irssi/files/patch-Makefile.in | 10 +++++----- irc/irssi/files/patch-configure | 8 ++++---- irc/irssi/files/patch-core-network_openssl_c | 10 ---------- irc/irssi/files/patch-perl-Makefile | 12 ++++++------ irc/irssi/files/patch-src_core_network-openssl.c | 10 ++++++++++ irc/irssi/pkg-plist | 6 ++++-- 8 files changed, 35 insertions(+), 33 deletions(-) delete mode 100644 irc/irssi/files/patch-core-network_openssl_c create mode 100644 irc/irssi/files/patch-src_core_network-openssl.c (limited to 'irc/irssi') diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 6d961e9c28ea..a78d021bc903 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 0.8.17 -PORTREVISION?= 1 +PORTVERSION= 0.8.19 +PORTREVISION?= 0 CATEGORIES?= irc -MASTER_SITES= http://mirror.irssi.org/ +MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ MAINTAINER?= vanilla@FreeBSD.org COMMENT?= Modular IRC client with many features @@ -15,7 +15,7 @@ LIB_DEPENDS= libglib-2.0.so:devel/glib20 CONFLICTS= irssi-devel-[0-9]* zh-irssi-[0-9]* -USES= gmake libtool ncurses pkgconfig tar:bzip2 +USES= gmake libtool ncurses pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ncurses=${NCURSESBASE} INSTALL_TARGET= install-strip diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo index 74bfeda5461c..1daee1d2255d 100644 --- a/irc/irssi/distinfo +++ b/irc/irssi/distinfo @@ -1,2 +1,2 @@ -SHA256 (irssi-0.8.17.tar.bz2) = 3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807 -SIZE (irssi-0.8.17.tar.bz2) = 1102196 +SHA256 (irssi-0.8.19.tar.xz) = 4ca0040548e814ea93eb7d602ab7d6d379afcbbdf10e84160523ce69c73ee5d3 +SIZE (irssi-0.8.19.tar.xz) = 1006140 diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in index cc00adaaa263..ce26d1e8d98a 100644 --- a/irc/irssi/files/patch-Makefile.in +++ b/irc/irssi/files/patch-Makefile.in @@ -1,7 +1,7 @@ ---- Makefile.in.orig 2014-10-11 16:58:14.000000000 +0800 -+++ Makefile.in 2014-10-13 11:47:58.867951923 +0800 -@@ -397,7 +397,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - BUILT_SOURCES = default-config.h default-theme.h irssi-version.h +--- Makefile.in.orig 2016-03-22 23:25:27 UTC ++++ Makefile.in +@@ -408,7 +408,7 @@ BUILT_SOURCES = default-config.h default + CLEANFILES = default-config.h default-theme.h SUBDIRS = src docs scripts confdir = $(sysconfdir) -conf_DATA = irssi.conf @@ -9,7 +9,7 @@ themedir = $(datadir)/irssi/themes theme_DATA = default.theme colorless.theme pkginclude_HEADERS = irssi-config.h irssi-version.h -@@ -981,8 +981,8 @@ uninstall-am: uninstall-confDATA uninsta +@@ -994,8 +994,8 @@ uninstall-am: uninstall-confDATA uninsta @MAINTAINER_MODE_TRUE@.PHONY: irssi-version.h diff --git a/irc/irssi/files/patch-configure b/irc/irssi/files/patch-configure index 04228a606f57..f7817b5cd434 100644 --- a/irc/irssi/files/patch-configure +++ b/irc/irssi/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-04-04 00:21:26.000000000 +0800 -+++ configure 2013-10-21 22:33:39.000000000 +0800 -@@ -12982,12 +12982,12 @@ if test "${with_ncurses+set}" = set; the +--- configure.orig 2016-03-22 23:25:26 UTC ++++ configure +@@ -13849,12 +13849,12 @@ if test "${with_ncurses+set}" = set; the if $search_ncurses then @@ -16,4 +16,4 @@ + CURSES_LIBS="-L$withval/lib -lncurses -ltinfo" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 $as_echo_n "checking for initscr in -lncurses... " >&6; } - if test "${ac_cv_lib_ncurses_initscr+set}" = set; then : + if ${ac_cv_lib_ncurses_initscr+:} false; then : diff --git a/irc/irssi/files/patch-core-network_openssl_c b/irc/irssi/files/patch-core-network_openssl_c deleted file mode 100644 index 1f8692f69102..000000000000 --- a/irc/irssi/files/patch-core-network_openssl_c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/network-openssl.c.orig 2010-04-03 17:32:04.000000000 +0000 -+++ src/core/network-openssl.c 2010-04-03 17:37:34.000000000 +0000 -@@ -406,6 +406,7 @@ - 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; diff --git a/irc/irssi/files/patch-perl-Makefile b/irc/irssi/files/patch-perl-Makefile index acc9c7fe8e4f..9f4aee49a3c0 100644 --- a/irc/irssi/files/patch-perl-Makefile +++ b/irc/irssi/files/patch-perl-Makefile @@ -1,6 +1,6 @@ ---- src/perl/Makefile.in.orig Sun Dec 11 15:58:14 2005 -+++ src/perl/Makefile.in Sun Dec 11 15:58:41 2005 -@@ -681,7 +681,7 @@ +--- src/perl/Makefile.am.orig 2016-03-18 12:34:38 UTC ++++ src/perl/Makefile.am +@@ -135,7 +135,7 @@ all-local: install-exec-local: for dir in $(perl_dirs); do \ @@ -9,9 +9,9 @@ done clean-generic: ---- src/perl/Makefile.am.orig Tue Feb 22 09:12:25 2005 -+++ src/perl/Makefile.am Tue Feb 22 09:12:35 2005 -@@ -148,7 +148,7 @@ +--- src/perl/Makefile.in.orig 2016-03-22 23:25:28 UTC ++++ src/perl/Makefile.in +@@ -848,7 +848,7 @@ all-local: install-exec-local: for dir in $(perl_dirs); do \ diff --git a/irc/irssi/files/patch-src_core_network-openssl.c b/irc/irssi/files/patch-src_core_network-openssl.c new file mode 100644 index 000000000000..c2a8568234ea --- /dev/null +++ b/irc/irssi/files/patch-src_core_network-openssl.c @@ -0,0 +1,10 @@ +--- src/core/network-openssl.c.orig 2016-03-22 23:08:35 UTC ++++ src/core/network-openssl.c +@@ -486,6 +486,7 @@ static GIOChannel *irssi_ssl_get_iochann + if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1) + g_warning("No valid SSL cipher suite could be selected"); + } ++ SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2); + + if (mycert && *mycert) { + char *scert = NULL, *spkey = NULL; diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist index 194df0fac062..52fb7d046a36 100644 --- a/irc/irssi/pkg-plist +++ b/irc/irssi/pkg-plist @@ -73,6 +73,7 @@ include/irssi/src/fe-common/core/windows-layout.h include/irssi/src/fe-common/irc/dcc/fe-dcc.h include/irssi/src/fe-common/irc/dcc/module-formats.h include/irssi/src/fe-common/irc/dcc/module.h +include/irssi/src/fe-common/irc/fe-irc-channels.h include/irssi/src/fe-common/irc/fe-irc-server.h include/irssi/src/fe-common/irc/module-formats.h include/irssi/src/fe-common/irc/module.h @@ -82,6 +83,7 @@ include/irssi/src/fe-text/statusbar-item.h include/irssi/src/irc/core/bans.h include/irssi/src/irc/core/channel-rejoin.h include/irssi/src/irc/core/ctcp.h +include/irssi/src/irc/core/irc-cap.h include/irssi/src/irc/core/irc-channels.h include/irssi/src/irc/core/irc-chatnets.h include/irssi/src/irc/core/irc-commands.h @@ -95,6 +97,7 @@ include/irssi/src/irc/core/mode-lists.h include/irssi/src/irc/core/modes.h include/irssi/src/irc/core/module.h include/irssi/src/irc/core/netsplit.h +include/irssi/src/irc/core/sasl.h include/irssi/src/irc/core/servers-idle.h include/irssi/src/irc/core/servers-redirect.h include/irssi/src/irc/dcc/dcc-chat.h @@ -166,6 +169,7 @@ man/man1/irssi.1.gz %%DATADIR%%/help/ignore %%DATADIR%%/help/info %%DATADIR%%/help/invite +%%DATADIR%%/help/irssiproxy %%DATADIR%%/help/ison %%DATADIR%%/help/join %%DATADIR%%/help/kick @@ -255,9 +259,7 @@ man/man1/irssi.1.gz %%DATADIR%%/scripts/msg-event.pl %%DATADIR%%/scripts/quitmsg.pl %%DATADIR%%/scripts/redirect.pl -%%DATADIR%%/scripts/sb_search.pl %%DATADIR%%/scripts/scriptassist.pl -%%DATADIR%%/scripts/splitlong.pl %%DATADIR%%/scripts/usercount.pl %%DATADIR%%/themes/colorless.theme %%DATADIR%%/themes/default.theme -- cgit v1.2.3