- Update to 3.2.8.1

PR:		137923
Submitted by:	Gerrit Beine <gerrit.beine@gmx.de> (maintainer)

11 files changed, 35 insertions, 192 deletions

diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index cb931a5976bd..237459b91465 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Unreal
-PORTVERSION=	3.2.7
-PORTREVISION=	3
+PORTVERSION=	3.2.8.1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://unrealircd.pimpmylinux.org/ \
 		http://unrealircd.icedslash.com/
@@ -18,7 +17,7 @@ COMMENT=	Unreal - the next generation ircd
 
 LIB_DEPENDS=	cares.2:${PORTSDIR}/dns/c-ares
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}3.2
 
 MODULESDIR=	${PREFIX}/lib/${PORTNAME}
 CONFIGDIR=	${PREFIX}/etc/${PORTNAME}
diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo
index cd5d1aa36a42..cca6557e764e 100644
--- a/irc/unreal/distinfo
+++ b/irc/unreal/distinfo
@@ -1,3 +1,3 @@
-MD5 (Unreal3.2.7.tar.gz) = 39d3a58f4ad7b5407b6e2093f666b20c
-SHA256 (Unreal3.2.7.tar.gz) = f80078da5e9efa1487ab22957aeb295f94c2d4efd144f825f1efc5ee8df72d46
-SIZE (Unreal3.2.7.tar.gz) = 2801622
+MD5 (Unreal3.2.8.1.tar.gz) = 7b741e94e867c0a7370553fd01506c66
+SHA256 (Unreal3.2.8.1.tar.gz) = 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741
+SIZE (Unreal3.2.8.1.tar.gz) = 2866456
diff --git a/irc/unreal/files/patch-Makefile.in b/irc/unreal/files/patch-Makefile.in
index 4549ece2e1c1..70d829d9f72b 100644
--- a/irc/unreal/files/patch-Makefile.in
+++ b/irc/unreal/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Dec  5 15:59:38 2006
-+++ Makefile.in	Tue Dec  5 15:59:53 2006
+--- Makefile.in	2009-04-13 13:03:55.000000000 +0200
++++ Makefile.in	2009-08-18 16:14:35.000000000 +0200
 @@ -38,7 +38,7 @@
  CRYPTOLIB=@CRYPTOLIB@
  OPENSSLINCLUDES=
diff --git a/irc/unreal/files/patch-config.h b/irc/unreal/files/patch-config.h
index d29dce038909..9a0b5539235b 100644
--- a/irc/unreal/files/patch-config.h
+++ b/irc/unreal/files/patch-config.h
@@ -1,6 +1,6 @@
---- include/config.h	Sun Mar 13 22:02:43 2005
-+++ include/config.h	Mon Mar 21 09:10:41 2005
-@@ -201,16 +201,16 @@
+--- include/config.h	2009-04-13 13:03:57.000000000 +0200
++++ include/config.h	2009-08-18 16:16:39.000000000 +0200
+@@ -210,16 +210,16 @@
   * these are only the recommened names and paths. Change as needed.
   * You must define these to something, even if you don't really want them.
   */
@@ -16,9 +16,9 @@
 -#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 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. */
diff --git a/irc/unreal/files/patch-configure b/irc/unreal/files/patch-configure
deleted file mode 100644
index c6bb59dbf3bd..000000000000
--- a/irc/unreal/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	Fri Dec 22 22:10:28 2006
-+++ configure	Wed Jan  3 09:59:42 2007
-@@ -12700,35 +12700,6 @@
- 
- cd $cur_dir
- 
--
--cares_version="1.4.0"
--echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
--echo "${ECHO_T}extracting c-ares resolver library" >&6
--cur_dir=`pwd`
--cd extras
--rm -rf c-ares-$cares_version
--if test "x$ac_cv_path_GUNZIP" = "x" ; then
--	tar xfz c-ares.tar.gz
--else
--	cp c-ares.tar.gz c-ares.tar.gz.bak
--	gunzip -f c-ares.tar.gz
--	cp c-ares.tar.gz.bak c-ares.tar.gz
--	tar xf c-ares.tar
--fi
--echo "$as_me:$LINENO: result: configuring c-ares library" >&5
--echo "${ECHO_T}configuring c-ares library" >&6
--cd c-ares-$cares_version
--./configure --prefix=$cur_dir/extras/c-ares || exit 1
--echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
--echo "${ECHO_T}compiling c-ares resolver library" >&6
--$ac_cv_prog_MAKER || exit 1
--echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
--echo "${ECHO_T}installing c-ares resolver library" >&6
--$ac_cv_prog_MAKER install || exit 1
--CARESINCDIR="$cur_dir/extras/c-ares/include"
--
--CARESLIBDIR="-L../extras/c-ares/lib"
--
- CARESLIBS="-lcares"
- 
- cd $cur_dir
diff --git a/irc/unreal/files/patch-example.conf b/irc/unreal/files/patch-example.conf
index 9c2c204ac04c..cb51bcb7a2cf 100644
--- a/irc/unreal/files/patch-example.conf
+++ b/irc/unreal/files/patch-example.conf
@@ -1,6 +1,6 @@
---- doc/example.conf	Wed Oct 27 20:45:03 2004
-+++ doc/example.conf	Mon Feb  7 03:58:38 2005
-@@ -31,8 +31,8 @@
+--- doc/example.conf	2009-04-13 13:03:55.000000000 +0200
++++ doc/example.conf	2009-08-18 16:36:29.000000000 +0200
+@@ -33,8 +33,8 @@
   */
  
  /* FOR *NIX, uncomment the following 2lines: */
