Browse Source

Unreal -> UnrealIRCd

pull/1/head
Bram Matthys 7 years ago
parent
commit
a565a68f36
  1. 2
      Config
  2. 2
      include/common.h
  3. 4
      include/modversion.h
  4. 2
      makefile.win32
  5. 2
      src/modules/m_nick.c
  6. 2
      src/s_serv.c
  7. 8
      src/version.c.SH
  8. 2
      src/win32/debug.c
  9. 2
      src/win32/editor.c
  10. 2
      src/win32/gui.c
  11. 2
      src/win32/service.c
  12. 4
      src/win32/unrealinst.iss
  13. 4
      unrealircd.in

2
Config

@ -206,7 +206,7 @@ while [ -z "$TEST" ] ; do
TEST="No"
fi
echo ""
echo "Should Unreal notify a user when they are no longer shunned?"
echo "Should UnrealIRCd notify a user when they are no longer shunned?"
echo $n "[$TEST] -> $c"
read cc
if [ -z "$cc" ] ; then

2
include/common.h

@ -59,7 +59,7 @@ typedef int bool;
#define BMAGIC 0x4675636B596F754661736369737473
#define BASE_VERSION "Unreal"
#define BASE_VERSION "UnrealIRCd"
#ifndef _WIN32
#define FDwrite(x,y,z) write(x, y, z)
#else

4
include/modversion.h

@ -63,12 +63,12 @@
#ifdef UNREALCORE
char our_mod_version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
char our_mod_version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
MYTOKEN_SSL \
MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF;
unsigned int our_compiler_version = GCCVER;
#else
DLLFUNC char Mod_Version[] = BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
DLLFUNC char Mod_Version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
MYTOKEN_SSL \
MYTOKEN_NOFLDAWAY MYTOKEN_NEWCHF;
DLLFUNC unsigned int compiler_version = GCCVER;

2
makefile.win32

@ -12,7 +12,7 @@ MT=mt
# which passes all these arguments to nmake, like:
# nmake -f makefile.win32 OPENSSL_INC_DIR="c:\dev\openssl" etc etc...
# Both ways will work, but if you use a batch file it's easier with
# upgrading Unreal as you won't have to edit this makefile again.
# upgrading UnrealIRCd as you won't have to edit this makefile again.
### TRE ###
#TRE_LIB_DIR="C:\dev\tre\win32\release"

2
src/modules/m_nick.c

@ -1437,7 +1437,7 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
#ifdef EXPERIMENTAL
sendto_one(sptr,
":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (Unreal%s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/",
":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (UnrealIRCd %s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/",
me.name, sptr->name, VERSIONONLY);
#endif
#ifdef HOSTILENAME

2
src/s_serv.c

@ -226,7 +226,7 @@ char buf[1024];
}
#ifndef IRCDTOTALVERSION
#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
#endif
int remotecmdfilter(aClient *sptr, int parc, char *parv[])

8
src/version.c.SH

