diff --git a/irssi-0.8.16_missing_prototype_warnings.patch b/irssi-0.8.16_missing_prototype_warnings.patch deleted file mode 100644 index 530027a..0000000 --- a/irssi-0.8.16_missing_prototype_warnings.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: src/fe-none/irssi.c -=================================================================== ---- src/fe-none/irssi.c.orig -+++ src/fe-none/irssi.c -@@ -24,6 +24,8 @@ - #include "args.h" - #include "signals.h" - #include "core.h" -+/* needed for SOCKSinit prototype */ -+#include "core/network.h" - - #ifdef HAVE_STATIC_PERL - void perl_core_init(void); -Index: src/fe-text/irssi.c -=================================================================== ---- src/fe-text/irssi.c.orig -+++ src/fe-text/irssi.c -@@ -25,6 +25,8 @@ - #include "signals.h" - #include "levels.h" - #include "core.h" -+/* needed for SOCKSinit prototype */ -+#include "core/network.h" - #include "settings.h" - #include "session.h" - #include "servers.h" diff --git a/irssi-1.2.3-add-libera.patch b/irssi-1.2.3-add-libera.patch deleted file mode 100644 index 4f1467e..0000000 --- a/irssi-1.2.3-add-libera.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/irssi/irssi/commit/1ba48840a112dfacf13cbbf6b77c1e3489fefcf8#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc -https://github.com/irssi/irssi/commit/a4486c236a3bf15192d0500b3a1892f7465826c7#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc -https://github.com/irssi/irssi/commit/82d2cd88e78b4bffe0c710dd940d1771506eced6#diff-5497b19336f6b277da30a72c56ce96e6e5354363a39419cca702448e967d20fc - -This simply adds the new network. - -Index: irssi-1.2.3/irssi.conf -=================================================================== ---- irssi-1.2.3.orig/irssi.conf -+++ irssi-1.2.3/irssi.conf -@@ -3,6 +3,7 @@ servers = ( - { address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; }, - { address = "irc.esper.net"; chatnet = "EsperNet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, - { address = "chat.freenode.net"; chatnet = "Freenode"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, -+ { address = "irc.libera.chat"; chatnet = "liberachat";port = "6697"; use_tls = "yes"; tls_verify = "yes"; }, - { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; }, - { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; use_tls = "yes"; }, - { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, -@@ -40,6 +41,12 @@ chatnets = { - max_msgs = "4"; - max_whois = "1"; - }; -+ liberachat = { -+ type = "IRC"; -+ max_kicks = "1"; -+ max_msgs = "4"; -+ max_whois = "1"; -+ }; - GameSurge = { - type = "IRC"; - max_kicks = "1"; -@@ -96,7 +103,8 @@ chatnets = { - channels = ( - { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; }, - { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; }, -- { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; }, -+ { name = "#libera"; chatnet = "liberachat";autojoin = "No"; }, -+ { name = "#irssi"; chatnet = "liberachat";autojoin = "No"; }, - { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; }, - { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; }, - { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; }, diff --git a/irssi-1.2.3.tar.xz b/irssi-1.2.3.tar.xz deleted file mode 100644 index f2784fb..0000000 --- a/irssi-1.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f -size 1145292 diff --git a/irssi-1.2.3.tar.xz.asc b/irssi-1.2.3.tar.xz.asc deleted file mode 100644 index 6b6900f..0000000 --- a/irssi-1.2.3.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCYHCVXQAKCRAAzLWH3b7w -4SxeAJ4zt3SqP2mDe/bkUuDoq4zavdy/dACeNfr56+y6xifQvkSqQYHP00O4fg0= -=zNoe ------END PGP SIGNATURE----- diff --git a/irssi-1.4.1.tar.xz b/irssi-1.4.1.tar.xz new file mode 100644 index 0000000..85c9615 --- /dev/null +++ b/irssi-1.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a7692741bba16f3ba6f97cf7246421ac57055dcedcca9a4d21663f8efe47501 +size 1210772 diff --git a/irssi-1.4.1.tar.xz.asc b/irssi-1.4.1.tar.xz.asc new file mode 100644 index 0000000..7137545 --- /dev/null +++ b/irssi-1.4.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQR+5l4wgqX7Bqx8No0AzLWH3b7w4QUCYp4+kwAKCRAAzLWH3b7w +4epZAJ96up4foKregNL+QNJJTr1yC6U75gCghUMxh/NHth5AgSan6znA65BqAig= +=x9sj +-----END PGP SIGNATURE----- diff --git a/irssi-rpmlintrc b/irssi-rpmlintrc deleted file mode 100644 index bbb12bb..0000000 --- a/irssi-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -addFilter("W: perl5-naming-policy-not-applied ") -addFilter("W: zero-length /usr/lib.*/perl5/vendor_perl/.*/auto/Irssi/.*") diff --git a/irssi.changes b/irssi.changes index b917e77..99bafb4 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,320 @@ +------------------------------------------------------------------- +Sat Jun 11 17:47:05 UTC 2022 - Ailin Nemui + +- drop irssi.conf, upstream does not install it anymore +- drop SOCKS support and related patch + irssi-0.8.16_missing_prototype_warnings.patch, was not working +- drop irssi-1.2.3-add-libera.patch, upstream +- drop irssi-rpmlintrc, did not match +- drop botti, not supported by upstream +- update to 1.4.1 + ! Note: botti no longer compiles; get in touch if you use it + * Format the output of /QUOTE HELP (#1371, an#82). By Val + Lorentz. Add /SHELP as default alias (an#83) + + GLib log message filter: /SET glib_log_domains (an#50, + an#59). By Andrej Kacian + + An option to clear the cutbuffer: + /SET empty_kill_clears_cutbuffer (an#58). By Mikael + Magnusson + + Scriptable pastebin (an#60, an#88) + + Configurable actlist separator: /SET actlist_separator + (#1364, an#61) + - Fix window left/right not skipping visible windows + (an#57). By Mikael Magnusson + - Fix wrong printf-format on OpenBSD (an#66, an#68). Reported + by Aaron Bieber + - Fix erroneous output produced by autoload_modules (an#72) + - Fix scroll_page_count setting with `.' (#1365, an#76) + - Fix memory leak in /IGNORE (#1373, an#84). Found by Jookia + - Misc fixes (an#45, an#67, an#70, #1368, an#77) + + - CHANTYPES take precedence over (missing) STATUSMSG in /join + (#1358, an#54) + - Fix crash in Perl's $view->set_bookmark (freebsd#254237, + an#56) + + - Minor help fixes (an#51, an#52) + - Fix regression where own channel status was forgotten after + /UPGRADE (#1357, an#53) + + * /SET resolve_reverse_lookup setting was removed (#1034, + #1135) + * Irssi will try to connect on IPv4 if IPv6 connection failed + (#1146). By Shivaram Lingamneni + + * The display system now renders formats on the fly (#1079, + #1188, #1191, #1192, #1204, #1205, #1209, #1349, #1355, + an#13, an#14, an#28, an#29, an#36, an#37, an#49) + + This major change will break scripts that try to modify + printed text during "print text" signal (#1189). They need + to be ported to modify the text during "print format" + instead. It also breaks the usage of using /FORMAT to add + different colours to a line. Such usage needs to be ported + to using $expando variables instead. Affected scripts + include format_identify.pl, friends_peder.pl, nickcolor.pl, + nm.pl, people.pl + + The "gui print text finished" and "gui print text after + finished" signals gained a TEXT_DEST_REC *parameter in the + process. + + A new "gui render line text" signal is available to change + the rendering of a line + + * made the $Z expando (time) dynamic (#1087, #1207, #1208) + + This change breaks the usage of /SET timestamp_format to + supply a custom displayed time stamp. Affected scripts + include binary_time.pl + + * /HILIGHT -priority now affects which hilight rule gets + applied (#1228, #1232) + * The NAMES list is now hidden by default if there are more + than 18 users on the channel (an#7) + + To revert to the previous behaviour + + /SET show_names_on_join_limit -1 + + * -tls_verify is now enabled by default (#1170, an#18, #1309, + an#23, #1343, #1351) + + This may cause an ugly display of notls_verify in the output + of /SERVER LIST, even on plain-text connection, on old + configs. Kindly remove the "tls_verify = "no";" entries from + your config file manually. + + * Irssi will now attempt STARTTLS if advertised (#1170, #1312, + an#19) + + Use -disallow_starttls if you absolutely do not want this + + In order to check for a STARTTLS advertisement, Irssi will + now wait for a response (even an error) to CAP LS 302. If + your bouncer/server does not want to communicate before + receiving USER/PASS at all, use -nocap to disable the CAP + check. + + * Channel sync requests (WHO, MODE) are now sent "later" than + user commands. This should improve responsiveness to user + commands in the autojoin phase (an#26, an#32, an#33) + * Irssi is now using full paths in #include directives and + consequently does not add all directories to the include + path anymore (#1040) + * The Build System was ported to Meson (#1064, #1065, #1068, + #1071, #1072, #1073, #1074, #1075, #1084, #1085, #1118, #1166, + #1223, #1224, #1245, #1313, #1314, an#31) + * Scriptassist was changed to use a YAML database (#1163) + + It will tell you when you need to update your setting + + * /BIND shows all partial matches (#1155) + * Cleanup of unused functions (#1017, #1132, #1145, #1182, + #1246, #1264) + + Functions removed: + + NET_CALLBACK + NET_HOST_CALLBACK + RESOLVED_NAME_REC + net_gethostbyaddr_nonblock + net_connect_nonblock + [ SIMPLE_THREAD_REC, simple_init, simple_readpipe ] + hash_save_key + + Functions deprecated: + + dec2octal + g_timeval_cmp + get_timeval_diff + + Function names corrected: + + g_input -> i_input + g_istr -> i_istr + g_io_channel -> i_io_channel + g_hash_free_value -> i_hash_free_value + remove g_free_true + gslist -> i_slist + glog_func -> i_log_func + glist -> i_list + + If multi-version compatibility is desired, module authors + can find an example of backwards compatible code in + cdidier/irssi-xmpp#55 + + + Add MSGLEVEL_HIDDEN to Perl (#1044) + + Add $view->set_hidden_level and $view->remove_lines_by_level + to Perl (#1026) + + Add a /SET scrollback_max_age setting (#1022). By Heikki + Orsila + + Add /SET actlist_prefer_window_name (#1025) + + Add -window option to /CAT (#1023, #1159) + + Add an option to list specific sections with + + /SET -section lookandfeel + + (#1048) + + + Add support for IRCv3 CAP LS 302 (#1091) + + Add a new "print noformat" signal that goes together with + "print format" (#1088, #1192) + + Add support for IRCv3 extended-join. /SET show_extended_join + to enable (#1097, #1107, #1124) + + There are two new /FORMATs, join_extended and + join_extended_account, that theme writers need to take into + account if desired. + + + Add support for IRCv3 setname (#1093, #1104, #1254, GL#33) + + Add support for IRCv3 account-notify (#1100, #1098, GL#33, + #1105, #1131). Credit to oss-fuzz + /SET show_account_notify to enable + + Add support for IRCv3 invite-notify (#1094) + + Add support for receiving IRCv3 message-tags (#576, #1090) + + Add support for sending IRCv3 message-tags (#1092, an#34) + + Enable the znc.in/self-message CAP by default (#1123) + + Add support for IRCv3 away-notify. /SET away_notify_public + to enable (#1099, GL#33, #1105) + + Add support for IRCv3 chghost (#1096, GL#33, #1105) + + For servers with broken chghost implementation that fill the + status window with host changed messages, one may add "quote + cap req -chghost" to the -autosendcmd or, if the host change + messages are entirely undesired, "/format -delete + host_changed" + + + Add support for IRCv3 server-time. /SET show_server_time to + enable (#1108) + + Add support for logging IRCv3 server-time. + /SET log_server_time to disable (#1318, an#16) + + Add IRCv3 features to signals.txt (#1111) + + In particular, "message join" now takes 2 additional + arguments, script and module authors must beware of this + change. + + + Show the unignore time in /IGNORE output (#1158, #1161) + + Add /SET quit_on_hup to make the behaviour of SIGHUP + configurable (#828, #1169). By Pinguin1234 + + Support numeric 489 as ERR_SECUREONLYCHAN (#1193, #1196). By + Michael Hansen + + Improve support for building Irssi in Termux-Android with + Meson (#1199) + + Add usermode key to Irssi::Irc::Chatnet in Perl (#1288). By + Jessica Sophie Porter + + Add format_string_expand and format_string_unexpand + functions to Perl (#1286) + + Add ...->format_create_dest(...)->printformat("format", + args...) and ...->printformat_module("module", "format", + args...) methods to Perl (#1284) + + You can avoid any CORE::GLOBAL::caller hacks using the + printformat_module method, especially sind that hack was not + safe during signal emissions + + + Add tracking of user accounts in the channel nicklist using + WHOX on join (#1250) + + Add auto-loading of the Perl and otr module from /SET + autoload_modules (#1295) + + Add /IGNORE ... NOHILIGHT to ignore some hilights (#1260) + + Do not beep on hidden lines with /SET beep_msg_level + ... -HIDDEN (#1259) + + Added /CS, /MS, /NS, and /OS aliases to the default config + (#1316). By Mathis Beer + + Allow -tls_ca{file,path} '' to unset an argument (#730, + #1060, an#30) + + Add a "server outgoing modify" signal to intercept outgoing + messages (#1148, #1151, an#15, an#43). Original by + JustAnotherArchivist + - remove some hard-coded 510 byte assumptions (#1086) + - Several fixes for error checks in SSL (#944, #1037, #943, + #1036). Reported by Chi Li + - Wrong variable tested in mask_match (#902, #1035) + - Fix bug where irssi-proxy with `?'-port would not reconnect + (#1041) + - Allow shrinking of /SET rawlog_lines (#957, #1020). By + Marcus "Teschi" Prinz + - Fix /WINDOW BALANCE warning (#1054) + - fix overflow when first command history entry expires + (#1070) + - begin modularising IRC module (#1067, #1112, #1113) + - fix some memory leaks in /DCC RESUME and settings_add + (#1077). By Zero King + - fix cut-off text with theme_indent module and /SET + indent_always OFF (#1078) + - fix the cap_queue order (#1095) + - add reference counted strings (#1089) + - Fix irc_op_public messages not triggering hilights (#354, + #891, #1129). By Dan Collins + - Fix /IGNORE not setting the right level in irc_op_public + messages (#1280). Credit to oss-fuzz + - Fix GTimeVal deprecation (#1141, #1144, #1145, #1350, an#44) + + If multi-version compatibility is desired, module authors + can find an example of backwards compatible code in + cdidier/irssi-xmpp#53 + + - Fix /IGNORE ... MODES NO_ACT not working (#1164) + - Deprecated -ssl* options are hidden from tab completion + (#1171) + - Make /SET actlist_sort a choice type (#1198) + - Fix crash from self-unloading script (#1206). By Thomas + Stagner + - Fix crash during Perl signal emission (#1233, #1234) + - Fix a case where empty lines or comments inside channels or + servers in the config would confuse Irssi (#1062, #1242, + #1243) + - Fix reported freezing in DCC GET on slow disks (#159, #1271) + - Fix message-tags parsing (#1274, #1275). Credit to oss-fuzz + - Fail redirects when receiving numeric 263 (RPL_TRYAGAIN) in + response to /WHO (#1283) + - Some updates to .gitignore (#1302). By Rene Kita + - Fix build on operating systems with X/Open Curses, version 2 + (#1305, #1308). By Nia Alarie (Regression introduced with + #1290, alternative fix for Irssi 1.2.3 no-term.h.patch) + - Fix otr module not using g_strndup, e.g. on Solaris 10 + (#1315). By Claes Nästén + - Fix cursor getting stuck for auto completions that changes + case (#1176, #1322, an#8). By ffrogman + - Restore operation of tag/* in /SET activity_hide_targets + (#1337, an#11) nb. the ::all syntax was working in Irssi 1.1 + and 1.2 (and continues to work) + - Fix /SERVER ADD -matrix -network my_matrix_network + (an#12). By Andrej Kacian + - Fix /SERVER ADD creating duplicated entries in the config + file (#1317, an#22, an#41) + - Fix critical when SASL user is set and SASL password is + empty (#1325, an#21) + - Misc fixes (#1106, #1141, #1272, #1297, an#35) + - Fuzz fixes (#1116, #1117, #1119, #1125, #1126, an#20) + - Build system fixes (#1101, #1102, #1069, #1140, #1181, #1253) + - Sync docs and scripts (an#39) + - Text and Help updates + - add -tls_* options to manual (#1029, #1030). By Jacob + V. Rasmussen + - missing targets in /MSG (#1032) + - wrong parameter in /ECHO (#1024) + - Spelling in OTR (#1047). By David Gall + - Clarify statusbar priority (#1049). By Marius Gedminas + - Document get_irssi_dir in Perl (#1051, #1052). By Alex + Shafer + - typo in /HILIGHT help (#1081). By DFrostByte + - improved clarity of your_nick_owned (#1138). By Mike Quin + - Update some URLs to https (#1163) + - Add documentation for escaping some characters (#1329, + #1330, an#9). By Guntbert Reiter + - Fix some typos (#1336, an#10). By Francis Mteo + - Document $abiversion and parse_special (an#38). By bw1 + - Infrastructure updates: + - Support for Github Actions (#1039, #1103, #1160, #1212, + #1231, #1252, #1261, an#40) + - Run clang-format on pull requests (#1172, #1173, #1184, + #1230, #1247, #1287) + - Run abidiff on pull requests (#1179, #1195) + - Test CI-Fuzz (#1279, #1304, an#17) + ------------------------------------------------------------------- Mon May 9 18:41:36 UTC 2022 - Andreas Stieger diff --git a/irssi.spec b/irssi.spec index 7d91551..07932f0 100644 --- a/irssi.spec +++ b/irssi.spec @@ -16,9 +16,8 @@ # -%bcond_with socks Name: irssi -Version: 1.2.3 +Version: 1.4.1 Release: 0 Summary: Modular IRC Client License: GPL-2.0-or-later @@ -28,12 +27,9 @@ Source: https://github.com/irssi/irssi/releases/download/%{version}/irss Source1: irssi.desktop Source2: irssi.png Source3: https://github.com/irssi/irssi/releases/download/%{version}/irssi-%{version}.tar.xz.asc -# https://sks-keyservers.net/pks/lookup?op=get&search=0x00CCB587DDBEF0E1 +# https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 Source4: %{name}.keyring -Source99: irssi-rpmlintrc -# PATCH-FIX-OPENSUSE irssi-0.8.16_missing_prototype_warnings.patch -Patch1: irssi-0.8.16_missing_prototype_warnings.patch -Patch2: irssi-1.2.3-add-libera.patch +BuildRequires: meson BuildRequires: glib2-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -51,9 +47,6 @@ BuildRequires: libotr-devel %if 0%{?suse_version} > 1330 && 0%{?sle_version} == 0 BuildRequires: utf8proc-devel %endif -%if %{with socks} -BuildRequires: dante-devel -%endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -79,38 +72,22 @@ compile plugins for the irssi package. %prep %setup -q -%patch1 -%patch2 -p1 %build -export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS" -export CFLAGS="$CFLAGS -fPIE" -export LDFLAGS="-pie" - -%configure \ - --disable-silent-rules \ - --enable-ipv6 \ - --with-bot \ - --with-proxy \ - %if %{with socks} - --with-socks \ - %endif - --enable-dane \ - --enable-ssl \ - --with-ncurses \ - --with-terminfo \ - --enable-true-color \ - --with-perl=yes \ +%meson \ + -Ddocdir="%{_docdir}/%{name}" \ + -Denable-true-color=yes \ + -Dwith-proxy=yes \ + -Dwith-perl=yes \ + -Dwith-perl-lib=vendor \ %if 0%{?suse_version} > 1330 - --with-otr=module \ + -Dwith-otr=yes \ %endif - --with-perl-lib=vendor -%make_build all +# +%meson_build %install -%make_install docdir=%{_docdir}/%{name} V=1 -%perl_process_packlist -rm %{buildroot}%{_libdir}/irssi/modules/lib*.{a,la} +%meson_install install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/irssi.png" @@ -120,8 +97,6 @@ install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/irssi.png" %endif %files -%config(noreplace) %{_sysconfdir}/irssi.conf -%{_bindir}/botti %{_bindir}/irssi # modules %dir %{_libdir}/irssi @@ -130,7 +105,7 @@ install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/irssi.png" # scripts & themes %dir %{_datadir}/%{name} %{_datadir}/%{name}/* -#perl +# perl %dir %{perl_vendorarch}/Irssi %{perl_vendorarch}/Irssi.pm %{perl_vendorarch}/Irssi/* @@ -145,5 +120,6 @@ install -D -m0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/irssi.png" %files devel %{_includedir}/irssi/ +%{_libdir}/pkgconfig/irssi*.pc %changelog