mirror of
https://github.com/pissnet/pissircd.git
synced 2025-08-11 20:51:35 +01:00
Merge branch 'unrealircd:unreal60_dev' into piss60
This commit is contained in:
angryce
GitHub
commit
f91da796c2
19 changed files with 39 additions and 40 deletions
2
Config
2
Config
|
|
@ -375,7 +375,7 @@ echo "We will now ask you a number of questions. You can just press ENTER to acc
|
|||
echo ""
|
||||
|
||||
# This needs to be updated each release so auto-upgrading works for settings, modules, etc!!:
|
||||
UNREALRELEASES="unrealircd-6.0.3 unrealircd-6.0.2 unrealircd-6.0.1.1 unrealircd-6.0.1 unrealircd-6.0.0 unrealircd-6.0.0-rc2 unrealircd-6.0.0-rc1 unrealircd-6.0.0-beta4 unrealircd-6.0.0-beta3 unrealircd-6.0.0-beta2 unrealircd-6.0.0-beta1 unrealircd-5.2.3 unrealircd-5.2.2 unrealircd-5.2.1.1 unrealircd-5.2.1 unrealircd-5.2.1-rc1 unrealircd-5.2.0.2 unrealircd-5.2.0.1 unrealircd-5.2.0 unrealircd-5.2.0-rc1 unrealircd-5.0.9.1 unrealircd-5.0.9 unrealircd-5.0.9-rc1 unrealircd-5.0.8 unrealircd-5.0.8-rc1 unrealircd-5.0.7 unrealircd-5.0.7-rc1 unrealircd-5.0.6"
|
||||
UNREALRELEASES="unrealircd-6.0.4-rc1 unrealircd-6.0.3 unrealircd-6.0.2 unrealircd-6.0.1.1 unrealircd-6.0.1 unrealircd-6.0.0 unrealircd-6.0.0-rc2 unrealircd-6.0.0-rc1 unrealircd-6.0.0-beta4 unrealircd-6.0.0-beta3 unrealircd-6.0.0-beta2 unrealircd-6.0.0-beta1 unrealircd-5.2.3 unrealircd-5.2.2 unrealircd-5.2.1.1 unrealircd-5.2.1 unrealircd-5.2.1-rc1 unrealircd-5.2.0.2 unrealircd-5.2.0.1 unrealircd-5.2.0 unrealircd-5.2.0-rc1 unrealircd-5.0.9.1 unrealircd-5.0.9 unrealircd-5.0.9-rc1 unrealircd-5.0.8 unrealircd-5.0.8-rc1 unrealircd-5.0.7 unrealircd-5.0.7-rc1 unrealircd-5.0.6"
|
||||
if [ -f "config.settings" ]; then
|
||||
. ./config.settings
|
||||
else
|
||||
|
|
|
|||
20
configure
vendored
20
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for unrealircd 6.0.4-rc1.
|
||||
# Generated by GNU Autoconf 2.69 for unrealircd 6.0.4-rc2.
|
||||
#
|
||||
# Report bugs to <https://bugs.unrealircd.org/>.
|
||||
#
|
||||
|
|
@ -580,8 +580,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='unrealircd'
|
||||
PACKAGE_TARNAME='unrealircd'
|
||||
PACKAGE_VERSION='6.0.4-rc1'
|
||||
PACKAGE_STRING='unrealircd 6.0.4-rc1'
|
||||
PACKAGE_VERSION='6.0.4-rc2'
|
||||
PACKAGE_STRING='unrealircd 6.0.4-rc2'
|
||||
PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'
|
||||
PACKAGE_URL='https://unrealircd.org/'
|
||||
|
||||
|
|
@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures unrealircd 6.0.4-rc1 to adapt to many kinds of systems.
|
||||
\`configure' configures unrealircd 6.0.4-rc2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1413,7 +1413,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of unrealircd 6.0.4-rc1:";;
|
||||
short | recursive ) echo "Configuration of unrealircd 6.0.4-rc2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1589,7 +1589,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
unrealircd configure 6.0.4-rc1
|
||||
unrealircd configure 6.0.4-rc2
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1958,7 +1958,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by unrealircd $as_me 6.0.4-rc1, which was
|
||||
It was created by unrealircd $as_me 6.0.4-rc2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2376,7 +2376,7 @@ _ACEOF
|
|||
# The version suffix such as a beta marker or release candidate
|
||||
# marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
|
||||
# string instead of an integer because it contains arbitrary data.
|
||||
UNREAL_VERSION_SUFFIX="-rc1"
|
||||
UNREAL_VERSION_SUFFIX="-rc2"
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"
|
||||
|
|
@ -9462,7 +9462,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by unrealircd $as_me 6.0.4-rc1, which was
|
||||
This file was extended by unrealircd $as_me 6.0.4-rc2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -9525,7 +9525,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
unrealircd config.status 6.0.4-rc1
|
||||
unrealircd config.status 6.0.4-rc2
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ dnl src/windows/unrealinst.iss
|
|||
dnl doc/Config.header
|
||||
dnl src/version.c.SH
|
||||
|
||||
AC_INIT([unrealircd], [6.0.4-rc1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
|
||||
AC_INIT([unrealircd], [6.0.4-rc2], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
|
||||
AC_CONFIG_SRCDIR([src/ircd.c])
|
||||
AC_CONFIG_HEADER([include/setup.h])
|
||||
AC_CONFIG_AUX_DIR([autoconf])
|
||||
|
|
@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor versi
|
|||
# The version suffix such as a beta marker or release candidate
|
||||
# marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
|
||||
# string instead of an integer because it contains arbitrary data.
|
||||
UNREAL_VERSION_SUFFIX=["-rc1"]
|
||||
UNREAL_VERSION_SUFFIX=["-rc2"]
|
||||
AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)])
|
||||
|
||||
AC_PATH_PROG(RM,rm)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
\___/|_| |_|_| \___|\__,_|_|\___/\_| \_| \____/\__,_|
|
||||
|
||||
Configuration Program
|
||||
for UnrealIRCd 6.0.4-rc1
|
||||
for UnrealIRCd 6.0.4-rc2
|
||||
|
||||
This program will help you to compile your IRC server, and ask you
|
||||
questions regarding the compile-time settings of it during the process.
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
UnrealIRCd 6.0.4-rc1
|
||||
UnrealIRCd 6.0.4-rc2
|
||||
=====================
|
||||
This is the release candidate for UnrealIRCd 6.0.4.
|
||||
This is the second release candidate for UnrealIRCd 6.0.4.
|
||||
You can help us by testing this release and reporting any issues at https://bugs.unrealircd.org/.
|
||||
|
||||
If you are already running UnrealIRCd 6 then read below. Otherwise, jump
|
||||
straight to the [summary about UnrealIRCd 6](#Summary) to learn more
|
||||
about UnrealIRCd 6.
|
||||
|
||||
Compared to 6.0.4-rc1, this rc2 adds an oper autologin feature, fixes set::restrict-commands
|
||||
not working, fixes for security-group for account and CIDR, fix multiline log
|
||||
messages being cut, fix Ubuntu 22.04 compile problem and fix +H not working
|
||||
on set::modes-on-join. Also update various example.*conf files.
|
||||
|
||||
### Enhancements:
|
||||
* Show security groups in `WHOIS`
|
||||
* The [security-group block](https://www.unrealircd.org/docs/Security-group_block)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ PROJECT_NAME = "UnrealIRCd"
|
|||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 6.0.4-rc1
|
||||
PROJECT_NUMBER = 6.0.4-rc2
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
||||
|
|
|
|||
|
|
@ -66,6 +66,6 @@
|
|||
|
||||
/* Version suffix such as a beta marker or release candidate marker. (e.g.:
|
||||
-rcX for unrealircd-3.2.9-rcX) */
|
||||
#define UNREAL_VERSION_SUFFIX "-rc1"
|
||||
#define UNREAL_VERSION_SUFFIX "-rc2"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -40,9 +40,6 @@ long sajoinmode = 0;
|
|||
*/
|
||||
Channel *channels = NULL;
|
||||
|
||||
/* A buffer for rebuilding channel/nick lists with comma's */
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
static mp_pool_t *channel_pool = NULL;
|
||||
|
||||
/** This describes the letters, modes and options for core channel modes.
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ struct UCounter {
|
|||
ThrottleCounter global; /**< Global counter */
|
||||
int rejected_clients; /**< Number of rejected clients this minute */
|
||||
int allowed_except; /**< Number of allowed clients - on except list */
|
||||
int allowed_unknown_users; /**< Number of allowed clients - not on except list */
|
||||
int allowed_unknown_users; /**< Number of allowed clients - not on except list */
|
||||
char disabled; /**< Module disabled by oper? */
|
||||
int throttling_this_minute; /**< Did we do any throttling this minute? */
|
||||
int throttling_previous_minute; /**< Did we do any throttling previous minute? */
|
||||
|
|
@ -366,9 +366,7 @@ EVENT(connthrottle_evt)
|
|||
unreal_log(ULOG_INFO, "connthrottle", "CONNTHROTLE_REPORT", NULL,
|
||||
"ConnThrottle] Stats for this server past 60 secs: "
|
||||
"Connections rejected: $num_rejected. "
|
||||
"Accepted: $num_accepted_known_users known user(s), "
|
||||
"$num_accepted_sasl SASL, "
|
||||
"$num_accepted_webirc WEBIRC and "
|
||||
"Accepted: $num_accepted_except except user(s) and "
|
||||
"$num_accepted_unknown_users new user(s).",
|
||||
log_data_integer("num_rejected", ucounter->rejected_clients),
|
||||
log_data_integer("num_accepted_except", ucounter->allowed_except),
|
||||
|
|
|
|||
|
|
@ -62,10 +62,9 @@ MOD_UNLOAD()
|
|||
* ISON :nicklist
|
||||
*/
|
||||
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
CMD_FUNC(cmd_ison)
|
||||
{
|
||||
char buf[BUFSIZE];
|
||||
char request[BUFSIZE];
|
||||
char namebuf[USERLEN + HOSTLEN + 4];
|
||||
Client *acptr;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include "unrealircd.h"
|
||||
|
||||
CMD_FUNC(cmd_kill);
|
||||
static char buf[BUFSIZE], buf2[BUFSIZE];
|
||||
|
||||
ModuleHeader MOD_HEADER
|
||||
= {
|
||||
|
|
@ -58,6 +57,7 @@ CMD_FUNC(cmd_kill)
|
|||
{
|
||||
char targetlist[BUFSIZE];
|
||||
char reason[BUFSIZE];
|
||||
char buf2[BUFSIZE];
|
||||
char *str;
|
||||
char *nick, *save = NULL;
|
||||
Client *target;
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ MOD_UNLOAD()
|
|||
* 12 Feb 2000 - geesh, time for a rewrite -lucas
|
||||
************************************************************************/
|
||||
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
/*
|
||||
** cmd_names
|
||||
** parv[1] = channel
|
||||
|
|
@ -88,6 +86,7 @@ CMD_FUNC(cmd_names)
|
|||
int idx, flag = 1, spos;
|
||||
const char *para = parv[1], *s;
|
||||
char nuhBuffer[NICKLEN+USERLEN+HOSTLEN+3];
|
||||
char buf[BUFSIZE];
|
||||
|
||||
if (parc < 2 || !MyConnect(client))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ ModuleHeader MOD_HEADER
|
|||
#define ASSUME_NICK_IN_FLIGHT
|
||||
|
||||
/* Variables */
|
||||
static char buf[BUFSIZE];
|
||||
static char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64];
|
||||
|
||||
/* Forward declarations */
|
||||
|
|
@ -489,6 +488,7 @@ CMD_FUNC(cmd_uid)
|
|||
Client *acptr, *serv = NULL;
|
||||
Client *acptrs;
|
||||
char nick[NICKLEN + 1];
|
||||
char buf[BUFSIZE];
|
||||
long lastnick = 0;
|
||||
int differ = 1;
|
||||
const char *hostname, *username, *sstamp, *umodes, *virthost, *ip_raw, *realname;
|
||||
|
|
@ -765,6 +765,7 @@ void welcome_user(Client *client, TKL *viruschan_tkl)
|
|||
{
|
||||
int i;
|
||||
ConfigItem_tld *tlds;
|
||||
char buf[BUFSIZE];
|
||||
|
||||
/* Make creation time the real 'online since' time, excluding registration time.
|
||||
* Otherwise things like set::anti-spam-quit-messagetime 10s could mean
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ void _connect_server(ConfigItem_link *aconf, Client *by, struct hostent *hp);
|
|||
static int connect_server_helper(ConfigItem_link *, Client *);
|
||||
|
||||
/* Global variables */
|
||||
static char buf[BUFSIZE];
|
||||
static cfgstruct cfg;
|
||||
static char *last_autoconnect_server = NULL;
|
||||
|
||||
|
|
@ -1336,6 +1335,8 @@ CMD_FUNC(cmd_sid)
|
|||
|
||||
void _introduce_user(Client *to, Client *acptr)
|
||||
{
|
||||
char buf[512];
|
||||
|
||||
build_umode_string(acptr, 0, SEND_UMODES, buf);
|
||||
|
||||
sendto_one_nickcmd(to, NULL, acptr, buf);
|
||||
|
|
|
|||
|
|
@ -119,8 +119,6 @@ static void show_watch_removed(Client *client, char *name)
|
|||
}
|
||||
}
|
||||
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
#define WATCHES(client) (moddata_local_client(client, watchCounterMD).i)
|
||||
#define WATCH(client) (moddata_local_client(client, watchListMD).ptr)
|
||||
|
||||
|
|
@ -130,6 +128,7 @@ static char buf[BUFSIZE];
|
|||
CMD_FUNC(cmd_watch)
|
||||
{
|
||||
char request[BUFSIZE];
|
||||
char buf[BUFSIZE];
|
||||
Client *target;
|
||||
char *s, *user;
|
||||
char *p = NULL, *def = "l";
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ struct WhoisConfig {
|
|||
};
|
||||
|
||||
/* Global variables */
|
||||
static char buf[BUFSIZE];
|
||||
WhoisConfig *whoisconfig = NULL;
|
||||
|
||||
/* Forward declarations */
|
||||
|
|
@ -296,6 +295,7 @@ CMD_FUNC(cmd_whois)
|
|||
char *p = NULL;
|
||||
int len, mlen;
|
||||
char querybuf[BUFSIZE];
|
||||
char buf[BUFSIZE];
|
||||
int ntargets = 0;
|
||||
int maxtargets = max_targets_for_command("WHOIS");
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include "unrealircd.h"
|
||||
|
||||
MODVAR int dontspread = 0;
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
/** Inhibit labeled/response reply. This means it will result in an empty ACK
|
||||
* because we cannot handle the command via labeled-reponse. Rare, but
|
||||
|
|
@ -418,6 +417,7 @@ void build_umode_string(Client *client, long old, long sendmask, char *umode_buf
|
|||
void send_umode_out(Client *client, int show_to_user, long old)
|
||||
{
|
||||
Client *acptr;
|
||||
char buf[512];
|
||||
|
||||
build_umode_string(client, old, SEND_UMODES, buf);
|
||||
|
||||
|
|
@ -811,8 +811,8 @@ const char *get_connect_extinfo(Client *client)
|
|||
strlcat(retbuf, tmp, sizeof(retbuf));
|
||||
}
|
||||
/* Cut off last space (unless empty string) */
|
||||
if (*buf)
|
||||
buf[strlen(buf)-1] = '\0';
|
||||
if (*retbuf)
|
||||
retbuf[strlen(retbuf)-1] = '\0';
|
||||
|
||||
/* Free the list, as it was only used to build retbuf */
|
||||
free_nvplist(list);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ echo "Extracting src/version.c..."
|
|||
if [ -d ../.git ]; then
|
||||
SUFFIX="-$(git rev-parse --short HEAD)"
|
||||
fi
|
||||
id="6.0.4-rc1$SUFFIX"
|
||||
id="6.0.4-rc2$SUFFIX"
|
||||
echo "$id"
|
||||
|
||||
if test -r version.c
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
[Setup]
|
||||
AppName=UnrealIRCd 6
|
||||
AppVerName=UnrealIRCd 6.0.4-rc1
|
||||
AppVerName=UnrealIRCd 6.0.4-rc2
|
||||
AppPublisher=UnrealIRCd Team
|
||||
AppPublisherURL=https://www.unrealircd.org
|
||||
AppSupportURL=https://www.unrealircd.org
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue