Index: head/irc/unreal/Makefile =================================================================== --- head/irc/unreal/Makefile (revision 421367) +++ head/irc/unreal/Makefile (revision 421368) @@ -1,143 +1,140 @@ # Created by: Gerrit Beine () # $FreeBSD$ PORTNAME= Unreal -PORTVERSION= 3.2.10.5 -PORTREVISION= 1 +PORTVERSION= 3.2.10.7 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= mat@FreeBSD.org COMMENT= Unreal - the next generation ircd LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcares.so:dns/c-ares - -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} MODULESDIR= ${PREFIX}/lib/${PORTNAME} CONFIGDIR= ${PREFIX}/etc/${PORTNAME} RUNDIR= /var/run/ircd LOGDIR= /var/log/ircd HAS_CONFIGURE= yes USE_RC_SUBR= unrealircd USERS= ircd GROUPS= ircd CPE_VENDOR= unrealircd CPE_PRODUCT= unrealircd USES= pkgconfig cpe SUB_LIST+= RUNDIR=${RUNDIR} SUB_LIST+= USERS=${USERS} SUB_LIST+= GROUPS=${GROUPS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= ${CPPFLAGS} CONFIGURE_ARGS= --with-listen=5 \ --with-dpath=${CONFIGDIR} \ --with-spath=${PREFIX}/libexec/ircd \ --with-nick-history=2000 \ --with-sendq=3000000 \ --with-bufferpool=18 \ --with-permissions=0600 \ --with-fd-setsize=1024 \ --with-system-cares \ --enable-dynamic-linking OPTIONS_DEFINE= HUB NOSPOOF ZIPLINKS SSL IPV6 PREFIXAQ REMOTE DOCS OPTIONS_DEFAULT= HUB SSL HUB_DESC= Configure as a hub (otherwise configure as a leaf) NOSPOOF_DESC= Enable anti-spoof protection ZIPLINKS_DESC= Enable ziplinks support PREFIXAQ_DESC= Enable prefixes for chanadmin and chanowner REMOTE_DESC= Enable remote includes PORTDOCS= * DOCS= Donation doc/Authors doc/coding-guidelines \ doc/example.conf doc/tao.of.irc \ doc/translations.txt doc/unreal32docs.html \ doc/technical/005.txt doc/technical/base64.txt \ doc/technical/protoctl.txt doc/technical/token.txt \ doc/technical/vl.txt HUB_CONFIGURE_ENABLE= hub NOSPOOF_CONFIGURE_ENABLE= nospoof ZIPLINKS_CONFIGURE_ENABLE= ziplinks IPV6_CONFIGURE_ENABLE= inet6 SSL_CONFIGURE_ENABLE= ssl SSL_USE= OPENSSL=yes REMOTE_LIB_DEPENDS= libcurl.so:ftp/curl REMOTE_CONFIGURE_ENABLE= --enable-libcurl=${LOCALBASE} PREFIXAQ_CONFIGURE_ENABLE= prefixaq SQLMOD= ${PORTNAME}/SQLMod.tar.gz .if exists(${DISTDIR}/${SQLMOD}) USE_MYSQL= yes WITH_SQLMOD= yes MAKE_ARGS= all custommodule MODULEFILE=m_sqlmod PLIST_SUB+= SQLMOD="" .else PLIST_SUB+= SQLMOD="@comment " .endif post-extract: .if defined(WITH_SQLMOD) @${TAR} xfz ${DISTDIR}/${SQLMOD} -C ${WRKSRC} @${MV} ${WRKSRC}/SQLMod* ${WRKSRC}/SQLMod @${CP} -r ${WRKSRC}/SQLMod/m_sqlmod.c ${WRKSRC}/src/modules .endif post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \ -e "s,%%RUNDIR%%,${RUNDIR}," \ -e "s,%%USERS%%,${USERS}," \ -e "s,%%GROUPS%%,${GROUPS}," \ -e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \ -e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/doc/example.conf @${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/ircd.c @${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/modules.c @${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/s_conf.c @${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/url.c .if defined(WITH_SQLMOD) @${PATCH} -d ${WRKSRC} < ${WRKSRC}/SQLMod/patch .endif @${REINPLACE_CMD} -e "/Your system does not support IPv6/ s|as_fn_error|echo|" ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/ircd ${MKDIR} ${STAGEDIR}${MODULESDIR} ${MKDIR} ${STAGEDIR}${CONFIGDIR} || true ${MKDIR} ${STAGEDIR}${CONFIGDIR}/aliases || true ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/aliases ${MKDIR} ${STAGEDIR}${RUNDIR}/tmp ${MKDIR} ${STAGEDIR}${LOGDIR} ${TOUCH} ${STAGEDIR}${CONFIGDIR}/ircd.motd ${TOUCH} ${STAGEDIR}${CONFIGDIR}/ircd.rules ${INSTALL_DATA} ${WRKSRC}/badwords.*.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/help.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${EXAMPLESDIR}/unrealircd.conf ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${STAGEDIR}${EXAMPLESDIR}/aliases ${INSTALL} ${WRKSRC}/src/modules/*.so ${STAGEDIR}${MODULESDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .if defined(WITH_SQLMOD) @${CP} ${WRKSRC}/SQLMod/sample.conf ${STAGEDIR}${CONFIGDIR}/m_sqlmod.conf @${CP} ${WRKSRC}/SQLMod/Changes ${STAGEDIR}${DOCSDIR}/Changes.sqlmod @${CP} ${WRKSRC}/SQLMod/README ${STAGEDIR}${DOCSDIR}/README.sqlmod @${CP} ${WRKSRC}/SQLMod/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE.sqlmod .endif .include Index: head/irc/unreal/distinfo =================================================================== --- head/irc/unreal/distinfo (revision 421367) +++ head/irc/unreal/distinfo (revision 421368) @@ -1,2 +1,3 @@ -SHA256 (Unreal3.2.10.5.tar.gz) = fd1482356763dce30144ad425704e5d6527195acf564a02419006004c8c632fd -SIZE (Unreal3.2.10.5.tar.gz) = 3537602 +TIMESTAMP = 1473082474 +SHA256 (Unreal3.2.10.7.tar.gz) = 472e12cd42d2e725a1795e2bead4786062775782bd015a07697c2edf400d4047 +SIZE (Unreal3.2.10.7.tar.gz) = 3539026 Index: head/irc/unreal/files/patch-src__modules.c =================================================================== --- head/irc/unreal/files/patch-src__modules.c (revision 421367) +++ head/irc/unreal/files/patch-src__modules.c (nonexistent) @@ -1,58 +0,0 @@ ---- ./src/modules.c.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./src/modules.c 2014-05-23 00:34:33.000000000 +0200 -@@ -183,12 +183,12 @@ - { - char tempbuf[PATH_MAX+1]; - #ifndef _WIN32 -- DIR *fd = opendir("tmp"); -+ DIR *fd = opendir("%%RUNDIR%%/tmp"); - struct dirent *dir; - - if (!fd) /* Ouch.. this is NOT good!! */ - { -- config_error("Unable to open 'tmp' directory: %s, please create one with the appropriate permissions", -+ config_error("Unable to open '%%RUNDIR%%' directory: %s, please create one with the appropriate permissions", - strerror(errno)); - if (!loop.ircd_booted) - exit(7); -@@ -199,19 +199,19 @@ - { - if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) - continue; -- strcpy(tempbuf, "tmp/"); -+ strcpy(tempbuf, "%%RUNDIR%%/tmp/"); - strcat(tempbuf, dir->d_name); - remove(tempbuf); - } - closedir(fd); - #else - WIN32_FIND_DATA hData; -- HANDLE hFile = FindFirstFile("tmp/*", &hData); -+ HANDLE hFile = FindFirstFile("%%RUNDIR%%/tmp/*", &hData); - if (hFile != INVALID_HANDLE_VALUE) - { - if (strcmp(hData.cFileName, ".") || strcmp(hData.cFileName, "..")) - { -- strcpy(tempbuf, "tmp/"); -+ strcpy(tempbuf, "%%RUNDIR%%/tmp/"); - strcat(tempbuf, hData.cFileName); - remove(tempbuf); - } -@@ -220,7 +220,7 @@ - { - if (!strcmp(hData.cFileName, ".") || !strcmp(hData.cFileName, "..")) - continue; -- strcpy(tempbuf, "tmp/"); -+ strcpy(tempbuf, "%%RUNDIR%%/tmp/"); - strcat(tempbuf, hData.cFileName); - remove(tempbuf); - } -@@ -329,7 +329,7 @@ - path = path_; - - -- tmppath = unreal_mktemp("tmp", unreal_getfilename(path)); -+ tmppath = unreal_mktemp("%%RUNDIR%%/tmp", unreal_getfilename(path)); - if (!tmppath) - return "Unable to create temporary file!"; - #ifndef _WIN32 Property changes on: head/irc/unreal/files/patch-src__modules.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src__ircd.c =================================================================== --- head/irc/unreal/files/patch-src__ircd.c (revision 421367) +++ head/irc/unreal/files/patch-src__ircd.c (nonexistent) @@ -1,17 +0,0 @@ ---- ./src/ircd.c.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./src/ircd.c 2014-05-23 00:34:32.000000000 +0200 -@@ -1410,12 +1410,12 @@ - } - #endif - #ifndef _WIN32 -- mkdir("tmp", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */ -+ mkdir("%%RUNDIR%%/tmp", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */ - #if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE) - mkdir("cache", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the cache dir, if using curl and it doesn't exist */ - #endif - #else -- mkdir("tmp"); -+ mkdir("%%RUNDIR%%/tmp"); - #if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE) - mkdir("cache"); - #endif Property changes on: head/irc/unreal/files/patch-src__ircd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-include__config.h =================================================================== --- head/irc/unreal/files/patch-include__config.h (revision 421367) +++ head/irc/unreal/files/patch-include__config.h (nonexistent) @@ -1,40 +0,0 @@ ---- ./include/config.h.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./include/config.h 2014-05-23 00:34:32.000000000 +0200 -@@ -242,16 +242,16 @@ - * line argument. These used as the default values for options absent from the user's - * unrealircd.conf. - */ --#define CPATH "unrealircd.conf" /* server configuration file */ --#define MPATH "ircd.motd" /* server MOTD file */ --#define SMPATH "ircd.smotd" /* short MOTD file */ --#define RPATH "ircd.rules" /* server rules file */ --#define OPATH "oper.motd" /* Operators MOTD file */ --#define LPATH "debug.log" /* Where the debug file lives, if DEBUGMODE */ --#define PPATH "ircd.pid" /* file for server pid */ --#define VPATH "ircd.svsmotd" /* Services MOTD append. */ --#define BPATH "bot.motd" /* Bot MOTD */ --#define IRCDTUNE "ircd.tune" /* tuning .. */ -+#define CPATH "%%PREFIX%%/etc/Unreal/unrealircd.conf" /* server configuration file */ -+#define MPATH "%%PREFIX%%/etc/Unreal/ircd.motd" /* server MOTD file */ -+#define SMPATH "%%PREFIX%%/etc/Unreal/ircd.smotd" /* short MOTD file */ -+#define RPATH "%%PREFIX%%/etc/Unreal/ircd.rules" /* server rules file */ -+#define OPATH "%%PREFIX%%/etc/Unreal/oper.motd" /* Operators MOTD file */ -+#define LPATH "%%LOGDIR%%/debug.log" /* Where the debug file lives, if DEBUGMODE */ -+#define PPATH "%%RUNDIR%%/ircd.pid" /* file for server pid */ -+#define VPATH "%%PREFIX%%/etc/Unreal/ircd.svsmotd" /* Services MOTD append. */ -+#define BPATH "%%PREFIX%%/etc/Unreal/bot.motd" /* Bot MOTD */ -+#define IRCDTUNE "%%RUNDIR%%/ircd.tune" /* tuning .. */ - - /* CHROOTDIR - * -@@ -277,8 +277,8 @@ - * define IRC_USER to that user name. This should only be defined if you - * are running as root and even then perhaps not. - */ --/* #define IRC_USER "" */ --/* #define IRC_GROUP "" */ -+#define IRC_USER "%%USERS%%" -+#define IRC_GROUP "%%GROUPS%%" - - - /* SHOW_INVISIBLE_LUSERS Property changes on: head/irc/unreal/files/patch-include__config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src__url.c =================================================================== --- head/irc/unreal/files/patch-src__url.c (revision 421367) +++ head/irc/unreal/files/patch-src__url.c (nonexistent) @@ -1,20 +0,0 @@ ---- ./src/url.c.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./src/url.c 2014-05-23 00:34:33.000000000 +0200 -@@ -174,7 +174,7 @@ - CURLcode res; - char *file = url_getfilename(url); - char *filename = unreal_getfilename(file); -- char *tmp = unreal_mktemp("tmp", filename ? filename : "download.conf"); -+ char *tmp = unreal_mktemp("%%RUNDIR%%/tmp", filename ? filename : "download.conf"); - FILE *fd; - - -@@ -359,7 +359,7 @@ - { - char *file = url_getfilename(url); - char *filename = unreal_getfilename(file); -- char *tmp = unreal_mktemp("tmp", filename ? filename : "download.conf"); -+ char *tmp = unreal_mktemp("%%RUNDIR%%/tmp", filename ? filename : "download.conf"); - FileHandle *handle = MyMallocEx(sizeof(FileHandle)); - handle->fd = fopen(tmp, "wb"); - if (!handle->fd) Property changes on: head/irc/unreal/files/patch-src__url.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-doc__example.conf =================================================================== --- head/irc/unreal/files/patch-doc__example.conf (revision 421367) +++ head/irc/unreal/files/patch-doc__example.conf (nonexistent) @@ -1,22 +0,0 @@ ---- ./doc/example.conf.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./doc/example.conf 2014-05-23 00:34:32.000000000 +0200 -@@ -33,8 +33,8 @@ - */ - - /* FOR *NIX, uncomment the following 2lines: */ --//loadmodule "src/modules/commands.so"; --//loadmodule "src/modules/cloak.so"; -+loadmodule "%%PREFIX%%/lib/Unreal/commands.so"; -+loadmodule "%%PREFIX%%/lib/Unreal/cloak.so"; - - /* FOR Windows, uncomment the following 2 lines: */ - //loadmodule "modules/commands.dll"; -@@ -379,7 +379,7 @@ - * }; - */ - --log "ircd.log" { -+log "%%LOGDIR%%/ircd.log" { - /* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the - same log */ - maxsize 2097152; Property changes on: head/irc/unreal/files/patch-doc__example.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src__s_conf.c =================================================================== --- head/irc/unreal/files/patch-src__s_conf.c (revision 421367) +++ head/irc/unreal/files/patch-src__s_conf.c (nonexistent) @@ -1,11 +0,0 @@ ---- ./src/s_conf.c.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./src/s_conf.c 2014-05-23 00:34:33.000000000 +0200 -@@ -9832,7 +9832,7 @@ - { - char *urlfile = url_getfilename(url); - char *file_basename = unreal_getfilename(urlfile); -- char *tmp = unreal_mktemp("tmp", file_basename); -+ char *tmp = unreal_mktemp("%%RUNDIR%%/tmp", file); - free(urlfile); - - if (cached) Property changes on: head/irc/unreal/files/patch-src__s_conf.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-Makefile.in =================================================================== --- head/irc/unreal/files/patch-Makefile.in (revision 421367) +++ head/irc/unreal/files/patch-Makefile.in (revision 421368) @@ -1,11 +1,11 @@ ---- ./Makefile.in.orig 2013-11-24 20:24:26.000000000 +0100 -+++ ./Makefile.in 2014-05-23 00:34:32.000000000 +0200 -@@ -38,7 +38,7 @@ +--- Makefile.in.orig 2016-09-03 19:34:06 UTC ++++ Makefile.in +@@ -38,7 +38,7 @@ IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARES_LI CRYPTOLIB=@CRYPTOLIB@ OPENSSLINCLUDES= -XCFLAGS=@TRE_CFLAGS@ @CARES_CFLAGS@ @CFLAGS@ +XCFLAGS=-I@TREINCDIR@ @TRE_CFLAGS@ @CFLAGS@ # # use the following on MIPS: #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR) Index: head/irc/unreal/files/patch-configure =================================================================== --- head/irc/unreal/files/patch-configure (revision 421367) +++ head/irc/unreal/files/patch-configure (revision 421368) @@ -1,59 +1,59 @@ ---- configure.orig 2014-07-26 15:42:10 UTC +--- configure.orig 2016-09-03 19:34:06 UTC +++ configure -@@ -3876,6 +3876,47 @@ fi +@@ -3918,6 +3918,47 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5 +$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_RAND_egd+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char RAND_egd (); +int +main () +{ +return RAND_egd (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_RAND_egd=yes +else + ac_cv_lib_crypto_RAND_egd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5 +$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; } +if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then : + +$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h + +fi -@@ -6495,7 +6536,7 @@ fi +@@ -6537,7 +6578,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip6" >&5 $as_echo "$ac_cv_ip6" >&6; } if test "$ac_cv_ip6" = "no"; then - as_fn_error $? "Your system does not support IPv6 so it will not be enabled" "$LINENO" 5 + echo $? "Your system does not support IPv6 so it will not be enabled" "$LINENO" 5 else $as_echo "#define INET6 /**/" >>confdefs.h Index: head/irc/unreal/files/patch-doc_example.conf =================================================================== --- head/irc/unreal/files/patch-doc_example.conf (nonexistent) +++ head/irc/unreal/files/patch-doc_example.conf (revision 421368) @@ -0,0 +1,22 @@ +--- doc/example.conf.orig 2016-09-03 19:34:06 UTC ++++ doc/example.conf +@@ -33,8 +33,8 @@ + */ + + /* FOR *NIX, uncomment the following 2lines: */ +-//loadmodule "src/modules/commands.so"; +-//loadmodule "src/modules/cloak.so"; ++loadmodule "/usr/local/lib/Unreal/commands.so"; ++loadmodule "/usr/local/lib/Unreal/cloak.so"; + + /* FOR Windows, uncomment the following 2 lines: */ + //loadmodule "modules/commands.dll"; +@@ -379,7 +379,7 @@ drpass { + * }; + */ + +-log "ircd.log" { ++log "/var/log/ircd/ircd.log" { + /* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the + same log */ + maxsize 2097152; Property changes on: head/irc/unreal/files/patch-doc_example.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-include_config.h =================================================================== --- head/irc/unreal/files/patch-include_config.h (nonexistent) +++ head/irc/unreal/files/patch-include_config.h (revision 421368) @@ -0,0 +1,40 @@ +--- include/config.h.orig 2016-09-03 19:34:06 UTC ++++ include/config.h +@@ -242,16 +242,16 @@ + * line argument. These used as the default values for options absent from the user's + * unrealircd.conf. + */ +-#define CPATH "unrealircd.conf" /* server configuration file */ +-#define MPATH "ircd.motd" /* server MOTD file */ +-#define SMPATH "ircd.smotd" /* short MOTD file */ +-#define RPATH "ircd.rules" /* server rules file */ +-#define OPATH "oper.motd" /* Operators MOTD file */ +-#define LPATH "debug.log" /* Where the debug file lives, if DEBUGMODE */ +-#define PPATH "ircd.pid" /* file for server pid */ +-#define VPATH "ircd.svsmotd" /* Services MOTD append. */ +-#define BPATH "bot.motd" /* Bot MOTD */ +-#define IRCDTUNE "ircd.tune" /* tuning .. */ ++#define CPATH "/usr/local/etc/Unreal/unrealircd.conf" /* server configuration file */ ++#define MPATH "/usr/local/etc/Unreal/ircd.motd" /* server MOTD file */ ++#define SMPATH "/usr/local/etc/Unreal/ircd.smotd" /* short MOTD file */ ++#define RPATH "/usr/local/etc/Unreal/ircd.rules" /* server rules file */ ++#define OPATH "/usr/local/etc/Unreal/oper.motd" /* Operators MOTD file */ ++#define LPATH "/var/log/ircd/debug.log" /* Where the debug file lives, if DEBUGMODE */ ++#define PPATH "/var/run/ircd/ircd.pid" /* file for server pid */ ++#define VPATH "/usr/local/etc/Unreal/ircd.svsmotd" /* Services MOTD append. */ ++#define BPATH "/usr/local/etc/Unreal/bot.motd" /* Bot MOTD */ ++#define IRCDTUNE "/var/run/ircd/ircd.tune" /* tuning .. */ + + /* CHROOTDIR + * +@@ -277,8 +277,8 @@ + * define IRC_USER to that user name. This should only be defined if you + * are running as root and even then perhaps not. + */ +-/* #define IRC_USER "" */ +-/* #define IRC_GROUP "" */ ++#define IRC_USER "ircd" ++#define IRC_GROUP "ircd" + + + /* SHOW_INVISIBLE_LUSERS Property changes on: head/irc/unreal/files/patch-include_config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src_ircd.c =================================================================== --- head/irc/unreal/files/patch-src_ircd.c (nonexistent) +++ head/irc/unreal/files/patch-src_ircd.c (revision 421368) @@ -0,0 +1,17 @@ +--- src/ircd.c.orig 2016-09-03 19:34:06 UTC ++++ src/ircd.c +@@ -1422,12 +1422,12 @@ int InitwIRCD(int argc, char *argv[]) + } + #endif + #ifndef _WIN32 +- mkdir("tmp", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */ ++ mkdir("/var/run/ircd/tmp", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */ + #if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE) + mkdir("cache", S_IRUSR|S_IWUSR|S_IXUSR); /* Create the cache dir, if using curl and it doesn't exist */ + #endif + #else +- mkdir("tmp"); ++ mkdir("/var/run/ircd/tmp"); + #if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE) + mkdir("cache"); + #endif Property changes on: head/irc/unreal/files/patch-src_ircd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src_modules.c =================================================================== --- head/irc/unreal/files/patch-src_modules.c (nonexistent) +++ head/irc/unreal/files/patch-src_modules.c (revision 421368) @@ -0,0 +1,58 @@ +--- src/modules.c.orig 2016-09-03 19:34:06 UTC ++++ src/modules.c +@@ -183,12 +183,12 @@ void DeleteTempModules(void) + { + char tempbuf[PATH_MAX+1]; + #ifndef _WIN32 +- DIR *fd = opendir("tmp"); ++ DIR *fd = opendir("/var/run/ircd/tmp"); + struct dirent *dir; + + if (!fd) /* Ouch.. this is NOT good!! */ + { +- config_error("Unable to open 'tmp' directory: %s, please create one with the appropriate permissions", ++ config_error("Unable to open '/var/run/ircd' directory: %s, please create one with the appropriate permissions", + strerror(errno)); + if (!loop.ircd_booted) + exit(7); +@@ -199,19 +199,19 @@ void DeleteTempModules(void) + { + if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) + continue; +- strcpy(tempbuf, "tmp/"); ++ strcpy(tempbuf, "/var/run/ircd/tmp/"); + strcat(tempbuf, dir->d_name); + remove(tempbuf); + } + closedir(fd); + #else + WIN32_FIND_DATA hData; +- HANDLE hFile = FindFirstFile("tmp/*", &hData); ++ HANDLE hFile = FindFirstFile("/var/run/ircd/tmp/*", &hData); + if (hFile != INVALID_HANDLE_VALUE) + { + if (strcmp(hData.cFileName, ".") || strcmp(hData.cFileName, "..")) + { +- strcpy(tempbuf, "tmp/"); ++ strcpy(tempbuf, "/var/run/ircd/tmp/"); + strcat(tempbuf, hData.cFileName); + remove(tempbuf); + } +@@ -220,7 +220,7 @@ void DeleteTempModules(void) + { + if (!strcmp(hData.cFileName, ".") || !strcmp(hData.cFileName, "..")) + continue; +- strcpy(tempbuf, "tmp/"); ++ strcpy(tempbuf, "/var/run/ircd/tmp/"); + strcat(tempbuf, hData.cFileName); + remove(tempbuf); + } +@@ -329,7 +329,7 @@ char *Module_Create(char *path_) + path = path_; + + +- tmppath = unreal_mktemp("tmp", unreal_getfilename(path)); ++ tmppath = unreal_mktemp("/var/run/ircd/tmp", unreal_getfilename(path)); + if (!tmppath) + return "Unable to create temporary file!"; + #ifndef _WIN32 Property changes on: head/irc/unreal/files/patch-src_modules.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src_s__bsd.c =================================================================== --- head/irc/unreal/files/patch-src_s__bsd.c (revision 421367) +++ head/irc/unreal/files/patch-src_s__bsd.c (revision 421368) @@ -1,11 +1,11 @@ ---- src/s_bsd.c.orig 2015-08-16 06:44:25 UTC +--- src/s_bsd.c.orig 2016-09-03 19:34:06 UTC +++ src/s_bsd.c @@ -455,7 +455,7 @@ int inetport(aClient *cptr, char *name, */ if (cptr->fd == -1) { - cptr->fd = socket(AFINET, SOCK_STREAM, 0); + cptr->fd = socket(AFINET, SOCK_STREAM, IPPROTO_TCP); } if (cptr->fd < 0) { Index: head/irc/unreal/files/patch-src_s__conf.c =================================================================== --- head/irc/unreal/files/patch-src_s__conf.c (nonexistent) +++ head/irc/unreal/files/patch-src_s__conf.c (revision 421368) @@ -0,0 +1,11 @@ +--- src/s_conf.c.orig 2016-09-03 19:34:06 UTC ++++ src/s_conf.c +@@ -9841,7 +9841,7 @@ static void conf_download_complete(const + { + char *urlfile = url_getfilename(url); + char *file_basename = unreal_getfilename(urlfile); +- char *tmp = unreal_mktemp("tmp", file_basename); ++ char *tmp = unreal_mktemp("/var/run/ircd/tmp", file); + free(urlfile); + + if (cached) Property changes on: head/irc/unreal/files/patch-src_s__conf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/irc/unreal/files/patch-src_url.c =================================================================== --- head/irc/unreal/files/patch-src_url.c (nonexistent) +++ head/irc/unreal/files/patch-src_url.c (revision 421368) @@ -0,0 +1,20 @@ +--- src/url.c.orig 2016-09-03 19:34:06 UTC ++++ src/url.c +@@ -174,7 +174,7 @@ char *download_file(const char *url, cha + CURLcode res; + char *file = url_getfilename(url); + char *filename = unreal_getfilename(file); +- char *tmp = unreal_mktemp("tmp", filename ? filename : "download.conf"); ++ char *tmp = unreal_mktemp("/var/run/ircd/tmp", filename ? filename : "download.conf"); + FILE *fd; + + +@@ -359,7 +359,7 @@ void download_file_async(const char *url + { + char *file = url_getfilename(url); + char *filename = unreal_getfilename(file); +- char *tmp = unreal_mktemp("tmp", filename ? filename : "download.conf"); ++ char *tmp = unreal_mktemp("/var/run/ircd/tmp", filename ? filename : "download.conf"); + FileHandle *handle = MyMallocEx(sizeof(FileHandle)); + handle->fd = fopen(tmp, "wb"); + if (!handle->fd) Property changes on: head/irc/unreal/files/patch-src_url.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property