@ -54,7 +54,7 @@ cat >version.c <<!SUB!THIS!
char *generation = "$generation";
char *creation = "$creation";
#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
char *version = IRCDTOTALVERSION;
char *buildid = "$id";
/* moved to s_serv.c */
@ -134,7 +134,7 @@ char *unrealcredits[] =
"The UnrealIRCd Team would like to thank:",
" ",
"Nutcais - Phil Hawkins",
"- the original shell for Unreal development, useful comments,",
"- the original shell for UnrealIRCd development, useful comments,",
" and supporting the project all through its life. Thanks for",
" helping to get this project to take off.",
"=-=-=-=-=-=-=-=-=-=-=-=-=-=-[Hosting]=-=-=-=-=-=-=-=-=-=-=-=-=-=-=",
@ -147,7 +147,7 @@ char *unrealcredits[] =
"Alcatraz Media - http://www.alcatrazmedia.com",
"- Donating more webhosting for the project",
"cknight^",
"- Donating a FreeBSD box to the Unreal project to host some stuff",
"- Donating a FreeBSD box to the UnrealIRCd project to host some stuff",
"KIREnet.com - http://www.kirenet.com",
"- Donating hosting for the above box on their line",
"Digital Intensity Webhosting - http://www.digital-intensity.net",
@ -216,7 +216,7 @@ char unreallogo[] =
95,124,92,95,95,95,47,92,95,124,32,
92,95,124,32,92,95,95,95,95,47,92,
95,95,44,95,124,10,0,85,110,114,
101,97,108,0};
101,97,108,73,82,67,100,0};
char *dalinfotext[] =
{

2
src/win32/debug.c

@ -28,7 +28,7 @@
#include <string.h>
#include <signal.h>
#ifndef IRCDTOTALVERSION
#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
#endif
#define BUFFERSIZE 0x200

2
src/win32/editor.c

@ -314,7 +314,7 @@ LRESULT CALLBACK FromFileDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
ft.chrg.cpMax = -1;
}
if (SendMessage(hRich, EM_FINDTEXTEX, flags, (LPARAM)&ft) == -1)
MessageBox(NULL, "Unreal has finished searching the document",
MessageBox(NULL, "UnrealIRCd has finished searching the document",
"Find", MB_ICONINFORMATION|MB_OK);
else
{

2
src/win32/gui.c

@ -17,7 +17,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define WIN32_VERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
#include "sys.h"
#include "resource.h"
#include "version.h"

2
src/win32/service.c

@ -36,7 +36,7 @@ SERVICE_STATUS_HANDLE IRCDStatusHandle;
MODVAR BOOL IsService = FALSE;
extern OSVERSIONINFO VerInfo;
#define WIN32_VERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
/* Places the service in the STOPPED state
* Parameters:

4
src/win32/unrealinst.iss

@ -32,7 +32,7 @@ Name: "installservice/startdemand"; Description: "Start UnrealIRCd on &request";
Name: "installservice/crashrestart"; Description: "Restart UnrealIRCd if it &crashes"; GroupDescription: "Service support:"; Flags: unchecked; MinVersion: 0,5.0;
Name: "makecert"; Description: "&Create certificate"; GroupDescription: "SSL options:";
Name: "enccert"; Description: "&Encrypt certificate"; GroupDescription: "SSL options:"; Flags: unchecked;
Name: "fixperm"; Description: "Make Unreal folder writable by current user";
Name: "fixperm"; Description: "Make UnrealIRCd folder writable by current user";
[Files]
Source: "wircd.exe"; DestDir: "{app}"; Flags: ignoreversion
@ -160,7 +160,7 @@ if CurStep = ssPostInstall then
d := ExpandConstant('{app}');
if IsTaskSelected('fixperm') then
begin
// This fixes the permissions in the Unreal folder by granting full access to the user
// This fixes the permissions in the UnrealIRCd folder by granting full access to the user
// running the install.
s := '-on "'+d+'" -ot file -actn ace -ace "n:'+GetUserNameString()+';p:full;m:set';
Exec(d+'\tmp\setacl.exe', s, d, SW_HIDE, ewWaitUntilTerminated, Res);

4
unrealircd.in

@ -121,7 +121,7 @@ elif [ "$1" = "backtrace" ] ; then
echo 'has permission to dump core (type "ulimit -c unlimited" and see'
echo 'if you get permission denied errors). Also verify that you did'
echo 'not run out of quota.'
echo 'If all that is ok, then it might be that Unreal did not crash but'
echo 'If all that is ok, then it might be that UnrealIRCd did not crash but'
echo 'got killed by the OS (eg: cpu/mem resource limits), the syadmin,'
echo 'or an automated process.'
exit 1
@ -182,5 +182,5 @@ __EOF__
echo ""
echo "Thanks!"
else
echo "Usage: unreal start|stop|rehash|restart|mkpasswd|version|gencloak|upgrade-conf"
echo "Usage: unrealircd start|stop|rehash|restart|mkpasswd|version|gencloak|upgrade-conf"
fi

Loading…
Cancel
Save