Internet Relay Chat was created in 1988 and has hardly changed. It can be used to exchange text messages (one message = single line) with other people, either privately (called query, PM, private message, MSG) or in a room (channel). Pictures are shared by uploading them to a temporary host like https://pomf.lain.la/ and then pasting the HTTP links. Code snippets or longer texts are shared by pasting them to a Pastebin like https://paste.opensuse.org/ and then sharing the HTTP link.
+IRC does not have message history. You can only receive replies while your computer is turned on and connected to the channel you want to follow. Some people run their IRC programs on remote servers for that reason.
+IRC is organised into networks. Each network consists of many servers. It (mostly) does not matter which server you connect to as long as it belongs to the network you want to use. Irssi supports connections to many networks at the same time.
+Each network contains many channels, rooms that are often dedicated to discussing a specific topic. You can find many channels on https://netsplit.de/ or using a search engine with the keyword “IRC”. Irssi supports joining many channels at the same time.
+There is a rather large IRC network catering to free and open-source software and peer directed projects at https://libera.chat/ and a smaller one at https://www.oftc.net/ – many free software projects still have support channels on these IRC networks (although some have moved to Matrix or proprietary platforms like Discord).
+After (compiling and) installing Irssi, to start it, open a shell (Terminal) and type:
+irssi +
You should be greeted by a blinking cursor behind [(status)]. You are now in the status window of Irssi. Window is the Irssi name for what you might nowadays call a “Web browser tab”.
If you’re confused about what you are seeing on the Irssi screen, you can find an annotated screenshot of it at User interface.
+If you want, you can pick a nick name (handle) that will be shown to others reading your messages now, by typing
+/set nick whatyouwant +
Each command or message can be sent by pressing Enter. Commands in Irssi start with a /. If there is no /, then the line that you wrote will be sent as a message to the channel that you have open, for everyone to see.
Type /quit to get out of Irssi.
Irssi comes with some predefined networks. You can see the current list of networks by typing
+/network +
(the list will be shown in your status window)
+To connect to one of the networks in the list, type /connect networkname, for example:
/connect liberachat +
You should see several messages scroll by. After a while, you should be connected to the Libera Chat network.
+Attention
+Irssi version 1.2 or older may be lacking the liberachat network entry. See https://github.com/shabble/irssi-docs/wiki/liberachat for how to add it.
+Many IRC networks (but not all) offer a way to register a user account. Sometimes (but not on all networks) the account registration also includes reserving a nick for you. How to register also differs by network. Some channels only allow users with registered accounts to join them, so it may be very important for you to register a user account.
+User accounts are always specific to a network.
+For the Libera Chat network, you can find instructions how to register and set up your account with Irssi on https://github.com/shabble/irssi-docs/wiki/liberachat#configure-sasl-automated-log-in
+Once you are connected to a network, you can join channels by typing /join #channelname, for example:
/join #irssi +
Now, a new window will open and you can send messages to the channel.
+You can change between windows using the Ctrl+n or Ctrl+p keys, or–if your terminal is configured properly–using Alt+1, Alt+2, … See bind -list for a list of all default key bindings.
By default, Irssi shows when someone joins or leaves a channel. These messages can waste a lot of lines and obscure the actual chat. To hide them, type
+/window hidelevel +joins +parts +quits +
To get them back
+/window hidelevel -joins -parts -quits +
If you want to hide them by default, /set window_default_hidelevel hidden joins parts quits
If you want to join a network that is not there, you first need to find at least one server of that network. Let’s say you have found the room #hackint on netsplit.de and want to join it. Then you can find that the server is irc.hackint.org, port 6697, SSL (TLS) on. To add it to Irssi, use the commands:
+/network add hackint +/server add -tls -network hackint irc.hackint.org 6697 +
Then, you can connect to the newly added network with
+/connect hackint +
If you are connected to multiple networks, you can change which one you are “talking” to (which one to send commands) by using the Ctrl+x key in the status window.
Most /commands have a help page, you can read it with
+/help commandname +
or on-line.
+The settings that can be changed with /SET are described on Settings Documentation – the settingshelp script can be used to read it from within /help
You can enhance your Irssi by installing scripts. Many Perl scripts written by other Irssi users can be found on https://scripts.irssi.org/
+Most of them should be compatible with Irssi 1.4 (but some may not, also see the Full Change log for some incompatible ones)
+Irssi’s look can be thoroughly changed with themes. Many themes created by other Irssi users can be found on https://themes.irssi.org/
+If you want to modify the look of Irssi yourself, the default theme which can be found in your ~/.irssi folder is a good starting point. It also has a few comments explaining what some of the abstracts are used for
A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help, then use the evil way of /SET term_force_colors ON.
A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t help, then use the evil way of /SET term_force_colors ON.
A: tmux, screen and dtach can be used to do it just fine.
+A: tmux, screen and dtach can be used to do it just fine.
A: Check here
\ No newline at end of file +A: Check here
diff --git a/docs/faq.txt b/docs/faq.txt index 0d0b5f461..0fcc156aa 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -4,8 +4,8 @@ Q: Why doesn’t irssi display colors even when ircii etc. displays them? A: They force ANSI colors even if terminal doesn’t support them. By default, irssi uses colors only if terminfo/termcap so says. The correct way to fix this would be to change your TERM environment to a value where colors work, like - xterm-color or color_xterm (eg. TERM=xterm-color irssi). If this doesn’t help, - then use the evil way of /SET term_force_colors ON. + xterm-256color or color_xterm (eg. TERM=xterm-256color irssi). If this doesn’t + help, then use the evil way of /SET term_force_colors ON. Q: How do I easily write text to channel that starts with ‘/’ character? A: / /text @@ -119,6 +119,6 @@ A: Check [6]here [1] https://github.com/irssi-import/xirssi [2] https://tmux.github.io/ [3] https://www.gnu.org/software/screen/screen.html - [4] http://dtach.sf.net/ + [4] https://sourceforge.net/projects/dtach/ [5] https://dgl.cx/irssi/hack-whois-in-current-window.pl [6] https://irssi.org/assets/irssi.wav diff --git a/docs/help/Makefile.am.gen b/docs/help/Makefile.am.gen deleted file mode 100644 index 917abe64a..000000000 --- a/docs/help/Makefile.am.gen +++ /dev/null @@ -1,13 +0,0 @@ -# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen - -helpdir = $(datadir)/irssi/help - -help_DATA = \ -@HELPFILES@ - -EXTRA_DIST = \ - Makefile.am.gen \ - $(help_DATA) \ - meson.build - -SUBDIRS = in diff --git a/docs/help/in/Makefile.am.gen b/docs/help/in/Makefile.am.gen deleted file mode 100644 index 9b0f2aaa1..000000000 --- a/docs/help/in/Makefile.am.gen +++ /dev/null @@ -1,5 +0,0 @@ -# Makefile.am is autogenerated by autogen.sh from Makefile.am.gen - -EXTRA_DIST = \ - Makefile.am.gen \ -@HELPFILES@ diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in index cfe66eba9..acb6e1ae4 100644 --- a/docs/help/in/admin.in +++ b/docs/help/in/admin.in @@ -15,7 +15,7 @@ %9Examples:%9 /ADMIN - /ADMIN irc.example.com + /ADMIN irc.libera.chat /ADMIN mike %9See also:%9 INFO diff --git a/docs/help/in/bind.in b/docs/help/in/bind.in index 8fcc744b4..761d971e3 100644 --- a/docs/help/in/bind.in +++ b/docs/help/in/bind.in @@ -17,13 +17,15 @@ Details: Adds or removes a binding; the binding itself is case-sensitive and may contain as many characters as you want. - Uppercase characters usually indicate that you need to keep the shift-key - pressed to use the binding. + Key bindings are case sensitive so uppercase letters mean you also have + to use the shift key, except for ctrl which does not support shift but + the keys must always be typed in uppercase. %9Examples:%9 /BIND /BIND meta-c /CLEAR + /BIND meta-C /CYCLE /BIND meta-q change_window 16 /BIND -delete meta-y /BIND ^W^C /WINDOW NEW HIDE diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in index 0e15b6d50..d9be8cf5f 100644 --- a/docs/help/in/channel.in +++ b/docs/help/in/channel.in @@ -33,12 +33,12 @@ /CHANNEL /CHANNEL LIST - /CHANNEL ADD -auto #irssi ExampleNet + /CHANNEL ADD -auto #irssi liberachat /CHANNEL ADD -auto #basementcat Quakenet secret_lair - /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet + /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout liberachat /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet - /CHANNEL MODIFY -noauto #irssi ExampleNet - /CHANNEL REMOVE #hideout ExampleNet + /CHANNEL MODIFY -noauto #irssi liberachat + /CHANNEL REMOVE #hideout liberachat %9Special Example:%9 diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in index 4d59dde13..4c6acc90b 100644 --- a/docs/help/in/connect.in +++ b/docs/help/in/connect.in @@ -17,6 +17,7 @@ -tls_ciphers: TLS cipher suite preference lists. -tls_pinned_cert: Pinned x509 certificate fingerprint. -tls_pinned_pubkey: Pinned public key fingerprint. + -nocap: Disable CAPREQ during connect -noproxy: Ignores the global proxy configuration. -network: The network this connection belongs to. -host: The hostname you would like to connect from. @@ -34,9 +35,9 @@ %9Examples:%9 - /CONNECT ExampleNet - /CONNECT -6 ExampleNet - /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com + /CONNECT liberachat + /CONNECT -6 liberachat + /CONNECT -4 -! -host staff.irssi.org -network liberachat irc.libera.chat /CONNECT irc.irssi.org 6667 WzerT8zq mike %9See also:%9 DISCONNECT, RMRECONNS, SERVER diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in index 88772e1e1..c53b1e60b 100644 --- a/docs/help/in/disconnect.in +++ b/docs/help/in/disconnect.in @@ -18,7 +18,7 @@ %9Examples:%9 - /DISCONNECT ExampleNet I'm off for today, take care! + /DISCONNECT liberachat I'm off for today, take care! /DISCONNECT * Vacation time :D /DISCONNECT diff --git a/docs/help/in/eval.in b/docs/help/in/eval.in index b2d4b6254..c53c62484 100644 --- a/docs/help/in/eval.in +++ b/docs/help/in/eval.in @@ -10,13 +10,23 @@ %9Description:%9 Evaluates the given commands and executes them; you can use internal - variables and separate multiple commands by using the ';' character. + variables and separate multiple commands by using the `;' character. + If the command contains a string with `$', `\' or `;' those characters + need to be escaped: + + `$' -> `$$' + `\' -> `\\' (or even `\\\\', depending on where they are used) + `;' -> `\;' %9Examples:%9 /EVAL echo I am connected to ${S} on ${chatnet} as ${N} /EVAL echo My user privileges are +${usermode}; echo Let's party! + to print `1;2$3\4': + + /EVAL echo 1\;2$$3\\4 + %9References:%9 https://github.com/irssi/irssi/blob/master/docs/special_vars.txt diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in index 0fbf970d3..26dd63bb7 100644 --- a/docs/help/in/ignore.in +++ b/docs/help/in/ignore.in @@ -14,6 +14,8 @@ -network: Ignores only on a specific network. -channels: Ignores only on specific channels. -time: The timeout to automatically remove the ignore. + Accepts units specified in days, hours, minutes, seconds, + milliseconds, or no unit for seconds. The mask, channels and levels to ignore; if no argument is provided, the list of ignores will be displayed. @@ -27,6 +29,8 @@ because it is allowed in addition to other ignores for the same target. The special level 'HIDDEN' can be used to hide matching messages that can later be revealed using /WINDOW HIDELEVEL -HIDDEN + The special level 'NOHILIGHT' can be used to suppress hilights without actually + ignoring the message. %9Examples:%9 @@ -44,6 +48,8 @@ /IGNORE #irssi NO_ACT JOINS PARTS QUITS /IGNORE mike NO_ACT -MSGS /IGNORE mike HIDDEN PUBLIC JOINS PARTS QUITS + /IGNORE -time 5days christmas PUBLICS + /IGNORE -time 300 mike PUBLICS %9See also:%9 ACCEPT, SILENCE, UNIGNORE diff --git a/docs/help/in/info.in b/docs/help/in/info.in index 415785016..d8d8cfc98 100644 --- a/docs/help/in/info.in +++ b/docs/help/in/info.in @@ -15,7 +15,7 @@ %9Examples:%9 /INFO - /INFO irc.example.com + /INFO irc.libera.chat %9See also:%9 ADMIN diff --git a/docs/help/in/join.in b/docs/help/in/join.in index 55190267d..adf7158e8 100644 --- a/docs/help/in/join.in +++ b/docs/help/in/join.in @@ -20,7 +20,7 @@ /JOIN #irssi /JOIN #basementcat secret_lair /JOIN -invite - /JOIN -ExampleNet #github,#example,#irssi + /JOIN -liberachat #github,#libera,#irssi %9See also:%9 KICK, PART diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in index 3e2fdbdb4..ce8f9aa02 100644 --- a/docs/help/in/knock.in +++ b/docs/help/in/knock.in @@ -23,7 +23,7 @@ %9Examples:%9 /KNOCK #irssi - /KNOCK #example + /KNOCK #libera /KNOCK #github %9See also:%9 INVITE, JOIN diff --git a/docs/help/in/levels.in b/docs/help/in/levels.in index 99f3070ae..3c61263dd 100644 --- a/docs/help/in/levels.in +++ b/docs/help/in/levels.in @@ -20,9 +20,10 @@ MODES A channel mode is modified. MSGS Private messages. NICKS A nickname changes to another nickname. - NOTICES Notices sent from a nickname. + NOTICES Private notices. PARTS A nickname leaves a channel. PUBLIC Public messages in a channel. + PUBNOTICES Public notices in a channel. QUITS A nickname disconnects from IRC. SNOTES Notices sent from a server. TOPICS A channel topic is modified. @@ -35,6 +36,7 @@ HIDDEN Hides the message when window HIDELEVEL includes HIDDEN. NO_ACT Doesn't trigger any activity in the statusbar. NOHILIGHT The text is not highlighted. + Suppresses hilights when used with /ignore. When using levels from Irssi scripts, you need to prepend the level with 'MSGLEVEL_'; for example 'CRAP' becomes 'MSGLEVEL_CRAP'. diff --git a/docs/help/in/log.in b/docs/help/in/log.in index dfe26e30e..3ca8782ce 100644 --- a/docs/help/in/log.in +++ b/docs/help/in/log.in @@ -33,10 +33,10 @@ %9Examples:%9 /LOG OPEN -targets mike ~/irclogs/mike.log MSGS - /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d + /LOG OPEN -targets #irssi ~/irclogs/liberachat/irssi-%%Y-%%m-%%d + /LOG CLOSE ~/irclogs/liberachat/irssi-%%Y-%%m-%%d + /LOG STOP ~/irclogs/liberachat/irssi-%%Y-%%m-%%d + /LOG START ~/irclogs/liberachat/irssi-%%Y-%%m-%%d /SET autolog ON diff --git a/docs/help/in/lusers.in b/docs/help/in/lusers.in index f9edf5355..99089fb78 100644 --- a/docs/help/in/lusers.in +++ b/docs/help/in/lusers.in @@ -5,7 +5,7 @@ %9Parameters:%9 - The server to search on and the remote sever to search on; if no arguments + The server to search on and the remote server to search on; if no arguments are given, the active server will be used. %9Description:%9 diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in index ee1233b2f..6e86681ef 100644 --- a/docs/help/in/motd.in +++ b/docs/help/in/motd.in @@ -15,7 +15,7 @@ %9Examples:%9 /MOTD - /MOTD irc.example.com + /MOTD irc.libera.chat /MOTD bob %9See also:%9 ADMIN, INFO, LINKS, MAP diff --git a/docs/help/in/names.in b/docs/help/in/names.in index deccea403..974b845f7 100644 --- a/docs/help/in/names.in +++ b/docs/help/in/names.in @@ -21,7 +21,7 @@ %9Examples:%9 /NAMES -ops - /NAMES -voices #irssi,#example + /NAMES -voices #irssi,#libera %9See also:%9 JOIN, PART, WHO, WHOIS diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in index 68d789d60..9f5167307 100644 --- a/docs/help/in/nctcp.in +++ b/docs/help/in/nctcp.in @@ -15,7 +15,7 @@ %9Examples:%9 /NCTCP #irssi VERSION King of the Jungle v1.0 - /NCTCP bob,#example USERINFO I am bob :p + /NCTCP bob,#libera USERINFO I am bob :p %9See also:%9 CTCP diff --git a/docs/help/in/network.in b/docs/help/in/network.in index 183fd5b5c..16ff9f47b 100644 --- a/docs/help/in/network.in +++ b/docs/help/in/network.in @@ -18,7 +18,8 @@ -usermode: Specifies the user modes to set on yourself. -autosendcmd: Specifies the commands, separated by the ';' character, and enclosed within two "'" characters, to perform after - connecting. + connecting. + (Some characters need to be escaped - see /help eval) -querychans: Specifies the maximum number of channels to put in one MODE or WHO command when synchronizing. -whois: Specifies the maximum number of nicknames in one WHOIS @@ -35,8 +36,8 @@ -cmdmax: Specifies the maximum number of commands to perform before starting the internal flood protection. -sasl_mechanism Specifies the mechanism to use for the SASL authentication. - At the moment irssi only supports the 'plain' and the - 'external' mechanisms. + Irssi supports: PLAIN, EXTERNAL, SCRAM-SHA-1, SCRAM-SHA-256 + and SCRAM-SHA-512 Use '' to disable the authentication. -sasl_username Specifies the username to use during the SASL authentication. -sasl_password Specifies the password to use during the SASL authentication. @@ -59,11 +60,11 @@ %9Examples:%9 /NETWORK ADD -usermode +giw EFnet - /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet - /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet + /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org liberachat + /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' liberachat /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet /NETWORK MODIFY -usermode +gi EFnet - /NETWORK REMOVE ExampleNet + /NETWORK REMOVE liberachat %9See also:%9 CHANNEL, CONNECT, SERVER diff --git a/docs/help/in/otr.in b/docs/help/in/otr.in index f76a2d532..fcfcd8752 100644 --- a/docs/help/in/otr.in +++ b/docs/help/in/otr.in @@ -51,7 +51,7 @@ GENKEYTo create a “tabular” effect of the chat view, or to align nick names in a column, you can use Irssi’s theme/format system. The basic commands are the following:
+/format own_msg {ownmsgnick $2 {ownnick $[-9]0}}$1
+/format own_msg_channel {ownmsgnick $3 {ownnick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_me {pubmsgmenick $2 {menick $[-9]0}}$1
+/format pubmsg_me_channel {pubmsgmenick $3 {menick $[-9]0}{msgchannel $1}}$2
+/format pubmsg_hilight {pubmsghinick $0 $3 $[-9]1}$2
+/format pubmsg_hilight_channel {pubmsghinick $0 $4 $[-9]1{msgchannel $2}}$3
+/format pubmsg {pubmsgnick $2 {pubnick $[-9]0}}$1
+/format pubmsg_channel {pubmsgnick $3 {pubnick $[-9]0}{msgchannel $1}}$2
+These are copied from the default theme’s default values, which are responsible for displaying your own messages sent to a channel (own_msg) as well as received messages (pubmsg) and the two basic highlightings (me and hilight).
Then, in front of the argument that contains the nick name ($0 in most cases, but $1 in pubmsg_hilight), an alignment modifier (see Appendix B: Special Variables and Expandos) has been added: [-9]. This means that the nicks will be right-aligned and truncated to 9 characters.
Note: Modifiers only work in the /format section of a theme (this may change in the future)
There are also some scripts that try to do the alignment for you, like: nm, nm2.
There are also some nice themes that extend the alignment to further formats, like: weed.
+Please check here => Automatic log-in to NickServ
+CertFP, short for Certificate Finger Print, is another method to log you in to NickServ. Instead of a password, it uses a Client Certificate.
+In order to use it, you
+first need a certificate,
then configure Irssi to use this certificate,
and finally register the certificate with NickServ.
Irssi does not have built-in certificate management commands, so you need to use an external tool like openssl to create the certificate.
A step-by-step guide for the Libera Chat network can be found here => https://github.com/shabble/irssi-docs/wiki/liberachat_certfp
+It is necessary that the certificate be available as a file; PKCS#11 is not supported.
+Tor is an overlay network for anonymous communication. It operates a local SOCKS proxy for applications to use.
+Unfortunately, Irssi currently does not support SOCKS proxies natively. As a workaround, you can install the ProxyChains-NG program (note, it must be the NG version).
+Afterwards, you can launch Irssi like this:
+proxychains4 irssi +
Now your connections will go through the Proxy configured in ProxyChains-NG (Tor by default).
+IRC networks may have different requirements to be able to connect via Tor. For the Libera Chat network, you will first need to set up CertFP Log-in using a clearnet connection, and then connect to their Onion Service palladium.libera.chat. More detailed instructions can be found here => https://github.com/shabble/irssi-docs/wiki/liberator
If you see such a message
+Err:4 home:/ailin_nemui:/irssi-an InRelease + The following signatures were invalid: EXPKEYSIG EDB7AED941EEDB57 home:ailin_nemui OBS Project <home:ailin_nemui@build.opensuse.org> +
this means that the automatic signing key used by the Open Build Service expired. OBS renews the key periodically, but Debian does not support this.
+Download the key again, following the regular OBS instructions. If it still does not work, verify if there is a second expired copy of the key in /etc/apt/trusted.gpg.d or in apt-key list and remove it as well.
And to connect to one of those networks and join a channel:
-/CONNECT ExampleNet
+/CONNECT liberachat
/JOIN #irssi
@@ -94,7 +94,7 @@ 1. First steps
If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
These commands have many more options, see their help for details:
@@ -226,7 +226,7 @@ 3. Server and channel automation
And finally channels:
-/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
/CHANNEL ADD -auto #secret IRCnet password
@@ -395,7 +395,7 @@ 9. Changing keyboard bindings
/HELP bind tells pretty much everything there is to know about keyboard bindings. However, there’s the problem of how to bind some non-standard keys. They might differ a bit with each terminal, so you’ll need to find out what exactly the keypress produces. Easiest way to check that would be to see what it prints in cat. Here’s an example for pressing F1 key:
- [user@host] ~% cat
+ [cras@hurina] ~% cat
^[OP
@@ -515,11 +515,11 @@ 10. Proxies and IRC bouncers
SOCKS
-Irssi can be compiled with socks support (--with-socks option to configure), which requires “dante” and routes all connections through the proxy specified in the system-wide /etc/socks.conf. This method is known to have issues in Mac OS X.
+Using proxychains-ng is recommended for using irssi with a socks proxy.
-Note that /SET proxy settings don’t have anything to do with socks.
+Irssi does not support socks proxy natively.
-Using proxychains-ng is recommended over recompiling irssi.
+Note that /SET proxy settings don’t have anything to do with socks.
Others
@@ -683,4 +683,4 @@ 12. Statusbar
/STATUSBAR <name> REMOVE <item>
-For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: /STATUSBAR window ADD -before act mail.
\ No newline at end of file
+For statusbar scripts, the item name is usually equivalent to the script name. The documentation of the script ought to tell you if this is not the case. For example, to add mail.pl before the window activity item, use: /STATUSBAR window ADD -before act mail.
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 84397f334..5cc86af37 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
And to connect to one of those networks and join a channel:
-/CONNECT LiberaChat
+/CONNECT liberachat
/JOIN #irssi
To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
If you have irssi 0.8.18 or higher and the irc network supports it, you can use
SASL instead of nickserv, which is more reliable:
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN liberachat
These commands have many more options, see their help for details:
@@ -218,7 +218,7 @@ IRC network, other servers are automatically connected in same network if the
And finally channels:
-/CHANNEL ADD -auto -bots *!*user@host -botcmd "/^msg $0 op pass" #irssi efnet
+/CHANNEL ADD -auto -bots *!*bot@host.org -botcmd "/^msg $0 op pass" #irssi efnet
/CHANNEL ADD -auto #secret IRCnet password
-bots and -botcmd should be the only ones needing a bit of explaining. They’re
@@ -442,7 +442,7 @@ They might differ a bit with each terminal, so you’ll need to find out what
exactly the keypress produces. Easiest way to check that would be to see what
it prints in cat. Here’s an example for pressing F1 key:
- [user@host] ~% cat
+ [cras@hurina] ~% cat
^[OP
So in irssi you would use /BIND ^[OP /ECHO F1 pressed. If you use multiple
@@ -578,14 +578,11 @@ Irssi proxy works fine with other IRC clients as well.
SOCKS
-Irssi can be compiled with socks support (--with-socks option to configure),
-which requires “dante” and routes all connections through the proxy specified
-in the system-wide /etc/socks.conf. This method is known to have issues in Mac
-OS X.
+Using [4]proxychains-ng is recommended for using irssi with a socks proxy.
-Note that /SET proxy settings don’t have anything to do with socks.
+Irssi does not support socks proxy natively.
-Using [4]proxychains-ng is recommended over recompiling irssi.
+Note that /SET proxy settings don’t have anything to do with socks.
Others
diff --git a/irssi-1.pc.in b/irssi-1.pc.in
deleted file mode 100644
index a1c00f5c7..000000000
--- a/irssi-1.pc.in
+++ /dev/null
@@ -1,20 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-prog_libs="@PROG_LIBS@"
-common_libs="@COMMON_LIBS@"
-
-perl_link_libs="@PERL_LINK_LIBS@"
-perl_fe_link_libs="@PERL_FE_LINK_LIBS@"
-perl_link_flags="@PERL_LINK_FLAGS@"
-
-chat_modules="@CHAT_MODULES@"
-irc_modules="@irc_MODULES@"
-
-Name: Irssi
-Description: Irssi chat client
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @OPENSSL_CFLAGS@
-Requires: glib-2.0
\ No newline at end of file
diff --git a/irssi.conf b/irssi.conf
index 9faa89733..010520fd5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,19 +1,18 @@
servers = (
- { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
- { address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; tls_verify = "no"; },
- { 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.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
- { address = "ssl.ircnet.ovh"; chatnet = "IRCnet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
- { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
- { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
- { address = "irc.libera.chat"; chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
- { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
- { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
- { address = "irc.quakenet.org"; chatnet = "QuakeNet"; port = "6667"; },
- { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
- { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
- { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; }
+ { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
+ { address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+ { address = "irc.esper.net"; chatnet = "EsperNet"; 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 = "ssl.ircnet.ovh"; chatnet = "IRCnet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+ { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
+ { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
+ { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
+ { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+ { address = "irc.quakenet.org"; chatnet = "QuakeNet"; port = "6667"; },
+ { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+ { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
+ { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; }
);
chatnets = {
@@ -35,7 +34,7 @@ chatnets = {
max_msgs = "4";
max_whois = "1";
};
- Freenode = {
+ liberachat = {
type = "IRC";
max_kicks = "1";
max_msgs = "4";
@@ -59,12 +58,6 @@ chatnets = {
max_msgs = "4";
max_whois = "1";
};
- LiberaChat = {
- type = "IRC";
- max_kicks = "1";
- max_msgs = "4";
- max_whois = "1";
- };
NetFuze = {
type = "IRC";
max_kicks = "1";
@@ -101,16 +94,15 @@ chatnets = {
};
channels = (
- { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
- { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; },
- { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
- { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; },
- { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
- { name = "#libera"; chatnet = "LiberaChat"; autojoin = "No"; },
- { name = "#irssi"; chatnet = "LiberaChat"; autojoin = "No"; },
- { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
- { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
- { name = "silc"; chatnet = "SILC"; autojoin = "No"; }
+ { name = "#lobby"; chatnet = "EsperNet"; 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"; },
+ { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
+ { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
+ { name = "silc"; chatnet = "SILC"; autojoin = "No"; }
);
aliases = {
@@ -155,6 +147,7 @@ aliases = {
SAY = "MSG *";
SB = "SCROLLBACK";
SBAR = "STATUSBAR";
+ SHELP = "QUOTE HELP";
SIGNOFF = "QUIT";
SV = "MSG * Irssi $J ($V) - https://irssi.org";
T = "TOPIC";
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
deleted file mode 100644
index 5b7c84c0d..000000000
--- a/m4/glib-2.0.m4
+++ /dev/null
@@ -1,208 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor 1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-
- pkg_config_args=glib-2.0
- for module in . $4
- do
- case "$module" in
- gmodule)
- pkg_config_args="$pkg_config_args gmodule-2.0"
- ;;
- gmodule-no-export)
- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
- ;;
- gobject)
- pkg_config_args="$pkg_config_args gobject-2.0"
- ;;
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
-
- PKG_PROG_PKG_CONFIG([0.7])
-
- no_glib=""
-
- if test "x$PKG_CONFIG" = x ; then
- no_glib=yes
- PKG_CONFIG=no
- fi
-
- min_glib_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
- if test "x$PKG_CONFIG" != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
- enable_glibtest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
- :
- else
- no_glib=yes
- fi
- fi
-
- if test x"$no_glib" = x ; then
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_glibtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.glibtest
- AC_TRY_RUN([
-#include
-#include
-#include
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_glib_version");
- exit(1);
- }
-
- if ((glib_major_version != $glib_config_major_version) ||
- (glib_minor_version != $glib_config_minor_version) ||
- (glib_micro_version != $glib_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
- (glib_minor_version != GLIB_MINOR_VERSION) ||
- (glib_micro_version != GLIB_MICRO_VERSION))
- {
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- }
- else
- {
- if ((glib_major_version > major) ||
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
- else
- if test -f conf.glibtest ; then
- :
- else
- echo "*** Could not run GLIB test program, checking why..."
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- AC_TRY_LINK([
-#include
-#include
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GLIB_CFLAGS=""
- GLIB_LIBS=""
- GLIB_GENMARSHAL=""
- GOBJECT_QUERY=""
- GLIB_MKENUMS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- AC_SUBST(GLIB_GENMARSHAL)
- AC_SUBST(GOBJECT_QUERY)
- AC_SUBST(GLIB_MKENUMS)
- rm -f conf.glibtest
-])
diff --git a/m4/glibtests.m4 b/m4/glibtests.m4
deleted file mode 100644
index 7d5920a43..000000000
--- a/m4/glibtests.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl GLIB_TESTS
-dnl
-
-AC_DEFUN([GLIB_TESTS],
-[
- AC_ARG_ENABLE(installed-tests,
- AS_HELP_STRING([--enable-installed-tests],
- [Enable installation of some test cases]),
- [case ${enableval} in
- yes) ENABLE_INSTALLED_TESTS="1" ;;
- no) ENABLE_INSTALLED_TESTS="" ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
- esac])
- AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
- AC_ARG_ENABLE(always-build-tests,
- AS_HELP_STRING([--enable-always-build-tests],
- [Enable always building tests during 'make all']),
- [case ${enableval} in
- yes) ENABLE_ALWAYS_BUILD_TESTS="1" ;;
- no) ENABLE_ALWAYS_BUILD_TESTS="" ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
- esac])
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
- if test "$ENABLE_INSTALLED_TESTS" = "1"; then
- AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
- AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
- fi
-])
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
deleted file mode 100644
index c67cfecef..000000000
--- a/m4/libgcrypt.m4
+++ /dev/null
@@ -1,143 +0,0 @@
-# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Last-changed: 2014-10-02
-
-
-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
-dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
-dnl this features allows to prevent build against newer versions of libgcrypt
-dnl with a changed API.
-dnl
-dnl If a prefix option is not used, the config script is first
-dnl searched in $SYSROOT/bin and then along $PATH. If the used
-dnl config script does not match the host specification the script
-dnl is added to the gpg_config_script_warn variable.
-dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_REQUIRE([AC_CANONICAL_HOST])
- AC_ARG_WITH(libgcrypt-prefix,
- AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
- [prefix where LIBGCRYPT is installed (optional)]),
- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
- if test x"${LIBGCRYPT_CONFIG}" = x ; then
- if test x"${libgcrypt_config_prefix}" != x ; then
- LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
- else
- case "${SYSROOT}" in
- /*)
- if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
- LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
- fi
- ;;
- '')
- ;;
- *)
- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
- ;;
- esac
- fi
- fi
-
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
- tmp=ifelse([$1], ,1:1.2.0,$1)
- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
- req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
- min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
- else
- req_libgcrypt_api=0
- min_libgcrypt_version="$tmp"
- fi
-
- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
- ok=no
- if test "$LIBGCRYPT_CONFIG" != "no" ; then
- req_major=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
- req_minor=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- req_micro=`echo $min_libgcrypt_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
- major=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
- minor=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- micro=`echo $libgcrypt_config_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
- if test "$major" -gt "$req_major"; then
- ok=yes
- else
- if test "$major" -eq "$req_major"; then
- if test "$minor" -gt "$req_minor"; then
- ok=yes
- else
- if test "$minor" -eq "$req_minor"; then
- if test "$micro" -ge "$req_micro"; then
- ok=yes
- fi
- fi
- fi
- fi
- fi
- fi
- if test $ok = yes; then
- AC_MSG_RESULT([yes ($libgcrypt_config_version)])
- else
- AC_MSG_RESULT(no)
- fi
- if test $ok = yes; then
- # If we have a recent libgcrypt, we should also check that the
- # API is compatible
- if test "$req_libgcrypt_api" -gt 0 ; then
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
- if test "$tmp" -gt 0 ; then
- AC_MSG_CHECKING([LIBGCRYPT API version])
- if test "$req_libgcrypt_api" -eq "$tmp" ; then
- AC_MSG_RESULT([okay])
- else
- ok=no
- AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
- fi
- fi
- fi
- fi
- if test $ok = yes; then
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
- ifelse([$2], , :, [$2])
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
- if test x"$libgcrypt_config_host" != xnone ; then
- if test x"$libgcrypt_config_host" != x"$host" ; then
- AC_MSG_WARN([[
-***
-*** The config script $LIBGCRYPT_CONFIG was
-*** built for $libgcrypt_config_host and thus may not match the
-*** used host $host.
-*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script or use \$SYSROOT.
-***]])
- gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
- fi
- fi
- else
- LIBGCRYPT_CFLAGS=""
- LIBGCRYPT_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(LIBGCRYPT_CFLAGS)
- AC_SUBST(LIBGCRYPT_LIBS)
-])
diff --git a/m4/libotr.m4 b/m4/libotr.m4
deleted file mode 100644
index 80b25f86b..000000000
--- a/m4/libotr.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-dnl
-dnl Off-the-Record Messaging library
-dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov
-dnl
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of version 2.1 of the GNU Lesser General
-dnl Public License as published by the Free Software Foundation.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-dnl
-
-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate.
-dnl enables arguments --with-libotr-prefix=
-dnl --with-libotr-inc-prefix=
-dnl
-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT
-dnl
-dnl Adapted from alsa.m4, originally by
-dnl Richard Boulton
-dnl Christopher Lansdown
-dnl Jaroslav Kysela
-
-AC_DEFUN([AM_PATH_LIBOTR],
-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
-libotr_save_CFLAGS="$CFLAGS"
-libotr_save_LDFLAGS="$LDFLAGS"
-libotr_save_LIBS="$LIBS"
-libotr_found=yes
-
-dnl
-dnl Get the cflags and libraries for libotr
-dnl
-AC_ARG_WITH(libotr-prefix,
-[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)],
-[libotr_prefix="$withval"], [libotr_prefix=""])
-
-AC_ARG_WITH(libotr-inc-prefix,
-[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)],
-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""])
-
-dnl Add any special include directories
-AC_MSG_CHECKING(for libotr CFLAGS)
-if test "$libotr_inc_prefix" != "" ; then
- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix"
- CFLAGS="$CFLAGS $LIBOTR_CFLAGS"
-fi
-AC_MSG_RESULT($LIBOTR_CFLAGS)
-
-dnl add any special lib dirs
-AC_MSG_CHECKING(for libotr LIBS)
-if test "$libotr_prefix" != "" ; then
- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix"
- LDFLAGS="$LDFLAGS $LIBOTR_LIBS"
-fi
-
-dnl add the libotr library
-LIBOTR_LIBS="$LIBOTR_LIBS -lotr"
-LIBS="$LIBOTR_LIBS $LIBS"
-AC_MSG_RESULT($LIBOTR_LIBS)
-
-dnl Check for a working version of libotr that is of the right version.
-min_libotr_version=ifelse([$1], ,3.0.0,$1)
-no_libotr=""
- libotr_min_major_version=`echo $min_libotr_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- libotr_min_minor_version=`echo $min_libotr_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- libotr_min_sub_version=`echo $min_libotr_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version)
-
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILE([
-#include
-#include .
-dnl Copyright © 2012-2015 Dan Nicholson
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
- [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $2])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see
#include
int main()
@@ -371,19 +574,27 @@ int main()
perl_alloc();
return 0;
}
-''', args : perl_cflags + perl_ldflags + perl_rpath_flags,
- name : 'working Perl support')
+''',
+ args : perl_cflags + perl_ldflags + perl_rpath_flags,
+ name : 'working Perl support',
+ )
if require_perl
error('error linking with perl libraries')
else
warning('error linking with perl libraries')
endif
else
- xsubpp_file_c = meson.get_cross_property('perl_xsubpp', false)
- if xsubpp_file_c == false
- xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout()
+ xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET)
+ if xsubpp_file_c == UNSET
+ xsubpp_file_c = run_command(
+ build_perl,
+ '-MExtUtils::ParseXS',
+ '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r',
+ check : true,
+ ).stdout()
endif
- xsubpp = generator(build_perl,
+ xsubpp = generator(
+ build_perl,
output : '@BASENAME@.c',
capture : true,
arguments : [ xsubpp_file_c, '@EXTRA_ARGS@', '@INPUT@' ],
@@ -391,31 +602,44 @@ int main()
xsubpp_file = files(xsubpp_file_c)
if with_perl_lib == 'module'
- perl_install_base = run_command(build_perl, '-MText::ParseWords=shellwords', '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}').stdout()
+ perl_install_base = run_command(
+ build_perl,
+ '-MText::ParseWords=shellwords',
+ '-e', 'grep { s/^INSTALL_BASE=// && print && exit } shellwords $ENV{PERL_MM_OPT}',
+ check : true,
+ ).stdout()
if perl_install_base == ''
with_perl_lib = ''
endif
endif
if with_perl_lib == ''
- if get_option('prefix') in ['/usr/local', 'C:/']
+ if get_option('prefix') in [ '/usr/local', 'C:/' ]
with_perl_lib = 'site'
- elif get_option('prefix') in ['/usr']
+ elif get_option('prefix') in [ '/usr' ]
with_perl_lib = 'vendor'
endif
endif
perlmoddir = ''
- if with_perl_lib in ['site', 'vendor', 'module']
+ if with_perl_lib in [ 'site', 'vendor', 'module' ]
set_perl_use_lib = false
perl_library_dir = with_perl_lib + ' default'
- if with_perl_lib in ['site', 'vendor']
- perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', false)
- if perlmoddir == false
- perlmoddir = run_command(cross_perl, '-V::install' + with_perl_lib + 'arch:').stdout().split('\'')[1]
+ if with_perl_lib in [ 'site', 'vendor' ]
+ perlmoddir = meson.get_cross_property('perl_install' + with_perl_lib + 'arch', UNSET)
+ if perlmoddir == UNSET
+ perlmoddir = run_command(
+ cross_perl,
+ '-V::install' + with_perl_lib + 'arch:',
+ check : true,
+ ).stdout().split('\'')[1]
endif
elif with_perl_lib == 'module'
- perl_archname = meson.get_cross_property('perl_archname', false)
- if perl_archname == false
- perl_archname = run_command(cross_perl, '-V::archname:').stdout().split('\'')[1]
+ perl_archname = meson.get_cross_property('perl_archname', UNSET)
+ if perl_archname == UNSET
+ perl_archname = run_command(
+ cross_perl,
+ '-V::archname:',
+ check : true,
+ ).stdout().split('\'')[1]
endif
perlmoddir = perl_install_base / 'lib' / 'perl5' / perl_archname
endif
@@ -434,9 +658,14 @@ int main()
perl_use_lib = get_option('prefix') / perlmoddir
if set_perl_use_lib
- perl_inc = meson.get_cross_property('perl_inc', false)
- if perl_inc == false
- set_perl_use_lib = run_command(cross_perl, '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC', perl_use_lib).returncode() != 0
+ perl_inc = meson.get_cross_property('perl_inc', UNSET_ARR)
+ if perl_inc == UNSET_ARR
+ set_perl_use_lib = run_command(
+ cross_perl,
+ '-e', 'exit ! grep $_ eq $ARGV[0], grep /^\\//, @INC',
+ perl_use_lib,
+ check : false,
+ ).returncode() != 0
else
set_perl_use_lib = not perl_inc.contains(perl_use_lib)
endif
@@ -462,8 +691,20 @@ endif
have_otr = false
if want_otr
- libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency)
- libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency)
+ libgcrypt = dependency(
+ 'libgcrypt',
+ version : '>=1.2.0',
+ required : require_otr,
+ static : want_static_dependency,
+ include_type : 'system',
+ )
+ libotr = dependency(
+ 'libotr',
+ version : '>=4.1.0',
+ required : require_otr,
+ static : want_static_dependency,
+ include_type : 'system',
+ )
if libgcrypt.found() and libotr.found()
dep += libgcrypt
dep += libotr
@@ -477,9 +718,19 @@ endif
have_capsicum = false
if want_capsicum
- if cc.has_function('cap_enter', dependencies : cc.find_library('c'))
- libnv = cc.find_library('nv', required : require_capsicum)
- nvlist_create_found = libnv.found() and cc.has_function('nvlist_create', dependencies : libnv)
+ if cc.has_function(
+ 'cap_enter',
+ dependencies : cc.find_library('c'),
+ )
+ libnv = cc.find_library(
+ 'nv',
+ required : require_capsicum,
+ )
+ nvlist_create_found = libnv.found() and cc.has_function(
+ 'nvlist_create',
+ dependencies : libnv,
+ prefix : '#include
+#include
+int main (void) {
+ return tputs("x", 1, putchar);
+}
+''',
+ args : '-pedantic-errors',
+ dependencies : textui_dep,
+ name : 'Curses working',
+ )
+ # ok
+ else
+ has_curses_h = cc.has_header('curses.h')
+ if has_curses_h and cc.links(
+ '''
+#include
+#include
+int main (void) {
+ return tputs("x", 1, putchar);
+}
+''',
+ args : '-pedantic-errors',
+ dependencies : textui_dep,
+ name : 'Curses working with curses.h',
+ )
+ conf.set(
+ 'NEED_CURSES_H',
+ 1,
+ description : 'tputs needs curses.h',
+ )
+ else
+ if has_curses_h and cc.links(
+ '''
+#include
+#include
+int char_putchar (char c) {
+ return putchar(c);
+}
+int main (void) {
+ return tputs("x", 1, char_putchar);
+}
+''',
+ args : '-pedantic-errors',
+ dependencies : textui_dep,
+ name : 'Curses with tputs third argument arg char',
+ )
+ conf.set(
+ 'NEED_CURSES_H',
+ 1,
+ description : 'tputs needs curses.h',
+ )
+ conf.set(
+ 'TPUTS_SVR4',
+ 1,
+ description : 'third argument of tputs has the type int (*)(char)',
+ )
+ else
+ error('could not link terminfo')
+ endif
+ endif
+ endif
+endif
+
conf.set('HAVE_LIBUTF8PROC', have_libutf8proc)
-conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+conf.set_quoted('PACKAGE_VERSION', package_version)
conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
-configure_file(output : 'irssi-config.h',
+configure_file(
+ output : 'irssi-config.h',
configuration : conf,
- install_dir : includedir / incdir)
+ install_dir : includedir / incdir,
+)
##########
# CFLAGS #
##########
#### warnings ####
-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
+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')
+add_project_arguments(
+ cc.get_supported_arguments('-fno-strict-aliasing'),
+ language : 'c',
+)
if get_option('buildtype').contains('debug')
- add_project_arguments(cc.get_supported_arguments('-fno-omit-frame-pointer'), language : 'c')
+ add_project_arguments(
+ cc.get_supported_arguments('-fno-omit-frame-pointer'),
+ language : 'c',
+ )
endif
if want_fuzzer
@@ -560,7 +902,10 @@ if want_fuzzer
if not cc.has_argument('-fsanitize=fuzzer-no-link')
error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
endif
- add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
+ add_project_arguments(
+ '-fsanitize=fuzzer-no-link',
+ language : 'c',
+ )
endif
if fuzzer_link_language != 'c'
add_languages(fuzzer_link_language)
@@ -572,11 +917,29 @@ endif
##############
pc = import('pkgconfig')
-pc_requires = []
+pc_requires = [ ]
if not glib_internal
pc_requires += glib_dep
endif
-pc.generate(filebase : 'irssi-1', name : 'Irssi', description : 'Irssi chat client', requires : pc_requires)
+signalsfile = docdir / 'signals.txt'
+if signalsfile.startswith('/')
+ signalsfile = signalsfile.split(get_option('prefix'))
+ if signalsfile[0] == ''
+ signalsfile = '${prefix}' + signalsfile[1]
+ else
+ signalsfile = signalsfile[0]
+ endif
+else
+ signalsfile = '${prefix}' / signalsfile
+endif
+pc.generate(
+ filebase : 'irssi-1',
+ name : 'Irssi',
+ description : 'Irssi chat client',
+ version : package_version,
+ requires : pc_requires,
+ variables : [ 'irssimoduledir=${libdir}' / incdir / 'modules', 'signalsfile=' + signalsfile ],
+)
###########
# irssi.1 #
@@ -616,8 +979,6 @@ if have_perl
endif
message('Install prefix ................... : ' + get_option('prefix'))
message('')
-message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no'))
-message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no'))
message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no'))
message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no'))
message('Building with OTR support ........ : ' + have_otr.to_string('yes', 'no'))
diff --git a/meson_options.txt b/meson_options.txt
index 5dc9c5143..a5b4ffbbc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,11 +7,10 @@ option('with-proxy', type : 'combo', description : 'Build irssi-proxy',
option('with-perl-lib', type : 'string', description : 'Specify where to install the Perl libraries for Irssi')
option('with-perl', type : 'combo', description : 'Build with Perl support', choices : ['auto', 'yes', 'no'])
option('with-otr', type : 'combo', description : 'Build with OTR support', choices : ['auto', 'yes', 'no'])
-option('enable-true-color', type : 'combo', description : 'Build with true color support in terminal', choices : ['no', 'yes'])
-option('disable-gregex', type : 'combo', description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes'])
option('disable-utf8proc', type : 'combo', description : 'Build without Julia\'s utf8proc', choices : ['auto', 'yes', 'no'])
option('with-capsicum', type : 'combo', description : 'Build with Capsicum support', choices : ['auto', 'yes', 'no'])
option('static-dependency', type : 'combo', description : 'Request static dependencies', choices : ['no', 'yes'])
option('install-glib', type : 'combo', description : 'Download and install GLib for you', choices : ['no', 'yes', 'force'])
option('docdir', type : 'string', description : 'Documentation directory')
option('fhs-prefix', type : 'string', description : 'System prefix for Termux')
+option('PACKAGE_VERSION', type : 'string', description : 'Override PACKAGE_VERSION in tarballs')
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 42b3ea7ba..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = examples
-
-scriptdir = $(datadir)/irssi/scripts
-
-script_DATA = \
- autoop.pl \
- autorejoin.pl \
- buf.pl \
- dns.pl \
- kills.pl \
- mail.pl \
- mlock.pl \
- quitmsg.pl \
- scriptassist.pl \
- usercount.pl
-
-EXTRA_DIST = $(script_DATA) \
- meson.build
diff --git a/scripts/autoop.pl b/scripts/autoop.pl
index b72def157..ce37e7053 100644
--- a/scripts/autoop.pl
+++ b/scripts/autoop.pl
@@ -5,7 +5,7 @@
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = "1.10";
+$VERSION = "1.11";
%IRSSI = (
authors => 'Timo Sirainen & Jostein Kjønigsen',
name => 'autoop',
@@ -98,10 +98,11 @@ sub load_autoops {
%opnicks = ();
open(CONF, "<", "$file") or return;
while (my $line = ) {
- if ($line !=~ /^\s*$/) {
- cmd_autoop($line);
- $count++;
- }
+ chomp($line);
+ if ($line !~ /^\s*$/) {
+ cmd_autoop($line);
+ $count++;
+ }
}
close(CONF);
diff --git a/scripts/examples/Makefile.am b/scripts/examples/Makefile.am
deleted file mode 100644
index c8d8c8e06..000000000
--- a/scripts/examples/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-scriptdir = $(datadir)/irssi/scripts
-
-script_DATA = \
- command.pl \
- msg-event.pl \
- redirect.pl
-
-EXTRA_DIST = $(script_DATA)
diff --git a/scripts/mail.pl b/scripts/mail.pl
index 23f99c01e..bf14503a2 100644
--- a/scripts/mail.pl
+++ b/scripts/mail.pl
@@ -1,6 +1,6 @@
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.92";
+$VERSION = "2.93";
%IRSSI = (
authors => "Timo Sirainen, Matti Hiljanen, Joost Vunderink, Bart Matthaei",
contact => "tss\@iki.fi, matti\@hiljanen.com, joost\@carnique.nl, bart\@dreamflow.nl",
@@ -63,8 +63,8 @@ sub cmd_print_help {
"/MAILBOX SHOW\n".
" - Shows a list of the defined mailboxes.\n\n".
"Use the following commands to change the behaviour:\n\n".
- "/SET MAILDIRMODE on|off\n".
- " - If maildirmode is on, the mailboxes in the list are assumed to be ".
+ "/SET MAILDIR_MODE on|off\n".
+ " - If maildir_mode is on, the mailboxes in the list are assumed to be ".
"directories. Otherwise they are assumed to be spool files.\n".
" Default: off.\n".
"/SET MAIL_OLDNOTNEW on|off\n".
diff --git a/scripts/meson.build b/scripts/meson.build
index 072ac3ea5..10fdc34bc 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -11,4 +11,5 @@ install_data(
'scriptassist.pl',
'usercount.pl',
),
- install_dir : scriptdir)
+ install_dir : scriptdir,
+)
diff --git a/scripts/quitmsg.pl b/scripts/quitmsg.pl
index e289468ca..102d9aa5c 100644
--- a/scripts/quitmsg.pl
+++ b/scripts/quitmsg.pl
@@ -6,36 +6,27 @@
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = "1.00";
+$VERSION = "1.01";
%IRSSI = (
authors => 'Timo Sirainen',
name => 'quitmsg',
description => 'Random quit messages',
license => 'Public Domain',
- changed => 'Sun Mar 10 23:18 EET 2002'
+ changed => 'Mon Jul 22 20:00 EET 2020'
);
-my $quitfile = glob "~/.irssi/irssi.quit";
+my $quitfile = Irssi::get_irssi_dir() . "/irssi.quit";
sub cmd_quit {
my ($data, $server, $channel) = @_;
return if ($data ne "");
+
+ open (my $fh, "<", $quitfile) || return;
+ my @lines = <$fh>;
- open (f, "<", $quitfile) || return;
- my $lines = 0; while() { $lines++; };
-
- my $line = int(rand($lines))+1;
-
- my $quitmsg;
- seek(f, 0, 0); $. = 0;
- while() {
- next if ($. != $line);
-
- chomp;
- $quitmsg = $_;
- last;
- }
- close(f);
+ my $quitmsg = $lines[int(rand(@lines))];
+ chomp($quitmsg);
+ close($fh);
foreach my $server (Irssi::servers) {
$server->command("/disconnect ".$server->{tag}." $quitmsg");
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 536ef33a1..665615dbf 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
use strict;
-our $VERSION = '2003020807';
+our $VERSION = '2023111700';
our %IRSSI = (
authors => 'Stefan \'tommie\' Tomanek',
contact => 'stefan@pico.ruhr.de',
@@ -22,13 +22,18 @@
use Irssi 20020324;
use CPAN::Meta::YAML;
use LWP::UserAgent;
+use Hash::Util qw(lock_ref_keys);
+use JSON::PP;
use POSIX;
+use version;
# GnuPG is not always needed
$have_gpg = 0;
eval "use GnuPG qw(:algo :trust);";
$have_gpg = 1 if not ($@);
+my $irssi_version = qv('v'.Irssi::parse_special('$J') =~ s/[^.\d].*//r);
+
sub show_help {
my $help = "scriptassist $VERSION
/scriptassist check
@@ -39,15 +44,15 @@ sub show_help {
Search the script database
/scriptassist info
Display information about
-".#/scriptassist ratings
-# Retrieve the average ratings of the the scripts
-#/scriptassist top
-# Retrieve the first top rated scripts
-"/scriptassist new
+/scriptassist ratings
+ Retrieve the average ratings of the scripts
+/scriptassist top
+ Retrieve the first top rated scripts
+/scriptassist new
Display the newest scripts
-".#/scriptassist rate )?\s*(
\s*){0,3}<.*?)\sclass="(?:[^"]*\s+)*(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;'
+s{(\s*)?\s*((\r?\n)*\s*\s*)?( \s*){0,3}<.*?)\sclass="(?:[^"]*\s+)*(?:highlighter-rouge|highlight)"(.*?>)}{\1\2}g;
+s{}{}g;
+s{(.*?)}{\1}g;'
srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=.
srcdir="$srcdir"/..
-if test ! -f "$srcdir"/configure.ac; then
+if test ! -f "$srcdir"/irssi.conf; then
echo -n "**Error**: Directory \`$srcdir' does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
@@ -45,6 +48,7 @@ else
any=false
fi
+addheadermark="perl -p -e s{\\K}{(q:#:x\$1).q: :}ge;s{(?=)}{q: :.(q:#:x\$1)}ge"
if type w3m >/dev/null 2>&1 ; then
converter="w3m -o display_link_number=1 -dump -T text/html"
any=true
@@ -83,25 +87,33 @@ download_it() {
mv "$3".tmp "$3"
}
-download_it "FAQ" "$faq" "$srcdir"/docs/faq.html
-download_it "Startup How-To" "$howto" "$srcdir"/docs/startup-HOWTO.html
-download_it "Design" "$design" "$srcdir"/docs/design.html
+download_it_nested() {
+ name=$1; shift
+ src=$1; shift
+ dest=$1; shift
+ download_it "$name" "$src" "$dest".nest
+ echo > "$dest"
+ eval $(perl -n -0777 -e 'print qq{download_it "\$name ($2)" "\${src}$1/" "\${dest}.$1";
+cat "\${dest}.$1" >> "\${dest}.tmp";
+rm "\${dest}.$1";\n}
+ while(m{(.*?)}g)' "$dest".nest)
+ rm "$dest".nest
+ perl -i -0777 -p -e 's{ or send patches to
-# .
-
-scriptversion=2011-12-27.17; # UTC
-
-# Make unconditional expansion of undefined variables an error. This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-me=tap-driver.sh
-
-fatal ()
-{
- echo "$me: fatal: $*" >&2
- exit 1
-}
-
-usage_error ()
-{
- echo "$me: $*" >&2
- print_usage >&2
- exit 2
-}
-
-print_usage ()
-{
- cat <
- exit_details = sprintf(" (terminated by signal %d?)", status - 256)
- else
- # Never seen in practice.
- exit_details = " (abnormal termination)"
- return sprintf("exited with status %d%s", status, exit_details)
-}
-
-function write_test_results()
-{
- print ":global-test-result: " get_global_test_result() > trs_file
- print ":recheck: " yn(must_recheck()) > trs_file
- print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
- for (i = 0; i < test_results_index; i += 1)
- print ":test-result: " test_results_list[i] > trs_file
- close(trs_file);
-}
-
-BEGIN {
-
-## ------- ##
-## SETUP ##
-## ------- ##
-
-'"$init_colors"'
-
-# Properly initialized once the TAP plan is seen.
-planned_tests = 0
-
-COOKED_PASS = expect_failure ? "XPASS": "PASS";
-COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
-
-# Enumeration-like constants to remember which kind of plan (if any)
-# has been seen. It is important that NO_PLAN evaluates "false" as
-# a boolean.
-NO_PLAN = 0
-EARLY_PLAN = 1
-LATE_PLAN = 2
-
-testno = 0 # Number of test results seen so far.
-bailed_out = 0 # Whether a "Bail out!" directive has been seen.
-
-# Whether the TAP plan has been seen or not, and if yes, which kind
-# it is ("early" is seen before any test result, "late" otherwise).
-plan_seen = NO_PLAN
-
-## --------- ##
-## PARSING ##
-## --------- ##
-
-is_first_read = 1
-
-while (1)
- {
- # Involutions required so that we are able to read the exit status
- # from the last input line.
- st = getline
- if (st < 0) # I/O error.
- fatal("I/O error while reading from input stream")
- else if (st == 0) # End-of-input
- {
- if (is_first_read)
- abort("in input loop: only one input line")
- break
- }
- if (is_first_read)
- {
- is_first_read = 0
- nextline = $0
- continue
- }
- else
- {
- curline = nextline
- nextline = $0
- $0 = curline
- }
- # Copy any input line verbatim into the log file.
- print | "cat >&3"
- # Parsing of TAP input should stop after a "Bail out!" directive.
- if (bailed_out)
- continue
-
- # TAP test result.
- if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
- {
- testno += 1
- setup_result_obj($0)
- handle_tap_result()
- }
- # TAP plan (normal or "SKIP" without explanation).
- else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
- {
- # The next two lines will put the number of planned tests in $0.
- sub("^1\\.\\.", "")
- sub("[^0-9]*$", "")
- handle_tap_plan($0, "")
- continue
- }
- # TAP "SKIP" plan, with an explanation.
- else if ($0 ~ /^1\.\.0+[ \t]*#/)
- {
- # The next lines will put the skip explanation in $0, stripping
- # any leading and trailing whitespace. This is a little more
- # tricky in truth, since we want to also strip a potential leading
- # "SKIP" string from the message.
- sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
- sub("[ \t]*$", "");
- handle_tap_plan(0, $0)
- }
- # "Bail out!" magic.
- # Older versions of prove and TAP::Harness (e.g., 3.17) did not
- # recognize a "Bail out!" directive when preceded by leading
- # whitespace, but more modern versions (e.g., 3.23) do. So we
- # emulate the latter, "more modern" behaviour.
- else if ($0 ~ /^[ \t]*Bail out!/)
- {
- bailed_out = 1
- # Get the bailout message (if any), with leading and trailing
- # whitespace stripped. The message remains stored in `$0`.
- sub("^[ \t]*Bail out![ \t]*", "");
- sub("[ \t]*$", "");
- # Format the error message for the
- bailout_message = "Bail out!"
- if (length($0))
- bailout_message = bailout_message " " $0
- testsuite_error(bailout_message)
- }
- # Maybe we have too look for dianogtic comments too.
- else if (comments != 0)
- {
- comment = extract_tap_comment($0);
- if (length(comment))
- report("#", comment);
- }
- }
-
-## -------- ##
-## FINISH ##
-## -------- ##
-
-# A "Bail out!" directive should cause us to ignore any following TAP
-# error, as well as a non-zero exit status from the TAP producer.
-if (!bailed_out)
- {
- if (!plan_seen)
- {
- testsuite_error("missing test plan")
- }
- else if (planned_tests != testno)
- {
- bad_amount = testno > planned_tests ? "many" : "few"
- testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
- bad_amount, planned_tests, testno))
- }
- if (!ignore_exit)
- {
- # Fetch exit status from the last line.
- exit_message = get_test_exit_message(nextline)
- if (exit_message)
- testsuite_error(exit_message)
- }
- }
-
-write_test_results()
-
-exit 0
-
-} # End of "BEGIN" block.
-'
-
-# TODO: document that we consume the file descriptor 3 :-(
-} 3>"$log_file"
-
-test $? -eq 0 || fatal "I/O or internal error"
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/utils/tap-test b/utils/tap-test
deleted file mode 100755
index b3ef8b048..000000000
--- a/utils/tap-test
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-# run a GTest in tap mode. The test binary is passed as $1
-
-t="$1"; shift
-if ${PKG_CONFIG:-pkg-config} --atleast-version 2.40 glib-2.0; then
-exec "$t" -k --tap "$@"
-else # GTest does not support tap yet
- (((("$t" "$@"; echo $? >&3) | ${AM_TAP_AWK:-awk} '
-{
- if (/: /) {
- i++
- ok = /: OK/
- sub(/:/, " #")
- print (ok ? "ok " : "not ok ") i " " $0
- } else {
- print "# " $0
- }
-} END {
- print 1 ".." i
-}
-' >&4) 3>&1) | (read xs; exit $xs)) 4>&1
-fi