Mercurial > irccd
changeset 902:8562d9864788 stable-3
misc: merge from release-3.0
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 22 Sep 2019 21:12:21 +0200 |
parents | 73cbd6760978 (current diff) 55dfcb4e875b (diff) |
children | e71fd436f6c8 081fe7608403 |
files | |
diffstat | 11 files changed, 28 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Sun Sep 01 17:23:22 2019 +0200 +++ b/.hgsigs Sun Sep 22 21:12:21 2019 +0200 @@ -9,3 +9,4 @@ d5bfaf362ded7a15e1c9da50805a7ee6a95b4875 0 iQEzBAABCAAdFiEEvr8S/JLqYAXrLA5Xodr5uEAj8x8FAlvhaEkACgkQodr5uEAj8x+EWwf/aeFmJ5JkHc/LsLSiHHwHQDIcnuyvRemz5VX/6um41jygTx3VUPYFC+mrtyql+ot5bstsI/9l8C1hFEAAimiIy7bhbALWdbqieJjBhXaUVSsJFq+YzOVR+k/6BZSJHTWL4lf4+Jic1ACsBWPXEQpyqxxdGpbmb7EXmx0ZZlXJIb1Xd0l/eev+ONIW9NwbabqvaoaUFab5BnrOu4LeZA1Ny2u7Wm2KJtyJAiJzwKfRjyDmJ7D0ljg7n24SzuxCC0vJS+drLd38dCaaYrLrL9WlndPql+IxTDByAGs9g/SkdJRis4ubDMXV92rLxZtdJZEyzoanethrFQn/s0Y0EOnGsg== 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==
--- a/.hgtags Sun Sep 01 17:23:22 2019 +0200 +++ b/.hgtags Sun Sep 22 21:12:21 2019 +0200 @@ -9,3 +9,4 @@ 76aaaf7cd5a3410c97c644d3aa90bd2372c56aa4 2.2.0 6baa070e083cb7cecb4cb64c2d2729575c72b3c1 3.0.0 d1cfe59eed061121da5325414c59262a8a2b085f 3.0.1 +9f953fb28a607c62815da41ee6c9d4cfabbc5eac 3.0.2
--- a/CHANGES.md Sun Sep 01 17:23:22 2019 +0200 +++ b/CHANGES.md Sun Sep 22 21:12:21 2019 +0200 @@ -1,6 +1,15 @@ IRC Client Daemon CHANGES ========================= +irccd 3.0.2 2019-09-22 +---------------------- + +- Added *IRCCD_WITH_JS* CMake variable in irccd package (#2340), +- Fixed trailing CTCP escape code (#2339), +- Fixed invalid parameters in topic event (#2341), +- Fixed invalid documentation of Irccd.System.usleep function (#2262), +- Fixed invalid system configuration directory (#2263). + irccd 3.0.1 2019-09-01 ----------------------
--- a/INSTALL.md Sun Sep 01 17:23:22 2019 +0200 +++ b/INSTALL.md Sun Sep 22 21:12:21 2019 +0200 @@ -14,7 +14,7 @@ - [OpenSSL](http://openssl.org), Used for SSL connections to IRC servers, recommended, -- [UriParser](), Required for the links plugin, +- [UriParser](https://uriparser.github.io), Required for the links plugin, - [Doxygen](http://www.stack.nl/~dimitri/doxygen), For the documentation about irccd internals.
--- a/cmake/IrccdVersion.cmake Sun Sep 01 17:23:22 2019 +0200 +++ b/cmake/IrccdVersion.cmake Sun Sep 22 21:12:21 2019 +0200 @@ -30,7 +30,7 @@ # Irccd version. set(IRCCD_VERSION_MAJOR "3") set(IRCCD_VERSION_MINOR "0") -set(IRCCD_VERSION_PATCH "1") +set(IRCCD_VERSION_PATCH "2") 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") @@ -44,8 +44,8 @@ # set(IRCCD_RELEASE_DATE_YEAR 2019) set(IRCCD_RELEASE_DATE_MONTH 09) -set(IRCCD_RELEASE_DATE_DAY 01) +set(IRCCD_RELEASE_DATE_DAY 22) 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 01, 2019") +set(IRCCD_MAN_DATE "September 22, 2019")
--- a/cmake/export/CMakeLists.txt Sun Sep 01 17:23:22 2019 +0200 +++ b/cmake/export/CMakeLists.txt Sun Sep 22 21:12:21 2019 +0200 @@ -32,9 +32,15 @@ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/irccd ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/irccd-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/irccd-config.cmake + @ONLY +) + install( FILES - ${CMAKE_CURRENT_SOURCE_DIR}/irccd-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/irccd-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/irccd-config-version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/irccd COMPONENT Devel
--- a/cmake/export/irccd-config.cmake Sun Sep 01 17:23:22 2019 +0200 +++ b/cmake/export/irccd-config.cmake Sun Sep 22 21:12:21 2019 +0200 @@ -22,6 +22,8 @@ find_dependency(Threads) find_dependency(OpenSSL) +set(IRCCD_WITH_JS @IRCCD_WITH_JS@) + include("${CMAKE_CURRENT_LIST_DIR}/irccd-targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/IrccdSetGlobal.cmake") include("${CMAKE_CURRENT_LIST_DIR}/IrccdDefinePlugin.cmake")
--- a/libirccd-daemon/irccd/daemon/irc.cpp Sun Sep 01 17:23:22 2019 +0200 +++ b/libirccd-daemon/irccd/daemon/irc.cpp Sun Sep 22 21:12:21 2019 +0200 @@ -70,7 +70,7 @@ { assert(is_ctcp(index)); - return args[index].substr(1, args[index].size() - 1); + return args[index].substr(1, args[index].size() - 2); } auto message::parse(const string& line) -> message
--- a/libirccd-daemon/irccd/daemon/server.cpp Sun Sep 01 17:23:22 2019 +0200 +++ b/libirccd-daemon/irccd/daemon/server.cpp Sun Sep 22 21:12:21 2019 +0200 @@ -319,7 +319,7 @@ { assert(msg.command == "TOPIC"); - handler({}, topic_event{shared_from_this(), msg.get(0), msg.get(1), msg.get(2)}); + handler({}, topic_event{shared_from_this(), msg.prefix, msg.get(0), msg.get(1)}); return true; }
--- a/libirccd/irccd/system.cpp Sun Sep 01 17:23:22 2019 +0200 +++ b/libirccd/irccd/system.cpp Sun Sep 22 21:12:21 2019 +0200 @@ -440,7 +440,7 @@ auto sysconfdir() -> boost::filesystem::path { - return system_directory(IRCCD_INSTALL_SYSCONFDIR) / "irccd"; + return system_directory(IRCCD_INSTALL_SYSCONFDIR); } // }}}
--- a/man/irccd-api.7 Sun Sep 01 17:23:22 2019 +0200 +++ b/man/irccd-api.7 Sun Sep 22 21:12:21 2019 +0200 @@ -2038,7 +2038,7 @@ .Pp Irccd.System.usleep .Bd -ragged -offset indent -Sleep for milliseconds. Suspend the execution thread. +Sleep for microseconds. Suspend the execution thread. .Pp Synopsis .Bd -literal -offset Ds