Compare commits

...

No commits in common. 'c9' and 'i10c-beta' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/irssi-1.2.2.tar.xz
SOURCES/irssi-1.4.5.tar.xz

@ -1 +1 @@
9a85b72bfbe327eecf223a03433a9979b50a039a SOURCES/irssi-1.2.2.tar.xz
aeaba099cc7b7abfeba2135f849cd0030a7fdd14 SOURCES/irssi-1.4.5.tar.xz

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQGiBENpM4oRBACXrTtE5r9JeNaX3T+sbwhORs0ODukgAFCOW5ZwygMI8L839wjt
EXQ8DsaRowRW74XDJm/RSxJp0ExkmLh1LDP1PcnqrgzAknUfqkbQ4LfWKfnRHE+3
42gLjfdvIGCqhHD66VrpNKmvuGmiEAvHBP58bg7aM6FqoXiDhp+aEjeJcwCglf7Y
aluifja2z4WMoHSnYpz//PcD/3+W0e/brxvZqfDmWB6a1VGjjz6CFDwgc2iO5jTw
vlP8JAcg7lqhA+3Fc4pUUqlhKdgWxEDHkzxpz6UWmLrW3rt+72Gi56U3HRKrwSh0
y83zOehVJI9TlPFq+NQ0wLT8shYD2LvVrvWuQ/hT3oLiQAG6a9MZViUPU9z0Pspc
wRwXA/4tRT1/E1h1urzSAw9Hhl7T/KWIJNkpYAgFFSuTJiyNpAKzyCWIpMeHMHEC
JprnYuvYAtBe2VjgemP7wWsiTGKXKNuaj615eLfXElXvA/1xgs8XuKugKiK8hMWP
cjrW3buc8WlrbGgKvSAsfNVSVZ9/wKdnDjv/3Tws7TFXcr5Q2bQjVGhlIElyc3Np
IHByb2plY3QgPHN0YWZmQGlyc3NpLm9yZz6IYAQTEQIAIAUCQ2kzigIbAwYLCQgH
AwIEFQIIAwQWAgMBAh4BAheAAAoJEADMtYfdvvDh32gAn1CsCfXuEhVNxdchHAQM
0WpFFRxlAJ4jFo/9+h5/kPL1a4VeH2G6OnYy8rkCDQRDaTOPEAgAo7N8oAnv5tJ3
V8uE07Ft01eWRFfdfXvu6gqw70WRVyRpS9q+Y+8r/UaQiGJZUkiBPrlWwxXlFYR0
ZFCyh8btnP/m3AqBK+72o0FU/h/CjciFJpbbQJw3asxjen6EaLxsaLDOoZOaC/Ws
uuxvq+KeiRCkIAD2SwVFR3RbJpT+T1eIhhJAD4eezfBzihpTKyE+dWGaL1IeOqaH
QhC6XCKPU3VF0kct3/uP9NawZPCYcAnfKich8+llHYLpH5fn4ud6VULur7Pgs45C
aM4BWvI0A856z7LDEZ5oBiFCYU3x9iuWHA0qFu4ZT11Enr9K1S4yppvlMqie/Mjg
JQPy2KHt5wADBQf9EriAPZD/1Jo6VmyVvMLC3vflI7vkgOn87ANbppfhgrZ/gaPE
E9IBag/3MhWcXfWvtBzl9vNDpm6u+pqLyelwPlWm7Em9uod64qKAKcgRdQnoAW2+
vRx59sYMpPOmie2/Oi217pzaqFzWjD+ZmIqdc/ocbEhU3aBCweZM5W91qiVSX9hU
4c/W3TgVY6EFrFCx4I8uVmQFoEn83CmThQvXOHek9q2ReMYnK2ovu1/IFXAuj3Zy
do/91Xq/5cs+zNqxmjUvl100Lr8WGh24nrG4rluGDd0/rp6Dbl6ZjqTqhMNOlzpn
qPcoZDmDWUvudj5kA2quO4MmrC5OXvN4jRlR5ohIBBgRAgAJBQJDaTOPAhsMAAoJ
EADMtYfdvvDhs0EAnjauwkUV0NPxqDPWjt5VuTPAl6mqAJdQNcan8E5i1henBNgb
Sxo8CCxd
=uzEi
-----END PGP PUBLIC KEY BLOCK-----

@ -1,38 +0,0 @@
From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
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+0000 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:

@ -0,0 +1,43 @@
diff --git a/configure.ac b/configure.ac
index f03569e..53a9de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,6 +650,7 @@ for c in $CHAT_MODULES; do
done
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
+AC_SUBST(FE_COMMON_LIBS)
dnl ** common libraries needed by frontends
COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
index bbcd63f..e8ce8d6 100644
--- a/src/fe-none/Makefile.am
+++ b/src/fe-none/Makefile.am
@@ -4,12 +4,13 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
$(GLIB_CFLAGS)
-botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
+botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ @FE_COMMON_LIBS@
botti_LDADD = \
@COMMON_NOUI_LIBS@ \
@PERL_LINK_LIBS@ \
@PERL_LINK_FLAGS@ \
+ @FE_COMMON_LIBS@ \
@PROG_LIBS@
botti_SOURCES = \
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
index 58df15f..8e32b94 100644
--- a/src/fe-none/meson.build
+++ b/src/fe-none/meson.build
@@ -11,6 +11,7 @@ executable('botti',
libconfig_a,
libcore_a,
libirc_a,
+ libfe_common_core_a,
],
install : true,
dependencies : dep

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCZRmzBgAKCRAAzLWH3b7w
4WpcAJ9wBEOaFUycjcCjNcB8P6L8hXuLsQCfaxaeu90J+6zUoMIPffl3LRX9YGU=
=PcY9
-----END PGP SIGNATURE-----

