Skip to content

Commit b24a112

Browse files
SumitJenaHCLSumitJenaHCL
authored
Upgrade: irssi version to 1.4.5 (#11211)
1 parent d80b19b commit b24a112

10 files changed

Lines changed: 172 additions & 66 deletions

‎SPECS-EXTENDED/irssi/gpgkey-7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1.asc‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
mQGiBENpM4oRBACXrTtE5r9JeNaX3T+sbwhORs0ODukgAFCOW5ZwygMI8L839wjt
4+
EXQ8DsaRowRW74XDJm/RSxJp0ExkmLh1LDP1PcnqrgzAknUfqkbQ4LfWKfnRHE+3
5+
42gLjfdvIGCqhHD66VrpNKmvuGmiEAvHBP58bg7aM6FqoXiDhp+aEjeJcwCglf7Y
6+
aluifja2z4WMoHSnYpz//PcD/3+W0e/brxvZqfDmWB6a1VGjjz6CFDwgc2iO5jTw
7+
vlP8JAcg7lqhA+3Fc4pUUqlhKdgWxEDHkzxpz6UWmLrW3rt+72Gi56U3HRKrwSh0
8+
y83zOehVJI9TlPFq+NQ0wLT8shYD2LvVrvWuQ/hT3oLiQAG6a9MZViUPU9z0Pspc
9+
wRwXA/4tRT1/E1h1urzSAw9Hhl7T/KWIJNkpYAgFFSuTJiyNpAKzyCWIpMeHMHEC
10+
JprnYuvYAtBe2VjgemP7wWsiTGKXKNuaj615eLfXElXvA/1xgs8XuKugKiK8hMWP
11+
cjrW3buc8WlrbGgKvSAsfNVSVZ9/wKdnDjv/3Tws7TFXcr5Q2bQjVGhlIElyc3Np
12+
IHByb2plY3QgPHN0YWZmQGlyc3NpLm9yZz6IYAQTEQIAIAUCQ2kzigIbAwYLCQgH
13+
AwIEFQIIAwQWAgMBAh4BAheAAAoJEADMtYfdvvDh32gAn1CsCfXuEhVNxdchHAQM
14+
0WpFFRxlAJ4jFo/9+h5/kPL1a4VeH2G6OnYy8rkCDQRDaTOPEAgAo7N8oAnv5tJ3
15+
V8uE07Ft01eWRFfdfXvu6gqw70WRVyRpS9q+Y+8r/UaQiGJZUkiBPrlWwxXlFYR0
16+
ZFCyh8btnP/m3AqBK+72o0FU/h/CjciFJpbbQJw3asxjen6EaLxsaLDOoZOaC/Ws
17+
uuxvq+KeiRCkIAD2SwVFR3RbJpT+T1eIhhJAD4eezfBzihpTKyE+dWGaL1IeOqaH
18+
QhC6XCKPU3VF0kct3/uP9NawZPCYcAnfKich8+llHYLpH5fn4ud6VULur7Pgs45C
19+
aM4BWvI0A856z7LDEZ5oBiFCYU3x9iuWHA0qFu4ZT11Enr9K1S4yppvlMqie/Mjg
20+
JQPy2KHt5wADBQf9EriAPZD/1Jo6VmyVvMLC3vflI7vkgOn87ANbppfhgrZ/gaPE
21+
E9IBag/3MhWcXfWvtBzl9vNDpm6u+pqLyelwPlWm7Em9uod64qKAKcgRdQnoAW2+
22+
vRx59sYMpPOmie2/Oi217pzaqFzWjD+ZmIqdc/ocbEhU3aBCweZM5W91qiVSX9hU
23+
4c/W3TgVY6EFrFCx4I8uVmQFoEn83CmThQvXOHek9q2ReMYnK2ovu1/IFXAuj3Zy
24+
do/91Xq/5cs+zNqxmjUvl100Lr8WGh24nrG4rluGDd0/rp6Dbl6ZjqTqhMNOlzpn
25+
qPcoZDmDWUvudj5kA2quO4MmrC5OXvN4jRlR5ohIBBgRAgAJBQJDaTOPAhsMAAoJ
26+
EADMtYfdvvDhs0EAnjauwkUV0NPxqDPWjt5VuTPAl6mqAJdQNcan8E5i1henBNgb
27+
Sxo8CCxd
28+
=uzEi
29+
-----END PGP PUBLIC KEY BLOCK-----

‎SPECS-EXTENDED/irssi/irssi-1.2.2-ctrl-space-fix.patch‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎SPECS-EXTENDED/irssi/irssi-1.4.1-botti-perl-link-fix.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index f03569e..53a9de6 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -650,6 +650,7 @@ for c in $CHAT_MODULES; do
6+
done
7+
8+
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
9+
+AC_SUBST(FE_COMMON_LIBS)
10+
11+
dnl ** common libraries needed by frontends
12+
COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
13+
diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
14+
index bbcd63f..e8ce8d6 100644
15+
--- a/src/fe-none/Makefile.am
16+
+++ b/src/fe-none/Makefile.am
17+
@@ -4,12 +4,13 @@ AM_CPPFLAGS = \
18+
-I$(top_builddir) \
19+
$(GLIB_CFLAGS)
20+
21+
-botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
22+
+botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ @FE_COMMON_LIBS@
23+
24+
botti_LDADD = \
25+
@COMMON_NOUI_LIBS@ \
26+
@PERL_LINK_LIBS@ \
27+
@PERL_LINK_FLAGS@ \
28+
+ @FE_COMMON_LIBS@ \
29+
@PROG_LIBS@
30+
31+
botti_SOURCES = \
32+
diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
33+
index 58df15f..8e32b94 100644
34+
--- a/src/fe-none/meson.build
35+
+++ b/src/fe-none/meson.build
36+
@@ -11,6 +11,7 @@ executable('botti',
37+
libconfig_a,
38+
libcore_a,
39+
libirc_a,
40+
+ libfe_common_core_a,
41+
],
42+
install : true,
43+
dependencies : dep

‎SPECS-EXTENDED/irssi/irssi-1.4.5.tar.xz.asc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCZRmzBgAKCRAAzLWH3b7w
4+
4WpcAJ9wBEOaFUycjcCjNcB8P6L8hXuLsQCfaxaeu90J+6zUoMIPffl3LRX9YGU=
5+
=PcY9
6+
-----END PGP SIGNATURE-----

‎SPECS-EXTENDED/irssi/irssi.signatures.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"Signatures": {
3-
"irssi-1.2.2.tar.xz": "6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578",
3+
"gpgkey-7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1.asc": "e36390710c09ce925ef91e8d0be4646ee0150d99e3c50adf0a7cc456876a93e0",
4+
"irssi-1.4.5.tar.xz": "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062",
5+
"irssi-1.4.5.tar.xz.asc": "20b688f92ba5a6d093bee5444efe167466178a8d266b8e855f34912c70e9b481",
46
"irssi-config.h": "bb25dab5371e80fd99716b41fcf1df6730446e081adf7347b1134852a5775b0b"
57
}
6-
}
8+
}

