+++ /dev/null
-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;
-+}
+++ /dev/null
-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");
+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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
-}
projects / gentoo.git / commitdiff