diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/BUG_REPORT.md | 33 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 15 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/config.yml | 1 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 26 | ||||
| -rwxr-xr-x | Config | 1 | ||||
| -rw-r--r-- | docs/Changes | 15 | ||||
| -rw-r--r-- | docs/Changes.conf | 6 | ||||
| -rw-r--r-- | docs/INSTALL | 4 | ||||
| -rw-r--r-- | docs/INSTALL.fr | 5 | ||||
| -rw-r--r-- | include/anope.h | 7 | ||||
| -rw-r--r-- | src/logger.cpp | 2 | ||||
| -rw-r--r-- | src/misc.cpp | 22 |
12 files changed, 119 insertions, 18 deletions
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md new file mode 100644 index 000000000..99e497e8d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Report a non-security issue with Anope. +--- + +<!-- +Please fill in the template below. It will help us process your bug report a lot faster. +--> + +**Description** + + + +**Steps to reproduce the issue:** + +1. +2. +3. + +**Describe the results you received:** + + + +**Describe the results you expected:** + + + +**Additional information you deem important (e.g. issue happens only occasionally):** + + + +**Output of `services --version`:** + diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md new file mode 100644 index 000000000..a2191c0e0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -0,0 +1,15 @@ +--- +name: Feature request +about: Request that a new feature is added to Anope. +--- + +<!-- +Please fill in the template below. It will help us process your feature request a lot faster. +--> + +**Description** + + + +**Why this would be useful** + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..3ba13e0ce --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..5fe0ba7e3 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,26 @@ +<!-- +Please fill in the template below. It will help us process your pull request a lot faster. +--> + +## Summary + +<!-- +Briefly describe what this pull request changes. +--> + +## Rationale + +<!-- +Describe why you have made this change. +--> + +## Testing Environment + +<!-- +Describe the environment in which you have tested this change: +--> + +I have tested this pull request on: + +**Operating system name and version:** <!-- e.g. Linux 3.11 --> +**Compiler name and version:** <!-- e.g. GCC 4.2.0 --> @@ -171,6 +171,7 @@ fi ########################################################################### if [ ! "$NO_INTRO" ] ; then + export MORE='-e' . $SOURCE_DIR/src/version.sh cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | more echo "" diff --git a/docs/Changes b/docs/Changes index c9863b5fb..493e2fd68 100644 --- a/docs/Changes +++ b/docs/Changes @@ -1,7 +1,20 @@ -Anope Version 2.0.14-git +Anope Version 2.0.15-git ------------------------ No significant changes. +Anope Version 2.0.14 +-------------------- +Added support for sqlining channels on UnrealIRCd. +Fixed a crash when trying to access config for non-loaded modules. +Fixed detection of the InspIRCd nopartmsg module. +Fixed not getting memo notifications when authing with SASL. +Fixed not serialising dontkickops/dontkickvoices in botserv/kick. +Fixed sending emails with the wrong kind of line terminator. +Fixed sending log messages from a renamed pseudoclient. +Fixed telling users their passcode is incorrect when they need to authenticate in nickserv/confirm. +Fixed the Config script freezing on some versions of util-linux. +Updated the Windows packaging scripts to use dependencies from Conan. + Anope Version 2.0.13 -------------------- Fixed a crash on some compilers when trying to call methods on a null pointer diff --git a/docs/Changes.conf b/docs/Changes.conf index 05c3ab179..cae02ea86 100644 --- a/docs/Changes.conf +++ b/docs/Changes.conf @@ -9,10 +9,14 @@ Renamed the inspircd3 module to inspircd. Renamed the unreal4 module to unrealircd. Replaced uplink:ipv6 with uplink:protocol. -Anope Version 2.0.14-git +Anope Version 2.0.15-git ------------------------ No significant changes. +Anope Version 2.0.14 +-------------------- +Added mail:content_type to allow customising the content type of emails. + Anope Version 2.0.13 -------------------- No significant changes. diff --git a/docs/INSTALL b/docs/INSTALL index fe0bb9eae..cbd170804 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -88,10 +88,6 @@ Note: You should also read the README and FAQ files! Don't forget to /rehash your IRCd to apply changes. - You may also try our interactive link maker, which is located at: - - https://www.anope.org/ilm.php - 4) Starting Anope Go into the directory where binaries were installed (by default, this is diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr index da50fec42..f80aeb9d6 100644 --- a/docs/INSTALL.fr +++ b/docs/INSTALL.fr @@ -96,11 +96,6 @@ Note : Vous devrez également lire les fichiers README et FAQ ! Souvenez-vous de /rehash votre IRCd pour appliquer les changements. - Vous pouvez également essayer notre créateur de bloc link interactif - situé ici : - - https://www.anope.org/ilm.php - 4) Mettre en route Anope Allez dans le répertoire où les fichiers binaires ont été installés diff --git a/include/anope.h b/include/anope.h index 238ef938a..121ea716c 100644 --- a/include/anope.h +++ b/include/anope.h @@ -537,6 +537,13 @@ namespace Anope */ extern Anope::string Resolve(const Anope::string &host, int type); + /** Does a blocking dns query and returns all IPs. + * @param host host to look up + * @param type inet addr type + * @return A list of all IPs that the host resolves to + */ + extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type); + /** Generate a string of random letters and numbers * @param len The length of the string returned */ diff --git a/src/logger.cpp b/src/logger.cpp index 2bee1a80e..532369c3b 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -88,7 +88,7 @@ Log::Log(LogType t, CommandSource &src, Command *_c, ChannelInfo *_ci) : u(src.G size_t sl = c->name.find('/'); if (sl != Anope::string::npos) - this->bi = BotInfo::Find(c->name.substr(0, sl), true); + this->bi = Config->GetClient(c->name.substr(0, sl)); this->category = c->name; } diff --git a/src/misc.cpp b/src/misc.cpp index 36e6d5b1f..0728daab1 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -705,7 +705,13 @@ Anope::string Anope::NormalizeBuffer(const Anope::string &buf) Anope::string Anope::Resolve(const Anope::string &host, int type) { - Anope::string result = host; + std::vector<Anope::string> results = Anope::ResolveMultiple(host, type); + return results.empty() ? host : results[0]; +} + +std::vector<Anope::string> Anope::ResolveMultiple(const Anope::string &host, int type) +{ + std::vector<Anope::string> results; addrinfo hints; memset(&hints, 0, sizeof(hints)); @@ -716,15 +722,19 @@ Anope::string Anope::Resolve(const Anope::string &host, int type) addrinfo *addrresult = NULL; if (getaddrinfo(host.c_str(), NULL, &hints, &addrresult) == 0) { - sockaddrs addr; - memcpy(static_cast<void*>(&addr), addrresult->ai_addr, addrresult->ai_addrlen); - result = addr.addr(); - Log(LOG_DEBUG_2) << "Resolver: " << host << " -> " << result; + for (addrinfo *thisresult = addrresult; thisresult; thisresult = thisresult->ai_next) + { + sockaddrs addr; + memcpy(static_cast<void*>(&addr), thisresult->ai_addr, thisresult->ai_addrlen); + + results.push_back(addr.addr()); + Log(LOG_DEBUG_2) << "Resolver: " << host << " -> " << addr.addr(); + } freeaddrinfo(addrresult); } - return result; + return results; } Anope::string Anope::Random(size_t len) |