Mercurial > irccd

changeset 910:081fe7608403 stable-3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: merge from release-3.0
author David Demelier <markand@malikania.fr>
date Sun, 06 Oct 2019 09:20:04 +0200
parents 8562d9864788 (current diff) d0d6dd3b078d (diff)
children 32b0397f0992 e0de249c3378
files
diffstat 10 files changed, 42 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Sun Sep 22 21:12:21 2019 +0200
+++ b/.hgsigs	Sun Oct 06 09:20:04 2019 +0200
@@ -10,3 +10,4 @@
 fb0adda67228d8f1de259eaf00ecde102f99666b 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl1VwjIACgkQodr5uEAj8x8WTwf9Hs+G8kCIjrXJXlHlPTEjEPH+icIPvXxcT+1CsIp2v4QxBgjocxBH4APdhH7iTXQ1GnOBA5txuYOonDJBL/cfkv60F366YZTNKeZt89QSty8gIIyR3WMGMlTnidhFziu3O950YOc4tjDXfQI4JuLIHNJSwEwDSzAsaXv8QNg+3VnXqX0EybGMT93Vi5eJZSUocluzWEF8eVgF6simgDUguiFPZZyYymVQTt7SZS2fevfBHOp+mtj5zdsH27N7TFU+1i3j4qfn3Yp0fYHieFeihpo3Tb9V8A1SK+3gOMp+7pEEV786XhwGaPr1XFZ/pBBdUReIfupPcdVjKoUnnIqx3w==
 b83f4bbdaa9ec28ea547a7cefbb0b0475af9d1fa 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl1r4kQACgkQodr5uEAj8x8QcQgAiF1iMgk34pwFDpNFcnwz0E0OE0VwKzn2mL3knXq8wAdi4MBjPo1tR85iPvavIfq6/FMtrJvZGQiKJv99iWgkWQ6uI8scWYwmkkheTpVtYNXxPjFGgoEm9wFvMki/jjmXkxssSanJsXHw10i2uWucRM+kky7jQcLZFsHmMDV8ZEhjE3mUJ1Zlx1s3yHs/tZzK92Bq0yMowwebdq8X+wLTAswNQbMxgxuJhQFIE14p9sIsmMcZQkwb5ldVaEV80m63EdXUtiMkWz9sR4gIgk4i7otPSU9GbKKmHys1oxDS9coKUvv12NG0RR5cpiVv70z77NJzi0sOnD3nK/6g+GZqTQ==
 3e0b2fc5f79ebc40233ee9f8b7ea0c178f72c64a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2Hx3cACgkQodr5uEAj8x/YDQgAi4V8IsKc7u0fJjINnlLRa37JfgwRqtADJkyT9a1GR+BfbB3XT3/VgBFYx0SDFvbW9lQ7ZmOLaLd5tMJap5xzrK+yUl3ctgWLZMZUyUKdsxYOcN19x6qkKK06E7hBZqif/OfKvMq96xScRBKCdHh8mASmzjyIMszcnVVc/pH3Joy5gayM5wobJqRFeP/JIbdKaHM0V04O25j04yfJSZwaxYNQUQGi7vSSrB1die8r1HtHw8bYOxGA6FOjCoC7xUv9RD1UaXsKVTfChechFNHdKGSSP/r0gGG4mB6pYY6jmeoHOJR27wZrmfWvHYrgWasZK6pkcZ5ywy0eubdXMrG/0A==
+4c68a73f31e92afe2a5986f810b299c1de28ba5a 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAl2ZlTYACgkQodr5uEAj8x+FOgf/QOK/lRL2RY9i3frA3V8wbUz8o3iQmSE2rkWpWP2NacgIyAFwer/APJi7FecsZgJflwBHfXD06YH4V9lycVXmu0nJFMofSyMeWlUntzIjouBwjt7FtO80UJ0dARr6Czbsp2rUYBnz32lewS3ay6hkNHOOxCfj+Qpg8xDYSyW6mHzmeOJ5W9CL7brAaJlYO+es3zVgfA66PVmXskknjSaghLXnWH/irwJ08dS0rkAz8ltXuuzoqxOoHZyhV9Ib+i/GXnMCM4Xs7YLELmkK3hpCXpWA2RooN/4igiMs4J4DFmwiI85TZhPJyDTzhbvKwsCr+QGB5MDIC9UAZhg1hlNxQw==
--- a/.hgtags	Sun Sep 22 21:12:21 2019 +0200
+++ b/.hgtags	Sun Oct 06 09:20:04 2019 +0200
@@ -10,3 +10,4 @@
 6baa070e083cb7cecb4cb64c2d2729575c72b3c1 3.0.0
 d1cfe59eed061121da5325414c59262a8a2b085f 3.0.1
 9f953fb28a607c62815da41ee6c9d4cfabbc5eac 3.0.2
+f14e00397e429c0f9d38b1f0777293e1577d6994 3.0.3
--- a/CHANGES.md	Sun Sep 22 21:12:21 2019 +0200
+++ b/CHANGES.md	Sun Oct 06 09:20:04 2019 +0200
@@ -1,6 +1,12 @@
 IRC Client Daemon CHANGES
 =========================
 
