svn commit: r421368 - in head/irc/unreal: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Sep 5 13:51:42 UTC 2016
Author: mat
Date: Mon Sep 5 13:51:40 2016
New Revision: 421368
URL: https://svnweb.freebsd.org/changeset/ports/421368
Log:
Update to 3.2.10.7
Changes: https://forums.unrealircd.org/viewtopic.php?f=1&t=8588
Sponsored by: Absolight
Added:
head/irc/unreal/files/patch-doc_example.conf (contents, props changed)
- copied, changed from r421367, head/irc/unreal/files/patch-doc__example.conf
head/irc/unreal/files/patch-include_config.h (contents, props changed)
- copied, changed from r421367, head/irc/unreal/files/patch-include__config.h
head/irc/unreal/files/patch-src_ircd.c (contents, props changed)
- copied, changed from r421367, head/irc/unreal/files/patch-src__ircd.c
head/irc/unreal/files/patch-src_modules.c (contents, props changed)
- copied, changed from r421367, head/irc/unreal/files/patch-src__modules.c
head/irc/unreal/files/patch-src_s__conf.c (contents, props changed)
head/irc/unreal/files/patch-src_url.c (contents, props changed)
- copied, changed from r421367, head/irc/unreal/files/patch-src__url.c
Deleted:
head/irc/unreal/files/patch-doc__example.conf
head/irc/unreal/files/patch-include__config.h
head/irc/unreal/files/patch-src__ircd.c
head/irc/unreal/files/patch-src__modules.c
head/irc/unreal/files/patch-src__s_conf.c
head/irc/unreal/files/patch-src__url.c
Modified:
head/irc/unreal/Makefile (contents, props changed)
head/irc/unreal/distinfo (contents, props changed)
head/irc/unreal/files/patch-Makefile.in (contents, props changed)
head/irc/unreal/files/patch-configure (contents, props changed)
head/irc/unreal/files/patch-src_s__bsd.c (contents, props changed)
Modified: head/irc/unreal/Makefile
==============================================================================
--- head/irc/unreal/Makefile Mon Sep 5 13:51:32 2016 (r421367)
+++ head/irc/unreal/Makefile Mon Sep 5 13:51:40 2016 (r421368)
@@ -2,8 +2,7 @@
# $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}
@@ -16,8 +15,6 @@ 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
Modified: head/irc/unreal/distinfo
==============================================================================
--- head/irc/unreal/distinfo Mon Sep 5 13:51:32 2016 (r421367)
+++ head/irc/unreal/distinfo Mon Sep 5 13:51:40 2016 (r421368)
@@ -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
Modified: head/irc/unreal/files/patch-Makefile.in
==============================================================================
--- head/irc/unreal/files/patch-Makefile.in Mon Sep 5 13:51:32 2016 (r421367)
+++ head/irc/unreal/files/patch-Makefile.in Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,6 +1,6 @@
---- ./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=
Modified: head/irc/unreal/files/patch-configure
==============================================================================
--- head/irc/unreal/files/patch-configure Mon Sep 5 13:51:32 2016 (r421367)
+++ head/irc/unreal/files/patch-configure Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,6 +1,6 @@
---- 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
@@ -48,7 +48,7 @@
-@@ -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
Copied and modified: head/irc/unreal/files/patch-doc_example.conf (from r421367, head/irc/unreal/files/patch-doc__example.conf)
==============================================================================
--- head/irc/unreal/files/patch-doc__example.conf Mon Sep 5 13:51:32 2016 (r421367, copy source)
+++ head/irc/unreal/files/patch-doc_example.conf Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,22 +1,22 @@
---- ./doc/example.conf.orig 2013-11-24 20:24:26.000000000 +0100
-+++ ./doc/example.conf 2014-05-23 00:34:32.000000000 +0200
+--- 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 "%%PREFIX%%/lib/Unreal/commands.so";
-+loadmodule "%%PREFIX%%/lib/Unreal/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 @@
+@@ -379,7 +379,7 @@ drpass {
* };
*/
-log "ircd.log" {
-+log "%%LOGDIR%%/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;
Copied and modified: head/irc/unreal/files/patch-include_config.h (from r421367, head/irc/unreal/files/patch-include__config.h)
==============================================================================
--- head/irc/unreal/files/patch-include__config.h Mon Sep 5 13:51:32 2016 (r421367, copy source)
+++ head/irc/unreal/files/patch-include_config.h Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,5 +1,5 @@
---- ./include/config.h.orig 2013-11-24 20:24:26.000000000 +0100
-+++ ./include/config.h 2014-05-23 00:34:32.000000000 +0200
+--- 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.
@@ -14,16 +14,16 @@
-#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 .. */
++#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
*
@@ -33,8 +33,8 @@
*/
-/* #define IRC_USER "<user name>" */
-/* #define IRC_GROUP "<group name>" */
-+#define IRC_USER "%%USERS%%"
-+#define IRC_GROUP "%%GROUPS%%"
++#define IRC_USER "ircd"
++#define IRC_GROUP "ircd"
/* SHOW_INVISIBLE_LUSERS
Copied and modified: head/irc/unreal/files/patch-src_ircd.c (from r421367, head/irc/unreal/files/patch-src__ircd.c)
==============================================================================
--- head/irc/unreal/files/patch-src__ircd.c Mon Sep 5 13:51:32 2016 (r421367, copy source)
+++ head/irc/unreal/files/patch-src_ircd.c Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,17 +1,17 @@
---- ./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 @@
+--- 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("%%RUNDIR%%/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("%%RUNDIR%%/tmp");
++ mkdir("/var/run/ircd/tmp");
#if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE)
mkdir("cache");
#endif
Copied and modified: head/irc/unreal/files/patch-src_modules.c (from r421367, head/irc/unreal/files/patch-src__modules.c)
==============================================================================
--- head/irc/unreal/files/patch-src__modules.c Mon Sep 5 13:51:32 2016 (r421367, copy source)
+++ head/irc/unreal/files/patch-src_modules.c Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,26 +1,26 @@
---- ./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 @@
+--- 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("%%RUNDIR%%/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 '%%RUNDIR%%' 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 @@
+@@ -199,19 +199,19 @@ void DeleteTempModules(void)
{
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- strcpy(tempbuf, "tmp/");
-+ strcpy(tempbuf, "%%RUNDIR%%/tmp/");
++ strcpy(tempbuf, "/var/run/ircd/tmp/");
strcat(tempbuf, dir->d_name);
remove(tempbuf);
}
@@ -28,31 +28,31 @@
#else
WIN32_FIND_DATA hData;
- HANDLE hFile = FindFirstFile("tmp/*", &hData);
-+ HANDLE hFile = FindFirstFile("%%RUNDIR%%/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, "%%RUNDIR%%/tmp/");
++ strcpy(tempbuf, "/var/run/ircd/tmp/");
strcat(tempbuf, hData.cFileName);
remove(tempbuf);
}
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ void DeleteTempModules(void)
{
if (!strcmp(hData.cFileName, ".") || !strcmp(hData.cFileName, ".."))
continue;
- strcpy(tempbuf, "tmp/");
-+ strcpy(tempbuf, "%%RUNDIR%%/tmp/");
++ strcpy(tempbuf, "/var/run/ircd/tmp/");
strcat(tempbuf, hData.cFileName);
remove(tempbuf);
}
-@@ -329,7 +329,7 @@
+@@ -329,7 +329,7 @@ char *Module_Create(char *path_)
path = path_;
- tmppath = unreal_mktemp("tmp", unreal_getfilename(path));
-+ tmppath = unreal_mktemp("%%RUNDIR%%/tmp", unreal_getfilename(path));
++ tmppath = unreal_mktemp("/var/run/ircd/tmp", unreal_getfilename(path));
if (!tmppath)
return "Unable to create temporary file!";
#ifndef _WIN32
Modified: head/irc/unreal/files/patch-src_s__bsd.c
==============================================================================
--- head/irc/unreal/files/patch-src_s__bsd.c Mon Sep 5 13:51:32 2016 (r421367)
+++ head/irc/unreal/files/patch-src_s__bsd.c Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,4 +1,4 @@
---- 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,
*/
Added: head/irc/unreal/files/patch-src_s__conf.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/irc/unreal/files/patch-src_s__conf.c Mon Sep 5 13:51:40 2016 (r421368)
@@ -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)
Copied and modified: head/irc/unreal/files/patch-src_url.c (from r421367, head/irc/unreal/files/patch-src__url.c)
==============================================================================
--- head/irc/unreal/files/patch-src__url.c Mon Sep 5 13:51:32 2016 (r421367, copy source)
+++ head/irc/unreal/files/patch-src_url.c Mon Sep 5 13:51:40 2016 (r421368)
@@ -1,20 +1,20 @@
---- ./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 @@
+--- 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("%%RUNDIR%%/tmp", filename ? filename : "download.conf");
++ char *tmp = unreal_mktemp("/var/run/ircd/tmp", filename ? filename : "download.conf");
FILE *fd;
-@@ -359,7 +359,7 @@
+@@ -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("%%RUNDIR%%/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)
More information about the svn-ports-all
mailing list