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

2022-10-31 Thread Sam James 
commit: 5eab89903a90d79d711d5cc7d24ab7924f9a49dd
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 20:39:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 20:39:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eab8990

net-irc/irssi: drop 1.4.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/irssi/Manifest |  1 -
 .../irssi/files/irssi-1.4.1-no-werror-decl.patch   | 14 -
 net-irc/irssi/irssi-1.4.1.ebuild   | 72 --
 3 files changed, 87 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 418c2a1d2baf..511636182da0 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,3 +1,2 @@
-DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B 
b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda
 SHA512 
e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22
 DIST irssi-1.4.2.tar.xz 1211740 BLAKE2B 
916028948640d264707bf4c8405fe63ee2781b0990abc40c4d60c5fd34bebe38de7d35cf6856c69dab39121ba5d72c962b763fda408cb81326392edc8447d3a8
 SHA512 
428157b85226b5299f55679d9384d3ae8b1e61f50a528bf21ffdf2f4b56014e0a86bdcf9ce05cf4dedd59d53829323bb62029a570f90ebf3243a06c3ce220caf
 DIST irssi-1.4.3.tar.xz 1212556 BLAKE2B 
48091e26bf547e510814d2ce709e2000771b75112fe5706ee328c6436659b7f0157f24058d508fae791175e1ff92de67224412fec18376fefc64a847d4e3bf6d
 SHA512 
d9122180990965e701deb37f212a1ef60fd697ba24c827c2bb15dcd7c4f7f4caf02f6dd99cb5a0cf0b2682325b93ecfd0f00adb296ad832b5a95953ea08567f5

diff --git a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch 
b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
deleted file mode 100644
index 83b03680cd44..
--- a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/851522
-https://github.com/Perl/perl5/issues/19382
 a/meson.build
-+++ b/meson.build
-@@ -553,9 +553,6 @@ configure_file(output : 'irssi-config.h',
- # CFLAGS #
- ##
- 
-- warnings 
--add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'),
 language : 'c')
--
-  personality 
- add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), 
language : 'c')
- if get_option('buildtype').contains('debug')

diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild
deleted file mode 100644
index 02f6a6136342..
--- a/net-irc/irssi/irssi-1.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module meson
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/;
-
-if [[ ${PV} == ** ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-   inherit git-r3
-else
-   # Keep for _rc compability
-   MY_P="${P/_/-}"
-
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="otr +perl selinux +proxy"
-
-RDEPEND="
-   >=dev-libs/glib-2.6.0
-   dev-libs/openssl:=
-   sys-libs/ncurses:=
-   otr? (
-   >=dev-libs/libgcrypt-1.2.0:=
-   >=net-libs/libotr-4.1.0
-   )
-   perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-   virtual/pkgconfig"
-RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.4.1-no-werror-decl.patch
-)
-
-src_configure() {
-   local emesonargs=(
-   -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-   -Dwith-perl-lib=vendor
-   -Dwith-otr=$(usex otr)
-   -Dwith-proxy=$(usex proxy)
-   -Dwith-perl=$(usex perl)
-
-   # Carried over from autotools (for now?), bug #677804
-   -Ddisable-utf8proc=yes
-   -Dwith-fuzzer=no
-   -Dinstall-glib=no
-   )
-
-   meson_src_configure
-}
-
-src_test() {
-   # We don't want perl-module's src_test
-   meson_src_test
-}
-
-src_install() {
-   meson_src_install
-
-   use perl && perl_delete_localpod
-}

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

2022-06-12 Thread Sam James 
commit: d5bde60aca1e5821685c1488d88edf16228eea84
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 12 10:42:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 12 10:42:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bde60a

net-irc/irssi: fix build w/ Perl 5.36

Closes: https://bugs.gentoo.org/851522
Signed-off-by: Sam James  gentoo.org>

 net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch | 14 ++
 net-irc/irssi/irssi-1.4.1.ebuild |  4 
 2 files changed, 18 insertions(+)

diff --git a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch 
b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
new file mode 100644
index ..83b03680cd44
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/851522
+https://github.com/Perl/perl5/issues/19382
+--- a/meson.build
 b/meson.build
+@@ -553,9 +553,6 @@ configure_file(output : 'irssi-config.h',
+ # CFLAGS #
+ ##
+ 
+- warnings 
+-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'),
 language : 'c')
+-
+  personality 
+ add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), 
language : 'c')
+ if get_option('buildtype').contains('debug')

diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild
index a943775df18e..b16a43f2e55d 100644
--- a/net-irc/irssi/irssi-1.4.1.ebuild
+++ b/net-irc/irssi/irssi-1.4.1.ebuild
@@ -39,6 +39,10 @@ BDEPEND="dev-lang/perl
virtual/pkgconfig"
 RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.1-no-werror-decl.patch
+)
+
 src_configure() {
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}

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

2021-05-16 Thread Mikle Kolyada 
commit: 4713776af4f8c28c11b9be3aab36203c9cc5dbbb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 16 08:26:25 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 16 08:26:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4713776a

net-irc/irssi: Drop old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-irc/irssi/Manifest |  1 -
 .../irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch| 38 -
 net-irc/irssi/irssi-1.2.2-r1.ebuild| 66 --
 3 files changed, 105 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index bb8944a93b0..dc5612c9c0f 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,2 +1 @@
-DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B 
c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2
 SHA512 
5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
 DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 
7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7
 SHA512 
826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc

diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch 
b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
deleted file mode 100644
index 63d26958b7b..000
--- a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui 
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+ is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093

- src/fe-text/term-terminfo.c | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
 a/src/fe-text/term-terminfo.c
-+++ b/src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--  unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+  unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+  /* GLib >= 2.63 do not accept Unicode NUL anymore */
-+  if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+  c = 0;
- 
-   switch (c) {
-   case (unichar)-1:

diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild 
b/net-irc/irssi/irssi-1.2.2-r1.ebuild
deleted file mode 100644
index 53254a9175c..000
--- a/net-irc/irssi/irssi-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="otr +perl selinux socks5 +proxy"
-
-COMMON_DEPEND="
-   sys-libs/ncurses:0=
-   >=dev-libs/glib-2.6.0
-   dev-libs/openssl:=
-   otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-   >=net-libs/libotr-4.1.0 )
-   perl? ( dev-lang/perl:= )
-   socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-   ${COMMON_DEPEND}
-   virtual/pkgconfig"
-
-RDEPEND="
-   ${COMMON_DEPEND}
-   selinux? ( sec-policy/selinux-irc )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704
-)
-
-src_configure() {
-   # Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-   export ac_cv_lib_utf8proc_utf8proc_version=no
-
-   local myeconfargs=(
-   --with-perl-lib=vendor
-   --enable-true-color
-   $(use_with

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

2020-10-05 Thread Lars Wendler 
commit: ec0152d219b9d7db6859d8257072c1b78f12dd77
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct  5 09:05:41 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct  5 09:05:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0152d2

net-irc/irssi: Revbump to fix input issue with >=dev-libs/glib-2.63

Thanks-to: Tomasz Golinski  alpha.uwb.edu.pl>
Closes: https://bugs.gentoo.org/746704
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 .../irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch| 38 
 net-irc/irssi/irssi-1.2.2-r1.ebuild| 67 ++
 2 files changed, 105 insertions(+)

diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch 
b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
new file mode 100644
index 000..63d26958b7b
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
@@ -0,0 +1,38 @@
+From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
+From: ailin-nemui 
+Date: Thu, 23 Apr 2020 21:45:15 +0200
+Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
+
+A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
+NUL / U+ is a valid Unicode character. This would occur when the
+user types Ctrl+Space. As a result, the input loop never manages to
+process the NUL-byte (and any other user input that follows, ever).
+
+This patch adds a manual check that properly advances the input loop if
+GLib returns -2 (incomplete character) despite the length being positive
+and a NUL is in first position.
+
+Fixes #1180
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
+https://gitlab.gnome.org/GNOME/glib/-/issues/2093
+---
+ src/fe-text/term-terminfo.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index 5235f72d2..78496a64f 100644
+--- a/src/fe-text/term-terminfo.c
 b/src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+ 
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+-  unichar c = g_utf8_get_char_validated((char *)buffer, size);
++  unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++  /* GLib >= 2.63 do not accept Unicode NUL anymore */
++  if (c == (unichar) -2 && *buffer == 0 && size > 0)
++  c = 0;
+ 
+   switch (c) {
+   case (unichar)-1:

diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild 
b/net-irc/irssi/irssi-1.2.2-r1.ebuild
new file mode 100644
index 000..ed231dbb3fa
--- /dev/null
+++ b/net-irc/irssi/irssi-1.2.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="otr +perl selinux socks5 +proxy libressl"
+
+COMMON_DEPEND="
+   sys-libs/ncurses:0=
+   >=dev-libs/glib-2.6.0
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( >=dev-libs/libressl-2.7.4:= )
+   otr? ( >=dev-libs/libgcrypt-1.2.0:0=
+   >=net-libs/libotr-4.1.0 )
+   perl? ( dev-lang/perl:= )
+   socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+   ${COMMON_DEPEND}
+   virtual/pkgconfig"
+
+RDEPEND="
+   ${COMMON_DEPEND}
+   selinux? ( sec-policy/selinux-irc )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704
+)
+
+src_configure() {
+   # Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
+   export ac_cv_lib_utf8proc_utf8proc_version=no
+
+   local myeconfargs=(
+   --with-perl-lib=vendor
+   --enable-true-color
+   $(use_with otr)
+   $(use_with proxy)
+   $(use_with perl)
+   $(use_with socks5 socks)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   use perl && perl_delete_localpod
+   rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
+}

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

2019-02-12 Thread Lars Wendler 
commit: 43ceaf84adc61f8ba0e0bcbaf8d63465d052b8a3
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 12 21:19:16 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 12 21:21:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ceaf84

net-irc/irssi: Disable automagic dep on dev-libs/libutf8proc

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 .../irssi-1.2.0-fix-libutf8proc-include.patch  | 25 --
 ...irssi-1.2.0-r1.ebuild => irssi-1.2.0-r2.ebuild} | 25 --
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch 
b/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch
deleted file mode 100644
index 019c2660eec..000
--- a/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 138596d84dfa060b5d035b96e7d1a57a7cbcd7b0 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada 
-Date: Tue, 12 Feb 2019 19:38:36 +0300
-Subject: [PATCH] wcwidth-wrapper.c: fix libutf8proc include path
-

- src/core/wcwidth-wrapper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
-index 03d0dc0c..b0df662f 100644
 a/src/core/wcwidth-wrapper.c
-+++ b/src/core/wcwidth-wrapper.c
-@@ -27,7 +27,7 @@
- #include "utf8.h"
- 
- #ifdef HAVE_LIBUTF8PROC
--#include 
-+#include 
- #endif
- 
- /* wcwidth=2 since unicode 5.2.0 */
--- 
-2.19.2
-

diff --git a/net-irc/irssi/irssi-1.2.0-r1.ebuild 
b/net-irc/irssi/irssi-1.2.0-r2.ebuild
similarity index 65%
rename from net-irc/irssi/irssi-1.2.0-r1.ebuild
rename to net-irc/irssi/irssi-1.2.0-r2.ebuild
index 79724a44e3b..eaa6be9d5a3 100644
--- a/net-irc/irssi/irssi-1.2.0-r1.ebuild
+++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+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="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
@@ -35,7 +35,6 @@ DEPEND="
 
 RDEPEND="
${COMMON_DEPEND}
-   dev-libs/libutf8proc
selinux? ( sec-policy/selinux-irc )
perl? ( !net-im/silc-client )"
 
@@ -45,20 +44,24 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
default
-   eapply "${FILESDIR}"/${P}-fix-libutf8proc-include.patch
-   if has_version '>=dev-libs/libressl-2.7.3'; then
-   eapply "${FILESDIR}"/libressl.patch
+   if has_version '>=dev-libs/libressl-2.7.3' ; then
+   eapply "${FILESDIR}"/libressl.patch
fi
 }
 
 src_configure() {
-   econf \
-   --with-perl-lib=vendor \
-   --enable-true-color \
-   $(use_with otr) \
-   $(use_with proxy) \
-   $(use_with perl) \
+   # Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
+   export ac_cv_lib_utf8proc_utf8proc_version=no
+
+   local myeconfargs=(
+   --with-perl-lib=vendor
+   --enable-true-color
+   $(use_with otr)
+   $(use_with proxy)
+   $(use_with perl)
$(use_with socks5 socks)
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_install() {

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

2019-02-12 Thread Mikle Kolyada 
commit: b0a9e5897fb7e5181783e3684894f5babe93eaad
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Feb 12 17:03:17 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Feb 12 17:05:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a9e589

net-irc/irssi: fix libutf8proc header location

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../irssi-1.2.0-fix-libutf8proc-include.patch  | 25 
 net-irc/irssi/irssi-1.2.0-r1.ebuild| 68 ++
 2 files changed, 93 insertions(+)

diff --git a/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch 
b/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch
new file mode 100644
index 000..019c2660eec
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.2.0-fix-libutf8proc-include.patch
@@ -0,0 +1,25 @@
+From 138596d84dfa060b5d035b96e7d1a57a7cbcd7b0 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada 
+Date: Tue, 12 Feb 2019 19:38:36 +0300
+Subject: [PATCH] wcwidth-wrapper.c: fix libutf8proc include path
+
+---
+ src/core/wcwidth-wrapper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/wcwidth-wrapper.c b/src/core/wcwidth-wrapper.c
+index 03d0dc0c..b0df662f 100644
+--- a/src/core/wcwidth-wrapper.c
 b/src/core/wcwidth-wrapper.c
+@@ -27,7 +27,7 @@
+ #include "utf8.h"
+ 
+ #ifdef HAVE_LIBUTF8PROC
+-#include 
++#include 
+ #endif
+ 
+ /* wcwidth=2 since unicode 5.2.0 */
+-- 
+2.19.2
+

diff --git a/net-irc/irssi/irssi-1.2.0-r1.ebuild 
b/net-irc/irssi/irssi-1.2.0-r1.ebuild
new file mode 100644
index 000..dd02f3d769d
--- /dev/null
+++ b/net-irc/irssi/irssi-1.2.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit ltprune perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/;
+SRC_URI="https://github.com/${PN}/${PN}/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="otr +perl selinux socks5 +proxy libressl"
+
+COMMON_DEPEND="
+   sys-libs/ncurses:0=
+   >=dev-libs/glib-2.6.0
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl:= )
+   otr? ( >=dev-libs/libgcrypt-1.2.0:0=
+  >=net-libs/libotr-4.1.0 )
+   perl? ( dev-lang/perl:= )
+   socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+   ${COMMON_DEPEND}
+   virtual/pkgconfig"
+
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-libs/libutf8proc
+   selinux? ( sec-policy/selinux-irc )
+   perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   eapply "${FILESDIR}"/${P}-fix-libutf8proc-include.patch
+   if has_version '>=dev-libs/libressl-2.7.3'; then
+   eapply "${FILESDIR}"/libressl.patch
+   fi
+}
+
+src_configure() {
+   econf \
+   --with-perl-lib=vendor \
+   --enable-true-color \
+   $(use_with otr) \
+   $(use_with proxy) \
+   $(use_with perl) \
+   $(use_with socks5 socks)
+}
+
+src_install() {
+   default
+   use perl && perl_delete_localpod
+   prune_libtool_files --modules
+}

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

2018-10-22 Thread Mikle Kolyada 
commit: 8604a85880a0776792b947faaeca48a345274209
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Oct 22 14:56:31 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Oct 22 14:56:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8604a858

net-irc/irssi: revbump to fix libressl-2.7/2.8 bulding

Closes: https://bugs.gentoo.org/668748
Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-irc/irssi/files/libressl.patch  | 33 +++
 net-irc/irssi/irssi-1.1.1-r2.ebuild | 63 +
 2 files changed, 96 insertions(+)

diff --git a/net-irc/irssi/files/libressl.patch 
b/net-irc/irssi/files/libressl.patch
new file mode 100644
index 000..644c73be32f
--- /dev/null
+++ b/net-irc/irssi/files/libressl.patch
@@ -0,0 +1,33 @@
+From 25a44dacf4114f33f3a887f358c02f4fd9938427 Mon Sep 17 00:00:00 2001
+From: Dorian Harmans 
+Date: Fri, 23 Mar 2018 21:35:35 +0100
+Subject: [PATCH] fix build with LibreSSL 2.7.0
+
+---
+ src/core/network-openssl.c | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
+index 9fddf073e..692c7e716 100644
+--- a/src/core/network-openssl.c
 b/src/core/network-openssl.c
+@@ -35,7 +35,8 @@
+ #include 
+ 
+ /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010L) && 
!defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010L) && \
++(!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 
0x207fL)
+ /* The two functions below could be already defined if OPENSSL_API_COMPAT is
+  * below the 1.1.0 version so let's do a clean start */
+ #undef  X509_get_notBefore
+@@ -47,7 +48,8 @@
+ 
+ /* OpenSSL 1.1.0 also introduced some useful additions to the api */
+ #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
+-#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined 
(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x1010L) || \
++(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 
0x207fL)
+ static int X509_STORE_up_ref(X509_STORE *vfy)
+ {
+ int n;

diff --git a/net-irc/irssi/irssi-1.1.1-r2.ebuild 
b/net-irc/irssi/irssi-1.1.1-r2.ebuild
new file mode 100644
index 000..3c854ec3679
--- /dev/null
+++ b/net-irc/irssi/irssi-1.1.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit ltprune perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/;
+SRC_URI="https://github.com/${PN}/${PN}/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"
+
+COMMON_DEPEND="
+   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="
+   ${COMMON_DEPEND}
+   virtual/pkgconfig"
+
+RDEPEND="
+   ${COMMON_DEPEND}
+   selinux? ( sec-policy/selinux-irc )
+   perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   if has_version '>=dev-libs/libressl-2.7.3'; then
+   eapply ${FILESDIR}/libressl.patch
+   fi
+}
+
+src_configure() {
+   econf \
+   --with-perl-lib=vendor \
+   --enable-true-color \
+   $(use_with proxy) \
+   $(use_with perl) \
+   $(use_with socks5 socks)
+}
+
+src_install() {
+   default
+   use perl && perl_delete_localpod
+   prune_libtool_files --modules
+}

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

2017-03-17 Thread Jeroen Roovers 
commit: a6c4bf1f798867a28ad85393dedcde3e65b4ad1f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Mar 17 15:13:08 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Mar 17 15:13:08 2017 +
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..000
--- 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 
-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   => 'ju...@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

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

2017-01-07 Thread Sven Wegener 
commit: d66387b45665befce3bbe5f3da63bf23295bafae
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan  7 13:34:19 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Jan  7 13:43:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66387b4

net-irc/irssi: Backport patch for openssl without EC, bug #604892

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 net-irc/irssi/files/irssi-1.0.0-no-ec.patch | 43 +
 net-irc/irssi/irssi-1.0.0.ebuild|  4 +++
 net-irc/irssi/metadata.xml  |  8 +++---
 3 files changed, 51 insertions(+), 4 deletions(-)

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
new file mode 100644
index ..171dc37
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.0.0-no-ec.patch
@@ -0,0 +1,43 @@
+commit 752f484c6ce4c2aa7284b617a59a8906b269281c
+Author: dequis 
+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
index 2d8d161..1644d03 100644
--- a/net-irc/irssi/irssi-1.0.0.ebuild
+++ b/net-irc/irssi/irssi-1.0.0.ebuild
@@ -38,6 +38,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-no-ec.patch
+)
+
 src_configure() {
econf \
--with-perl-lib=vendor \

diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index f90707c..d9c3b63 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -2,13 +2,13 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 
-   monsie...@gentoo.org
-   Patrice Clement
-
-
swege...@gentoo.org
Primary Maintainer
 
+
+   monsie...@gentoo.org
+   Patrice Clement
+
 
Adds support for a loadable IRC proxy module

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

2016-09-30 Thread Sven Wegener 
commit: bd1a5b6ba37078f293db6c80e2ee9daf717affa3
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Sep 30 16:48:51 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Sep 30 16:49:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1a5b6b

net-irc/irssi: Cleanup

Package-Manager: portage-2.3.0

 net-irc/irssi/Manifest   |  3 --
 net-irc/irssi/files/irssi-0.8.15-tinfo.patch | 21 
 net-irc/irssi/irssi-0.8.17.ebuild| 70 --
 net-irc/irssi/irssi-0.8.18.ebuild| 72 ---
 net-irc/irssi/irssi-0.8.19.ebuild| 72 ---
 net-irc/irssi/irssi-0.8.20.ebuild| 73 
 6 files changed, 311 deletions(-)

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 4a4d297..7be732c 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1 @@
-DIST irssi-0.8.17.tar.bz2 1102196 SHA256 
3c9600cad2edf58f1d012febc1a0ba844274df6e331c01a9e935467705166807 SHA512 
e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953
 WHIRLPOOL 
497e1c4f8a84932f84cdf05bdcc8493f27edfd2070f07c760fa91fc1a967958e3bb48b0cc2d9b22640670d770ffb6dc8035e8bd636a0f966cd675d1636907ee3
-DIST irssi-0.8.18.tar.xz 1004856 SHA256 
c0a177f749757c2d171ebe49ab0f0dd9cf9374dea81ab01904d0549bcb057840 SHA512 
9b1abdb89a89cb1bf562193919398d765757639efca5ad12b38feaad96b98e2b0bbeb665ac0994c4f2ff9abbff7a7a8bee0daab2b0ea0beb73f82edc30e0
 WHIRLPOOL 
40bb726cef07fdad749fd8ae2474ff993ab6c8b275cf4f3a537e997333fdb4f798db50c751956818f4190e2f313b78f66508631d6995ecab76f7c93be01f5abd
-DIST irssi-0.8.19.tar.xz 1006140 SHA256 
4ca0040548e814ea93eb7d602ab7d6d379afcbbdf10e84160523ce69c73ee5d3 SHA512 
45578a33b408ebf7d896b9576dffc4ca95897933be50cc1c2fcb8988a6ad86a10087fba5f74f0a2eb1d615fb3f30e57500f5175ef2dbada1de5a33b20abacb61
 WHIRLPOOL 
cd95ab0abb7ce95772c823bb7022f12c97b4d9878ed256353550520496c3bc4a03df0964c2b0c104b5e4717f375cccef7e60d74e80410a2c19d1abb85723e571
 DIST irssi-0.8.20.tar.xz 1007252 SHA256 
7882c4e821f5aac469c5e69e69d7e235f4986101285c675e81a9a95bfb20505a SHA512 
ace39022a3e7461fc33cbd0e8c6635aa84c67fc4f6364b66747f860a4538a4b17bbd677e342fbfa9ae7e97783745f8d7dab350a27330ce14f1702386231296b1
 WHIRLPOOL 
3a50767aebed4dbd7fea7639af688cbc6cd2b57a7bae9ab398d277471dbea3491d918c46cf0c05ff48db69b79117c0d733dfe06c2bc0b9bbfce699eb0fdcff37

diff --git a/net-irc/irssi/files/irssi-0.8.15-tinfo.patch 
b/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
deleted file mode 100644
index b16a070..
--- a/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 irssi-0.8.15-orig/curses.m42010-04-04 02:19:58.0 +1000
-+++ irssi-0.8.15/curses.m4 2014-03-06 16:36:12.404404130 +1100
-@@ -218,9 +218,17 @@
-   CURSES_LIBS="$CHECKLIBS"
-   ],, $CHECKLIBS)
-   ], $CURSES_LIBS)
-+  AC_CHECK_LIB(ncurses, tputs, [
-+  true;
-+  ], [
-+CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
-+  AC_CHECK_LIB(tinfo, tputs, [
-+  CURSES_LIBS="$CHECKLIBS"
-+  ],, $CHECKLIBS)
-+  ], $CURSES_LIBS)
-   CURSES_INCLUDEDIR="$4"
-   search_ncurses=false
--  screen_manager="$5"
-+  screen_manager=$5
- AC_DEFINE(HAS_CURSES)
- has_curses=true
-   has_ncurses=true