+irccd 3.0.3 2019-10-06
+----------------------
+
+- Fix errors in irccdctl.conf example file (#2398),
+- Add example of password in irccdctl.conf and irccd.conf (#2407).
+
 irccd 3.0.2 2019-09-22
 ----------------------
 
--- a/README.md	Sun Sep 22 21:12:21 2019 +0200
+++ b/README.md	Sun Oct 06 09:20:04 2019 +0200
@@ -1,7 +1,7 @@
 IRC Client Daemon
 =================
 
-IRC Client Daemon aka irccd is a full featured IRC bot written in C++14. It runs
+IRC Client Daemon aka irccd is a full featured IRC bot written in C++17. It runs
 as a daemon waiting for events. It's also possible to connect to more than one
 server.
 
@@ -37,6 +37,6 @@
 Contributors
 ------------
 
-  - Pierre Choffet,
-  - Yoan Giraud,
-  - Léo Villeveygoux.
+- Pierre Choffet,
+- Yoan Giraud,
+- Léo Villeveygoux.
--- a/cmake/IrccdVersion.cmake	Sun Sep 22 21:12:21 2019 +0200
+++ b/cmake/IrccdVersion.cmake	Sun Oct 06 09:20:04 2019 +0200
@@ -30,7 +30,7 @@
 # Irccd version.
 set(IRCCD_VERSION_MAJOR "3")
 set(IRCCD_VERSION_MINOR "0")
-set(IRCCD_VERSION_PATCH "2")
+set(IRCCD_VERSION_PATCH "3")
 set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}${HG_REV}")
 set(IRCCD_VERSION_RAW "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 set(IRCCD_VERSION_SHLIB "1")
@@ -43,9 +43,9 @@
 # IRCCD_RELEASE_DATE_DAY        2 digits (01 = first day of month)
 #
 set(IRCCD_RELEASE_DATE_YEAR 2019)
-set(IRCCD_RELEASE_DATE_MONTH 09)
-set(IRCCD_RELEASE_DATE_DAY 22)
+set(IRCCD_RELEASE_DATE_MONTH 10)
+set(IRCCD_RELEASE_DATE_DAY 06)
 set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")
 
 # Irccd release data (manual version).
-set(IRCCD_MAN_DATE "September 22, 2019")
+set(IRCCD_MAN_DATE "October 06, 2019")
--- a/doc/examples/irccd.conf.sample	Sun Sep 22 21:12:21 2019 +0200
+++ b/doc/examples/irccd.conf.sample	Sun Oct 06 09:20:04 2019 +0200
@@ -21,6 +21,11 @@
 #    sockets are supported. UNIX are used for file based sockets while internet
 #    bind to standard address plus a specific port.
 #
+# Common options:
+#
+# [transport]
+# password = "SuperPassword"    # (string) a password (Optional, default: empty),
+#
 # For internet sockets:
 #
 # [transport]
--- a/doc/examples/irccdctl.conf.sample	Sun Sep 22 21:12:21 2019 +0200
+++ b/doc/examples/irccdctl.conf.sample	Sun Oct 06 09:20:04 2019 +0200
@@ -13,13 +13,19 @@
 # Section connect:
 #    This section is used to connect to a irccd transport.
 #
+# Common options:
+#
+# [connect]
+# password = "SuperPassword"    # (string) a password (Optional, default: empty),
+#
 # For internet sockets:
 #
 # [connect]
 # type = "ip"
-# host = "localhost"            # (string) host to connect,
+# hostname = "localhost"        # (string) hostname to connect,
 # port = "1234"                 # (int) port number,
-# family = "ipv4" or "ipv6"     # (string) internet family: ipv6 or ipv4 (Optional, default: ipv4).
+# ipv4 = true                   # (bool) enable IPv4 (Optional, default: true),
+# ipv6 = true                   # (bool) enable IPv6 (Optional, default: true),
 #
 # For unix sockets:
 #
@@ -29,7 +35,7 @@
 
 [connect]
 type = "ip"
-host = "localhost"
+hostname = "localhost"
 port = "5980"
 
 # Section alias:
--- a/man/irccd.conf.5	Sun Sep 22 21:12:21 2019 +0200
+++ b/man/irccd.conf.5	Sun Oct 06 09:20:04 2019 +0200
@@ -18,7 +18,7 @@
 .Os
 .\" NAME
 .Sh NAME
-.Nm irccd
+.Nm irccd.conf
 .Nd irccd configuration file
 .\" DESCRIPTION
 .Sh DESCRIPTION
@@ -361,5 +361,5 @@
 .Xr irccd 1
 .\" AUTHORS
 .Sh AUTHORS
-.Nm
+.Nm irccd
 was written by David Demelier <markand@malikania.fr>
--- a/man/irccdctl.1	Sun Sep 22 21:12:21 2019 +0200
+++ b/man/irccdctl.1	Sun Oct 06 09:20:04 2019 +0200
@@ -471,3 +471,7 @@
 .Sh SEE ALSO
 .Xr irccd 1 ,
 .Xr irccdctl.conf 5
+.\" AUTHORS
+.Sh AUTHORS
+.Nm
+was written by David Demelier <markand@malikania.fr>
--- a/man/irccdctl.conf.5	Sun Sep 22 21:12:21 2019 +0200
+++ b/man/irccdctl.conf.5	Sun Oct 06 09:20:04 2019 +0200
@@ -18,7 +18,7 @@
 .Os
 .\" NAME
 .Sh NAME
-.Nm irccdctll
+.Nm irccdctl.conf
 .Nd irccdctl configuration file
 .\" DESCRIPTION
 .Sh DESCRIPTION
@@ -150,7 +150,7 @@
 .Bd -literal
 [connect]
 type = "internet"
-host = "localhost"
+hostname = "localhost"
 port = "9999"
 .Ed
 Example for unix transports.
@@ -168,3 +168,7 @@
 .Sh SEE ALSO
 .Xr irccd 1 ,
 .Xr irccdctl 1
+.\" AUTHORS
+.Sh AUTHORS
+.Nm irccdctl
+was written by David Demelier <markand@malikania.fr>