‎SPECS-EXTENDED/irssi/irssi.spec‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,41 @@ Distribution: Azure Linux
44

55
Summary: Modular text mode IRC client with Perl scripting
66
Name: irssi
7-
Version: 1.2.2
8-
Release: 6%{?dist}
7+
Version: 1.4.5
8+
Release: 1%{?dist}
99

10-
License: GPLv2+
10+
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
1111
URL: http://irssi.org/
1212
Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
13-
Source1: irssi-config.h
14-
BuildRequires: ncurses-devel openssl-devel zlib-devel
15-
BuildRequires: pkgconfig glib2-devel perl-devel perl-generators perl(ExtUtils::Embed)
16-
BuildRequires: autoconf automake libtool utf8proc-devel libotr-devel
17-
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
18-
19-
# rhbz#1773190
20-
Obsoletes: irc-otr
21-
# https://github.com/irssi/irssi/pull/1183
22-
Patch0: irssi-1.2.2-ctrl-space-fix.patch
13+
Source1: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
14+
Source2: gpgkey-7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1.asc
15+
Source3: irssi-config.h
16+
17+
BuildRequires: make
18+
BuildRequires: ncurses-devel
19+
BuildRequires: openssl-devel
20+
BuildRequires: zlib-devel
21+
BuildRequires: pkgconf-pkg-config
22+
BuildRequires: glib2-devel
23+
BuildRequires: gnupg2
24+
BuildRequires: perl-devel
25+
BuildRequires: perl-generators
26+
BuildRequires: perl(ExtUtils::Embed)
27+
BuildRequires: autoconf
28+
BuildRequires: automake
29+
BuildRequires: libtool
30+
BuildRequires: utf8proc-devel
31+
BuildRequires: libotr-devel
32+
33+
Requires: perl(lib)
34+
Requires: perl(Symbol)
35+
# https://github.com/irssi/irssi/issues/1374
36+
Patch0: irssi-1.4.1-botti-perl-link-fix.patch
2337