diff --git a/net-irc/irssi/irssi-0.8.17.ebuild 
b/net-irc/irssi/irssi-0.8.17.ebuild
deleted file mode 100644
index b60ff81..
--- a/net-irc/irssi/irssi-0.8.17.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic perl-module toolchain-funcs
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/;
-SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
-
-CDEPEND="sys-libs/ncurses:0=
-   >=dev-libs/glib-2.6.0
-   ssl? ( !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 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   pushd m4 > /dev/null || die
-   epatch

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

2016-09-26 Thread Sven Wegener 
commit: c90ead2db6c8dfde6519ae6e3b5b99bf6c0ad6aa
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Sep 26 20:54:55 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Sep 26 20:57:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90ead2d

net-irc/irssi: Revision bump, security bug #595172

Package-Manager: portage-2.2.28

 .../irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch   | 112 +
 net-irc/irssi/irssi-0.8.20-r1.ebuild   |  74 ++
 2 files changed, 186 insertions(+)

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
new file mode 100644
index ..6e931a0
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.20-buf.pl-2.20-CVE-2016-7553.patch
@@ -0,0 +1,112 @@
+From eb20a6c846373bbfba4cd80e6aef017b56409047 Mon Sep 17 00:00:00 2001
+From: ailin-nemui 
+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   => 'ju...@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/, ;
++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 = ){
++while (my $bla = readline $fh){
+   chomp $bla;
+   my ($refnum, $lines) = split /:/, $bla;
+   next unless $lines;
+   my $window = window_find_refnum $refnum;
+   unless (defined $window){
+-   for 1..$lines;
++  readline $fh for 1..$lines;
+   next;
+   }
+   my $view = $window->view;
+   $view->remove_all_lines();
+   $view->redraw();
+   my $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
++#