From 3156eabc2738cb782e674aea1fa784738d6ef832 Mon Sep 17 00:00:00 2001 From: Chris Rees Date: Wed, 28 Dec 2011 12:13:37 +0000 Subject: [PATCH] Update to 3.2.9 PR: ports/162928 Submitted by: Jr Aquino (maintainer) --- irc/unreal/Makefile | 5 ++--- irc/unreal/distinfo | 4 ++-- irc/unreal/files/patch-Makefile.in | 10 ++++++---- irc/unreal/files/patch-ircd.c | 18 ++++++++++++------ irc/unreal/files/patch-s_conf.c | 24 +++++++++++++----------- irc/unreal/pkg-plist | 6 ++++++ 6 files changed, 41 insertions(+), 26 deletions(-) diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile index 41a09da76a9b..166db23f2614 100644 --- a/irc/unreal/Makefile +++ b/irc/unreal/Makefile @@ -6,8 +6,7 @@ # PORTNAME= Unreal -PORTVERSION= 3.2.8.1 -PORTREVISION= 3 +PORTVERSION= 3.2.9 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -20,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= cares.2:${PORTSDIR}/dns/c-ares -WRKSRC= ${WRKDIR}/${PORTNAME}3.2 +WRKSRC= ${WRKDIR}/${DISTNAME:R} MODULESDIR= ${PREFIX}/lib/${PORTNAME} CONFIGDIR= ${PREFIX}/etc/${PORTNAME} diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo index 99409ffb5734..bea8265c90c7 100644 --- a/irc/unreal/distinfo +++ b/irc/unreal/distinfo @@ -1,2 +1,2 @@ -SHA256 (Unreal3.2.8.1.tar.gz) = 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741 -SIZE (Unreal3.2.8.1.tar.gz) = 2866456 +SHA256 (Unreal3.2.9.tar.gz) = 3f581a331825d9179f5367ea6367dd0dc71c7ba615ac3c0134332086bee0e1d8 +SIZE (Unreal3.2.9.tar.gz) = 3064571 diff --git a/irc/unreal/files/patch-Makefile.in b/irc/unreal/files/patch-Makefile.in index 70d829d9f72b..deb4a9866507 100644 --- a/irc/unreal/files/patch-Makefile.in +++ b/irc/unreal/files/patch-Makefile.in @@ -1,11 +1,13 @@ ---- Makefile.in 2009-04-13 13:03:55.000000000 +0200 -+++ Makefile.in 2009-08-18 16:14:35.000000000 +0200 +$FreeBSD$ + +--- Makefile.in 2011-11-05 02:25:24.000000000 -0700 ++++ Makefile.in 2011-11-28 10:21:38.000000000 -0800 @@ -38,7 +38,7 @@ CRYPTOLIB=@CRYPTOLIB@ OPENSSLINCLUDES= --XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@ -+XCFLAGS=-I@TREINCDIR@ @CFLAGS@ +-XCFLAGS=@TRE_CFLAGS@ @CARES_CFLAGS@ @CFLAGS@ ++XCFLAGS=-I@TREINCDIR@ @TRE_CFLAGS@ @CFLAGS@ # # use the following on MIPS: #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR) diff --git a/irc/unreal/files/patch-ircd.c b/irc/unreal/files/patch-ircd.c index 54e385e3b561..ddd388cb4068 100644 --- a/irc/unreal/files/patch-ircd.c +++ b/irc/unreal/files/patch-ircd.c @@ -1,14 +1,20 @@ ---- 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 @@ +$FreeBSD$ + +--- src/ircd.c 2011-11-05 02:25:24.000000000 -0700 ++++ src/ircd.c 2011-11-28 10:21:38.000000000 -0800 +@@ -1407,12 +1407,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"); - #endif - #ifndef _WIN32 - /* + #if defined(USE_LIBCURL) && defined(REMOTEINC_SPECIALCACHE) + mkdir("cache"); + #endif + diff --git a/irc/unreal/files/patch-s_conf.c b/irc/unreal/files/patch-s_conf.c index 373b1dec30a1..ca09cc844035 100644 --- a/irc/unreal/files/patch-s_conf.c +++ b/irc/unreal/files/patch-s_conf.c @@ -1,11 +1,13 @@ ---- src/s_conf.c Mon Mar 21 09:10:42 2005 -+++ src/s_conf.c Mon Mar 21 09:15:09 2005 -@@ -8609,7 +8609,7 @@ - { - char *urlfile = url_getfilename(url); - char *file = unreal_getfilename(urlfile); -- char *tmp = unreal_mktemp("tmp", file); -+ char *tmp = unreal_mktemp("%%RUNDIR%%/tmp", file); - unreal_copyfileex(inc->file, tmp, 1); - add_remote_include(tmp, url, 0, NULL); - free(urlfile); +$FreeBSD$ + +--- src/s_conf.c 2011-11-05 02:25:24.000000000 -0700 ++++ src/s_conf.c 2011-11-28 10:21:38.000000000 -0800 +@@ -9652,7 +9652,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) diff --git a/irc/unreal/pkg-plist b/irc/unreal/pkg-plist index c90109b70d34..bc428b2e5f49 100644 --- a/irc/unreal/pkg-plist +++ b/irc/unreal/pkg-plist @@ -3,6 +3,9 @@ @unexec if cmp -s %D/etc/Unreal/aliases/aliases.conf %D/%%EXAMPLESDIR%%/aliases/aliases.conf; then rm -f %D/etc/Unreal/aliases/aliases.conf; fi %%EXAMPLESDIR%%/aliases/aliases.conf @exec [ -f %D/etc/Unreal/aliases/aliases.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/aliases.conf %D/etc/Unreal/aliases/aliases.conf +@unexec if cmp -s %D/etc/Unreal/aliases/atheme.conf %D/%%EXAMPLESDIR%%/aliases/atheme.conf; then rm -f %D/etc/Unreal/aliases/atheme.conf; fi +%%EXAMPLESDIR%%/aliases/atheme.conf +@exec [ -f %D/etc/Unreal/aliases/atheme.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/atheme.conf %D/etc/Unreal/aliases/atheme.conf @unexec if cmp -s %D/etc/Unreal/aliases/anope.conf %D/%%EXAMPLESDIR%%/aliases/anope.conf; then rm -f %D/etc/Unreal/aliases/anope.conf; fi %%EXAMPLESDIR%%/aliases/anope.conf @exec [ -f %D/etc/Unreal/aliases/anope.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/anope.conf %D/etc/Unreal/aliases/anope.conf @@ -109,6 +112,7 @@ lib/Unreal/m_guest.so lib/Unreal/m_help.so lib/Unreal/m_htm.so lib/Unreal/m_invite.so +lib/Unreal/m_issecure.so lib/Unreal/m_ison.so lib/Unreal/m_join.so lib/Unreal/m_kick.so @@ -128,6 +132,7 @@ lib/Unreal/m_nachat.so lib/Unreal/m_names.so lib/Unreal/m_netinfo.so lib/Unreal/m_nick.so +lib/Unreal/m_nopost.so lib/Unreal/m_oper.so lib/Unreal/m_opermotd.so lib/Unreal/m_part.so @@ -152,6 +157,7 @@ lib/Unreal/m_sjoin.so lib/Unreal/m_silence.so lib/Unreal/m_sqline.so lib/Unreal/m_squit.so +lib/Unreal/m_starttls.so lib/Unreal/m_stats.so lib/Unreal/m_svsfline.so lib/Unreal/m_svsjoin.so