@@ -11,7 +11,7 @@
  
  /* FOR Windows, uncomment the following 2 lines: */
  //loadmodule "modules/commands.dll";
-@@ -374,7 +374,7 @@
+@@ -377,7 +377,7 @@
   * };
   */
  
@@ -20,15 +20,3 @@
  	/* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the 
  	   same log */
  	maxsize 2097152;
-@@ -520,8 +520,8 @@
- 
- tld {
- 	mask *@*.fr;
--	motd "ircd.motd.fr";
--	rules "ircd.rules.fr";
-+	motd "ircd.motd";
-+	rules "ircd.rules";
- };
- 
- /* note: you can just delete the example block above,
-
diff --git a/irc/unreal/files/patch-ircd.c b/irc/unreal/files/patch-ircd.c
index ea4581e93bf2..54e385e3b561 100644
--- a/irc/unreal/files/patch-ircd.c
+++ b/irc/unreal/files/patch-ircd.c
@@ -1,6 +1,6 @@
---- src/ircd.c	Wed Oct 27 20:45:26 2004
-+++ src/ircd.c	Mon Feb  7 04:19:55 2005
-@@ -1182,9 +1182,9 @@
+--- src/ircd.c	2009-03-01 19:37:58.000000000 +0100
++++ src/ircd.c	2009-08-18 16:20:39.000000000 +0200
+@@ -1369,9 +1369,9 @@
  	}
  #endif
  #ifndef _WIN32
diff --git a/irc/unreal/files/patch-makenet b/irc/unreal/files/patch-makenet
index d9aaace3f3a4..749e50106f94 100644
--- a/irc/unreal/files/patch-makenet
+++ b/irc/unreal/files/patch-makenet
@@ -1,5 +1,5 @@
---- networks/makenet	Sun Apr 25 01:19:28 2004
-+++ networks/makenet	Mon Feb  7 04:24:00 2005
+--- networks/makenet	2004-04-25 01:19:28.000000000 +0200
++++ networks/makenet	2009-08-18 16:21:50.000000000 +0200
 @@ -241,10 +241,10 @@
  __EOF__
  
diff --git a/irc/unreal/files/patch-modules.c b/irc/unreal/files/patch-modules.c
index 712d073c5682..601b75114770 100644
--- a/irc/unreal/files/patch-modules.c
+++ b/irc/unreal/files/patch-modules.c
@@ -1,6 +1,6 @@
---- src/modules.c	Wed Oct 27 20:45:27 2004
-+++ src/modules.c	Mon Feb  7 04:01:47 2005
-@@ -90,12 +90,12 @@
+--- src/modules.c	2009-04-13 13:03:58.000000000 +0200
++++ src/modules.c	2009-08-18 16:29:34.000000000 +0200
+@@ -177,12 +177,12 @@
  {
  	char tempbuf[PATH_MAX+1];
  #ifndef _WIN32
@@ -15,7 +15,7 @@
  			strerror(errno));
  		if (!loop.ircd_booted)
  			exit(7);
-@@ -106,7 +106,7 @@
+@@ -193,19 +193,19 @@
  	{
  		if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
  			continue;
@@ -24,7 +24,12 @@
  		strcat(tempbuf, dir->d_name);
  		remove(tempbuf);
  	}
-@@ -118,7 +118,7 @@
+ 	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, ".."))
  		{
@@ -33,7 +38,7 @@
  			strcat(tempbuf, hData.cFileName);
  			remove(tempbuf);
  		}
-@@ -127,7 +127,7 @@
+@@ -214,7 +214,7 @@
  	{
  		if (!strcmp(hData.cFileName, ".") || !strcmp(hData.cFileName, ".."))
  			continue;
@@ -42,12 +47,3 @@
  		strcat(tempbuf, hData.cFileName);
  		remove(tempbuf);
  	}
-@@ -200,7 +200,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!";
- 	if(!strchr(path, '/'))
diff --git a/irc/unreal/files/patch-res.c b/irc/unreal/files/patch-res.c
deleted file mode 100644
index e359baaf19c7..000000000000
--- a/irc/unreal/files/patch-res.c
+++ /dev/null
@@ -1,104 +0,0 @@
---- src/res.c	2006-09-19 15:45:18.000000000 +0300
-+++ src/res.c	2009-06-17 17:50:18.000000000 +0300
-@@ -48,10 +48,15 @@
- 
- #include <res.h>
- 
-+/* Prevent crashes due to invalid prototype/ABI */
-+#if ARES_VERSION < 0x010600
-+ #error "You have an old c-ares version on your system and/or Unreals c-ares failed to compile!"
-+#endif
-+
- /* Forward declerations */
--void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he);
--void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he);
--void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he);
-+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he);
-+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he);
-+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he);
- void unrealdns_delasyncconnects(void);
- static unsigned int unrealdns_haship(void *binaryip, int length);
- static void unrealdns_addtocache(char *name, void *binaryip, int length);
-@@ -240,7 +245,7 @@
- #endif
- }
- 
--void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he)
-+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he)
- {
- DNSReq *r = (DNSReq *)arg;
- DNSReq *newr;
-@@ -290,7 +295,7 @@
- }
- 
- 
--void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he)
-+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he)
- {
- DNSReq *r = (DNSReq *)arg;
- aClient *acptr = r->cptr;
-@@ -363,7 +368,7 @@
- 	unrealdns_freeandremovereq(r);
- }
- 
--void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he)
-+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he)
- {
- DNSReq *r = (DNSReq *)arg;
- int n;
-@@ -390,9 +395,11 @@
- 		/* fatal error while resolving */
- 		sendto_realops("Unable to resolve hostname '%s', when trying to connect to server %s.",
- 			r->name, r->linkblock->servername);
-+		r->linkblock->refcount--;
- 		unrealdns_freeandremovereq(r);
- 		return;
- 	}
-+	r->linkblock->refcount--;
- 
- #ifdef INET6
- 	if (((he->h_length != 4) && (he->h_length != 16)) || !he->h_addr_list[0])
-@@ -715,21 +722,34 @@
- 	} else
- 	if (*param == 'i') /* INFORMATION */
- 	{
--		struct ares_config_info inf;
-+		struct ares_options inf;
- 		int i;
-+		int optmask;
- 		
--		ares_get_config(&inf, resolver_channel);
-+		ares_save_options(resolver_channel, &inf, &optmask);
- 
- 		sendtxtnumeric(sptr, "****** DNS Configuration Information ******");
- 		sendtxtnumeric(sptr, " c-ares version: %s",ares_version(NULL));
--		sendtxtnumeric(sptr, "        timeout: %d", inf.timeout);
--		sendtxtnumeric(sptr, "          tries: %d", inf.tries);
--		sendtxtnumeric(sptr, "   # of servers: %d", inf.numservers);
--		for (i = 0; i < inf.numservers; i++)
--			sendtxtnumeric(sptr, "      server #%d: %s", i+1, inf.servers[i] ? inf.servers[i] : "[???]");
--			
--		/* TODO: free or get memleak ! */
-+
-+		if(optmask & ARES_OPT_TIMEOUTMS)
-+			sendtxtnumeric(sptr, "        timeout: %d", inf.timeout);
-+		if(optmask & ARES_OPT_TRIES)
-+			sendtxtnumeric(sptr, "          tries: %d", inf.tries);
-+		if(optmask & ARES_OPT_SERVERS)
-+		{
-+			sendtxtnumeric(sptr, "   # of servers: %d", inf.nservers);
-+			for (i = 0; i < inf.nservers; i++)
-+				sendtxtnumeric(sptr, "      server #%d: %s", i+1, inet_ntoa(inf.servers[i]));	
-+		}
-+		if(optmask & ARES_OPT_DOMAINS)
-+		{
-+			sendtxtnumeric(sptr, "   # of search domains: %d", inf.ndomains);
-+			for (i = 0; i < inf.ndomains; i++)
-+				sendtxtnumeric(sptr, "      domain #%d: %s", i+1, inf.domains[i]);
-+		}
- 		sendtxtnumeric(sptr, "****** End of DNS Configuration Info ******");
-+		
-+		ares_destroy_options(&inf);
- 	} else /* STATISTICS */
- 	{
- 		sendtxtnumeric(sptr, "DNS CACHE Stats:");
diff --git a/irc/unreal/pkg-plist b/irc/unreal/pkg-plist
index 16507542fe9b..c90109b70d34 100644
--- a/irc/unreal/pkg-plist
+++ b/irc/unreal/pkg-plist
@@ -87,6 +87,7 @@ libexec/ircd
 lib/Unreal/cloak.so
 lib/Unreal/commands.so
 lib/Unreal/m_addline.so
+lib/Unreal/m_addmotd.so
 lib/Unreal/m_addomotd.so
 lib/Unreal/m_admin.so
 lib/Unreal/m_adminchat.so
@@ -155,6 +156,7 @@ lib/Unreal/m_stats.so
 lib/Unreal/m_svsfline.so
 lib/Unreal/m_svsjoin.so
 lib/Unreal/m_svskill.so
+lib/Unreal/m_svslusers.so
 lib/Unreal/m_svsmode.so
 lib/Unreal/m_svsmotd.so
 lib/Unreal/m_svsnick.so