@ -1,30 +1,50 @@
%if 0%{?rhel} < 10
%bcond_without otr
%else
%bcond_with otr
%endif
%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
Summary: Modular text mode IRC client with Perl scripting
Name: irssi
Version: 1.2.2
Release: 12%{?dist}
Version: 1.4.5
Release: 5%{?dist}
License: GPLv2+
License: gpl-2.0-or-later AND gpl-2.0-only AND gfdl-1.1-or-later AND licenseref-fedora-public-domain AND hpnd-markus-kuhn
URL: http://irssi.org/
Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: irssi-config.h
BuildRequires: ncurses-devel openssl-devel zlib-devel
BuildRequires: pkgconfig glib2-devel perl-devel perl-generators perl(ExtUtils::Embed)
BuildRequires: autoconf automake libtool utf8proc-devel libotr-devel
BuildRequires: make
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Source1: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
Source2: gpgkey-7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1.asc
Source3: irssi-config.h
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: pkgconf-pkg-config
BuildRequires: glib2-devel
BuildRequires: gnupg2
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: utf8proc-devel
%if %{with otr}
BuildRequires: libotr-devel
%endif
Requires: perl(lib)
Requires: perl(Symbol)
# rhbz#1773190
Obsoletes: irc-otr
# https://github.com/irssi/irssi/pull/1183
Patch: irssi-1.2.2-ctrl-space-fix.patch
# https://github.com/irssi/irssi/issues/1374
Patch0: irssi-1.4.1-botti-perl-link-fix.patch
%package devel
Summary: Development package for irssi
Requires: %{name} = %{version}-%{release}
Requires: pkgconf-pkg-config
%description
Irssi is a modular IRC client with Perl scripting. Only text-mode
@ -40,39 +60,38 @@ being maintained.
%prep
%setup -q
%patch0 -p1 -b .ctrl-space-fix
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
%build
autoreconf -i
autoreconf -fi
%configure --with-textui \
--with-proxy \
--with-bot \
--with-perl=yes \
--with-perl=module \
--with-perl-lib=vendor \
--enable-true-color \
--with-otr=yes
%{?with_otr:--with-otr=yes} \
%{!?with_otr:--with-otr=no}
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
mv irssi-config.h irssi-config-$(getconf LONG_BIT).h
cp -p %{SOURCE1} irssi-config.h
cp -p %{SOURCE3} irssi-config.h
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
%make_install
install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
%files
%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README.md TODO
%config(noreplace) %{_sysconfdir}/%{name}.conf
@ -87,22 +106,82 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
%files devel
%{_includedir}/irssi/
%{_libdir}/pkgconfig/irssi-1.pc
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-12
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.4.5-5
- Rebuilt for MSVSphere 10
* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 1.4.5-5
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.4.5-4
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.5-3
- Converted license to SPDX
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Oct 10 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.5-1
- New version
Resolves: rhbz#2241891
* Thu Aug 18 2023 Boudhayan Bhattacharya <bbhtt.zn0i8@slmail.me> - 1.4.4-5
- Add irssi perl-ntype patch for perl>=5.38
Resolves rhbz#2232750
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.4.4-3
- Perl 5.38 rebuild
* Thu Mar 30 2023 Todd Zullinger <tmz@pobox.com> - 1.4.4-2
- verify upstream source signature
* Thu Mar 30 2023 Kalev Lember <klember@redhat.com> - 1.4.4-1
- Update to 1.4.4
* Thu Mar 2 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.3-3
- Added libotr conditionals for RHEL
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Oct 31 2022 Kalev Lember <klember@redhat.com> - 1.4.3-1
- Update to 1.4.3
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jul 17 2022 Kalev Lember <klember@redhat.com> - 1.4.2-1
- Update to 1.4.2
* Tue Jun 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.1-1
- New version
Resolves: rhbz#2095992
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.2.3-6
- Perl 5.36 rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.2.3-4
- Rebuilt with OpenSSL 3.0.0
* Wed Jul 28 2021 Florian Weimer <fweimer@redhat.com> - 1.2.2-11
- Rebuild to pick up OpenSSL 3.0 Beta ABI (#1984097)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-10
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.2.3-2
- Perl 5.34 rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.2-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Sun Apr 11 2021 Kalev Lember <klember@redhat.com> - 1.2.3-1
- Update to 1.2.3
- Drop old irc-otr obsoletes
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -402,7 +481,7 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
- Release bump
* Sun Sep 17 2006 Dams <anvil[AT]livna.org> - 0.8.10-6.a
- Bumped release
- Bumped release
* Sun Sep 17 2006 Dams <anvil[AT]livna.org> - 0.8.10-5.a
- Updated to 0.8.10a

Loading…
Cancel
Save