[gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/, net-irc/irssi/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     a6c4bf1f798867a28ad85393dedcde3e65b4ad1f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 15:13:08 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 15:13:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c4bf1f

net-irc/irssi: Old.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-irc/irssi/Manifest                             |   2 -
 .../irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch   | 112 ---------------------
 net-irc/irssi/files/irssi-1.0.0-no-ec.patch        |  43 --------
 net-irc/irssi/irssi-1.0.0.ebuild                   |  61 -----------
 net-irc/irssi/irssi-1.0.1.ebuild                   |  60 -----------
 5 files changed, 278 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 85304261320..d2ed8c01e84 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,2 @@
 DIST irssi-0.8.21.tar.xz 1007524 SHA256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a SHA512 110934ab85c8574fc76bce367c58378e28603898e63a5014a72170ffe441ffe3dbda432531e899176f5c4126f47d929a3a01a2f87bcacbfe0ba4d6d8cb31e642 WHIRLPOOL 8426a82cbf5b488c1fd9497fdeb69ee98d211aa9775560b9d6efc9645d74926fff6b627c2f681642a0df10e83f68dc4d6403d706faaf677391005af5bdccf143
-DIST irssi-1.0.0.tar.xz 1026116 SHA256 6a8a3c1fc6a021a2c02a693877b2e19cbceb3eccd78fce49e44f596f4bae4fb8 SHA512 5846fa3fbb0a3f457cdea37b70022ecf31acbcc1be62d090d28a292c305657f0d8efa1ca59e241254a5bfad57e9b78d5ef2553252ea67e1ba95feb87d8ab3ecf WHIRLPOOL 5de172c54f91fc6e19263fe744ba176cb3404b7d3a8b3c64746e0e097a2c0091c19916e60d162124421960c69d6c3a3902a59cffc05a6615a39456fc9c82194a
-DIST irssi-1.0.1.tar.xz 1027220 SHA256 9428c51a3f3598ffaef438c351a8d609cf10db34f2435bdcb84456226c383ccf SHA512 cfd315c9bf780ffb0a7582d0fc66381ca0b4c8f7eb9e9e27b82f9dd4b962f46a16865afd4f7f10dbec2681e04a252a1160bbcff2bb824133a8f6979e9933f176 WHIRLPOOL 887bf9057ede974c7a38099ca1b1749d85168bc32d25081ba9335cbab124e7bb3fa144a36aa4a67374019cc8d76c52432fe791a4374775d0574bc117841d9fae
 DIST irssi-1.0.2.tar.xz 1027912 SHA256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 SHA512 0b5048b1babecaafcd6f2be59523635a3f028c17ceb751776099d74c50fc3daf8fdf52ef5c37f9b765f7a1e5e82f5e41230d14f05530de54386f7190c610d458 WHIRLPOOL 59cd0ee40115f8a93769b693d1d6a3f8f3c004ce03c19c3b87548d6fd5b1313c26b7258049ac2bf6015f3c502d9ba9e773f48b5784b5e8d0f5afb3f4797cef47

diff --git a/net-irc/irssi/files/irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch b/net-irc/irssi/files/irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch
deleted file mode 100644
index 6e931a0612d..00000000000
--- a/net-irc/irssi/files/irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From eb20a6c846373bbfba4cd80e6aef017b56409047 Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 22 Sep 2016 04:27:35 +0200
-Subject: [PATCH] Merge pull request #548 from ailin-nemui/buf-fix
-
-sync buf.pl
----
- scripts/buf.pl | 42 ++++++++++++++++++++++++++++--------------
- 1 file changed, 28 insertions(+), 14 deletions(-)
-
-diff --git a/scripts/buf.pl b/scripts/buf.pl
-index da50e82..6d907f1 100644
---- a/scripts/buf.pl
-+++ b/scripts/buf.pl
-@@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_add_first active_win
-              settings_get_str settings_get_bool channels windows
- 	     settings_add_str settings_add_bool get_irssi_dir
- 	     window_find_refnum signal_stop);
--$VERSION = '2.13';
-+$VERSION = '2.20';
- %IRSSI = (
-     authors	=> 'Juerd',
-     contact	=> 'juerd@juerd.nl',
-@@ -13,10 +13,8 @@ $VERSION = '2.13';
-     description	=> 'Saves the buffer for /upgrade, so that no information is lost',
-     license	=> 'Public Domain',
-     url		=> 'http://juerd.nl/irssi/',
--    changed	=> 'Mon May 13 19:41 CET 2002',
--    changes	=> 'Severe formatting bug removed * oops, I ' .
--                   'exposed Irssi to ircII foolishness * sorry ' .
--		   '** removed logging stuff (this is a fix)',
-+    changed	=> 'Thu Sep 22 01:37 CEST 2016',
-+    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
-     note1	=> 'This script HAS TO BE in your scripts/autorun!',
-     note2	=> 'Perl support must be static or in startup',
- );
-@@ -39,9 +37,15 @@ use Data::Dumper;
- 
- my %suppress;
- 
-+sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
-+
- sub upgrade {
--    open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
--    print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
-+    my $fn = _filename;
-+    my $old_umask = umask 0077;
-+    open my $fh, q{>}, $fn or die "open $fn: $!";
-+    umask $old_umask;
-+
-+    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
-     for my $window (windows) {
- 	next unless defined $window;
- 	next if $window->{name} eq 'status';
-@@ -57,36 +61,39 @@ sub upgrade {
- 		redo if defined $line;
- 	    }
- 	}
--	printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf;
-+	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
-     }
--    close BUF;
-+    close $fh;
-     unlink sprintf("%s/sessionconfig", get_irssi_dir);
-     command 'layout save';
-     command 'save';
- }
- 
- sub restore {
--    open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
--    my @suppress = split /\0/, <BUF>;
-+    my $fn = _filename;
-+    open my $fh, q{<}, $fn or die "open $fn: $!";
-+    unlink $fn or warn "unlink $fn: $!";
-+
-+    my @suppress = split /\0/, readline $fh;
-     if (settings_get_bool 'upgrade_suppress_join') {
- 	chomp $suppress[-1];
- 	@suppress{@suppress} = (2) x @suppress;
-     }
-     active_win->command('^window scroll off');
--    while (my $bla = <BUF>){
-+    while (my $bla = readline $fh){
- 	chomp $bla;
- 	my ($refnum, $lines) = split /:/, $bla;
- 	next unless $lines;
- 	my $window = window_find_refnum $refnum;
- 	unless (defined $window){
--	    <BUF> for 1..$lines;
-+	    readline $fh for 1..$lines;
- 	    next;
- 	}
- 	my $view = $window->view;
- 	$view->remove_all_lines();
- 	$view->redraw();
- 	my $buf = '';
--	$buf .= <BUF> for 1..$lines;
-+	$buf .= readline $fh for 1..$lines;
- 	my $sep = settings_get_str 'upgrade_separator';
- 	$sep .= "\n" if $sep ne '';
- 	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
-@@ -119,3 +126,10 @@ signal_add       'event join'      => 'suppress';
- unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) {
-     Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!');
- }
-+
-+# Remove any left-over file. If 'session' doesn't exist (created by irssi
-+# during /UPGRADE), neither should our file.
-+unless (-e sprintf('%s/session', get_irssi_dir)) {
-+    my $fn = _filename;
-+    unlink $fn or warn "unlink $fn: $!" if -e $fn;
-+}

diff --git a/net-irc/irssi/files/irssi-1.0.0-no-ec.patch b/net-irc/irssi/files/irssi-1.0.0-no-ec.patch
deleted file mode 100644
index 171dc37613b..00000000000
--- a/net-irc/irssi/files/irssi-1.0.0-no-ec.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 752f484c6ce4c2aa7284b617a59a8906b269281c
-Author: dequis <dx@dxzone.com.ar>
-Date:   Fri Jan 6 11:47:24 2017 -0300
-
-    Add OPENSSL_NO_EC for solaris 11.3, see issue #598
-    
-    Original patch by 'Slarky'
-    
-    According to that ticket, the next major version of solaris won't need
-    this. Consider reverting this when solaris 11.3 stops being relevant.
-
-diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
-index 7a1d6e3..1eb8534 100644
---- a/src/core/network-openssl.c
-+++ b/src/core/network-openssl.c
-@@ -646,7 +646,11 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
- #ifdef SSL_get_server_tmp_key
- 	// Show ephemeral key information.
- 	EVP_PKEY *ephemeral_key = NULL;
-+
-+	// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598
-+#ifndef OPENSSL_NO_EC
- 	EC_KEY *ec_key = NULL;
-+#endif
- 	char *ephemeral_key_algorithm = NULL;
- 	char *cname = NULL;
- 	int nid;
-@@ -658,6 +662,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
- 				tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
- 				break;
- 
-+#ifndef OPENSSL_NO_EC
- 			case EVP_PKEY_EC:
- 				ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
- 				nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
-@@ -670,6 +675,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
- 
- 				g_free_and_null(ephemeral_key_algorithm);
- 				break;
-+#endif
- 
- 			default:
- 				tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");

diff --git a/net-irc/irssi/irssi-1.0.0.ebuild b/net-irc/irssi/irssi-1.0.0.ebuild
deleted file mode 100644
index 67001bd66d3..00000000000
--- a/net-irc/irssi/irssi-1.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/"
-SRC_URI="https://github.com/irssi/irssi/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-ec.patch
-)
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
-}

diff --git a/net-irc/irssi/irssi-1.0.1.ebuild b/net-irc/irssi/irssi-1.0.1.ebuild
deleted file mode 100644
index f7682eb6631..00000000000
--- a/net-irc/irssi/irssi-1.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/"
-SRC_URI="https://github.com/irssi/irssi/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog README.md TODO NEWS )
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use perl && perl_delete_localpod
-
-	prune_libtool_files --modules
-
-	einstalldocs
-}