2438
%package devel
2539
Summary: Development package for irssi
2640
Requires: %{name} = %{version}-%{release}
41+
Requires: pkgconf-pkg-config
2742

2843
%description
2944
Irssi is a modular IRC client with Perl scripting. Only text-mode
@@ -39,32 +54,32 @@ being maintained.
3954

4055

4156
%prep
42-
%setup -q
43-
%patch 0 -p1 -b .ctrl-space-fix
57+
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
58+
%autosetup -p1
4459

4560

4661
%build
47-
autoreconf -i
62+
autoreconf -fi
4863
%configure --with-textui \
4964
--with-proxy \
5065
--with-bot \
51-
--with-perl=yes \
66+
--with-perl=module \
5267
--with-perl-lib=vendor \
5368
--enable-true-color \
5469
--with-otr=yes
5570

56-
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
71+
%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
5772
mv irssi-config.h irssi-config-$(getconf LONG_BIT).h
58-
cp -p %{SOURCE1} irssi-config.h
73+
cp -p %{SOURCE3} irssi-config.h
5974

6075

6176
%install
62-
rm -rf $RPM_BUILD_ROOT
63-
%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
77+
%make_install
6478
install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h
6579

6680
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
6781
rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
82+
rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
6883
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
6984
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
7085
chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
@@ -86,9 +101,14 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
86101

87102
%files devel
88103
%{_includedir}/irssi/
104+
%{_libdir}/pkgconfig/irssi-1.pc
89105

90106

91107
%changelog
108+
* Mon Nov 12 2024 Sumit Jena <v-sumitjena@microsoft.com> - 1.4.5-1
109+
- Update to version 1.4.5
110+
- License verified.
111+
92112
* Thu Jul 8 2021 Muhammad Falak R Wani <mwani@microsoft.com> - 1.2.2-6
93113
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
94114
- Fix Patch directive `Patch -> Patch0`

‎SPECS-EXTENDED/libotr/libotr-4.1.1-socket-h.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff --color -ruN libotr-4.1.1.orig/tests/regression/client/client.c libotr-4.1.1/tests/regression/client/client.c
2+
--- libotr-4.1.1.orig/tests/regression/client/client.c 2015-12-25 12:39:45.000000000 -0500
3+
+++ libotr-4.1.1/tests/regression/client/client.c 2022-11-15 14:33:22.838537166 -0500
4+
@@ -27,6 +27,7 @@
5+
#include <syscall.h>
6+
#include <sys/epoll.h>
7+
#include <sys/types.h>
8+
+#include <sys/socket.h>
9+
#include <sys/un.h>
10+
#include <unistd.h>
11+

‎SPECS-EXTENDED/libotr/libotr-4.1.1-versioning.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -Naur libotr-4.1.1-orig/src/proto.c libotr-4.1.1/src/proto.c
2+
--- libotr-4.1.1-orig/src/proto.c 2016-03-06 08:13:55.000000000 -0500
3+
+++ libotr-4.1.1/src/proto.c 2021-05-18 20:39:41.552548682 -0400
4+
@@ -54,6 +54,12 @@
5+
{
6+
unsigned int api_version;
7+
8+
+/* See:
9+
+ * https://bugzilla.redhat.com/show_bug.cgi?id=1634321
10+
+ * https://github.com/psi-im/plugins/issues/7#issuecomment-423048948
11+
+ */
12+
+#if 0
13+
+
14+
/* The major versions have to match, and you can't be using a newer
15+
* minor version than we expect. */
16+
if (ver_major != OTRL_VERSION_MAJOR || ver_minor > OTRL_VERSION_MINOR) {
17+
@@ -63,6 +69,7 @@
18+
OTRL_VERSION_MAJOR, OTRL_VERSION_MINOR, OTRL_VERSION_SUB);
19+
return gcry_error(GPG_ERR_INV_VALUE);
20+
}
21+
+#endif
22+
23+
/* Set the API version. If we get called multiple times for some
24+
* reason, take the smallest value. */

‎SPECS-EXTENDED/libotr/libotr.spec‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,25 @@ Distribution: Azure Linux
44
Summary: Off-The-Record Messaging library and toolkit
55
Name: libotr
66
Version: 4.1.1
7-
Release: 10%{?dist}
8-
License: GPLv2 and LGPLv2
7+
Release: 11%{?dist}
8+
# Automatically converted from old format: GPLv2 and LGPLv2 - review is highly recommended.
9+
License: GPL-2.0-only AND LicenseRef-Callaway-LGPLv2
910
Source0: http://otr.cypherpunks.ca/%{name}-%{version}.tar.gz
1011
Url: http://otr.cypherpunks.ca/
1112
Provides: libotr-toolkit = %{version}
1213
Obsoletes: libotr-toolkit < %{version}
1314
Requires: libgcrypt >= 1.2.0
1415
Requires: pkgconfig
16+
BuildRequires: make
1517
BuildRequires: gcc
1618
BuildRequires: libgcrypt-devel >= 1.2.0, libgpg-error-devel
1719
%if %{snapshot}
1820
Buildrequires: libtool automake autoconf
1921
%endif
2022

23+
Patch: libotr-4.1.1-versioning.patch
24+
Patch: libotr-4.1.1-socket-h.patch
25+
2126
%description
2227
Off-the-Record Messaging Library and Toolkit
2328
This is a library and toolkit which implements Off-the-Record (OTR) Messaging.
@@ -33,7 +38,7 @@ Conflicts: libotr3-devel
3338
The devel package contains the libotr library and include files.
3439

3540
%prep
36-
%setup -q
41+
%autosetup -p1
3742

3843
%if %{snapshot}
3944
aclocal
@@ -73,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
7378

7479

7580
%changelog
81+
* Mon Nov 12 2024 Sumit Jena <v-sumitjena@microsoft.com> - 4.1.1-11
82+
- Added Essential patches from Fedora 41.
83+
- License verified.
84+
7685
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.1.1-10
7786
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
7887

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7551,8 +7551,8 @@
75517551
"type": "other",
75527552
"other": {
75537553
"name": "irssi",
7554-
"version": "1.2.2",
7555-
"downloadUrl": "https://github.com/irssi/irssi/releases/download/1.2.2/irssi-1.2.2.tar.xz"
7554+
"version": "1.4.5",
7555+
"downloadUrl": "https://github.com/irssi/irssi/releases/download/1.4.5/irssi-1.4.5.tar.xz"
75567556
}
75577557
}
75587558
},

0 commit comments

Comments
 (0)