Date: Mon, 31 Dec 2012 19:58:43 GMT From: JR Aquino <tanawts@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174867: Port Update to UnrealIRCD Message-ID: <201212311958.qBVJwhkn026944@red.freebsd.org> Resent-Message-ID: <201212312000.qBVK004Q007656@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174867 >Category: ports >Synopsis: Port Update to UnrealIRCD >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Dec 31 20:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: JR Aquino >Release: 9.0-RELEASE-p3 >Organization: >Environment: FreeBSD snowcrash.hbtk.org 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Port Maintainer Update of UnrealIRCD from 3.2.9 to 3.2.10 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN unreal.old/Makefile unreal/Makefile --- unreal.old/Makefile 2012-12-31 17:24:05.000000000 -0800 +++ unreal/Makefile 2012-12-31 18:26:15.000000000 -0800 @@ -6,7 +6,7 @@ # PORTNAME= Unreal -PORTVERSION= 3.2.9 +PORTVERSION= 3.2.10 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= cares.2:${PORTSDIR}/dns/c-ares -WRKSRC= ${WRKDIR}/${DISTNAME:R} +WRKSRC= ${WRKDIR}/Unreal3.2.10 MODULESDIR= ${PREFIX}/lib/${PORTNAME} CONFIGDIR= ${PREFIX}/etc/${PORTNAME} @@ -123,7 +123,6 @@ -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,%%PREFIX%%,${PREFIX}," ${WRKSRC}/networks/makenet @${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 @@ -138,7 +137,6 @@ ${MKDIR} ${CONFIGDIR} || true ${MKDIR} ${CONFIGDIR}/aliases || true ${MKDIR} ${EXAMPLESDIR}/aliases - ${MKDIR} ${DATADIR}/networks ${MKDIR} ${RUNDIR}/tmp ${MKDIR} ${LOGDIR} ${TOUCH} ${CONFIGDIR}/ircd.motd @@ -149,9 +147,6 @@ ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${EXAMPLESDIR}/unrealircd.conf ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${EXAMPLESDIR}/aliases - ${INSTALL_DATA} ${WRKSRC}/networks/*.network ${DATADIR}/networks - ${INSTALL_DATA} ${WRKSRC}/networks/networks.ndx ${DATADIR}/networks - ${INSTALL_SCRIPT} ${WRKSRC}/networks/makenet ${DATADIR}/networks ${INSTALL} ${WRKSRC}/src/modules/*.so ${MODULESDIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff -ruN unreal.old/distinfo unreal/distinfo --- unreal.old/distinfo 2012-12-31 17:24:05.000000000 -0800 +++ unreal/distinfo 2012-12-31 17:24:36.000000000 -0800 @@ -1,2 +1,2 @@ -SHA256 (Unreal3.2.9.tar.gz) = 3f581a331825d9179f5367ea6367dd0dc71c7ba615ac3c0134332086bee0e1d8 -SIZE (Unreal3.2.9.tar.gz) = 3064571 +SHA256 (Unreal3.2.10.tar.gz) = beafabc6fa2ebd4448fef424bb5efb7dceb4511032210206bfe3adf313fb9868 +SIZE (Unreal3.2.10.tar.gz) = 3132712 diff -ruN unreal.old/files/patch-makenet unreal/files/patch-makenet --- unreal.old/files/patch-makenet 2012-12-31 17:24:05.000000000 -0800 +++ unreal/files/patch-makenet 1969-12-31 16:00:00.000000000 -0800 @@ -1,17 +0,0 @@ ---- 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__ - - echo "" --echo "" >> ../unrealircd.conf --echo "// Added by makenet $DATE" >> ../unrealircd.conf --echo "include \"networks/$FILE\";" >> ../unrealircd.conf --echo "All done. I have added \"include \"networks/$FILE\"; to your unrealircd.conf" -+echo "" >> %%PREFIX%%/etc/Unreal/unrealircd.conf -+echo "// Added by makenet $DATE" >> %%PREFIX%%/etc/Unreal/unrealircd.conf -+echo "include \"%%PREFIX%%/share/Unreal/networks/$FILE\";" >> %%PREFIX%%/etc/Unreal/unrealircd.conf -+echo "All done. I have added \"include \"%%PREFIX%%/share/Unreal/networks/$FILE\"; to your unrealircd.conf" - echo "You might want to edit it if you have done makenet before" - echo "Thank you for choosing UnrealIRCd" - exit diff -ruN unreal.old/files/patch-url.c unreal/files/patch-url.c --- unreal.old/files/patch-url.c 2012-12-31 17:24:05.000000000 -0800 +++ unreal/files/patch-url.c 2012-12-31 18:06:57.000000000 -0800 @@ -1,6 +1,6 @@ ---- src/url.c Sat Jul 3 21:04:31 2004 -+++ src/url.c Mon Feb 7 04:31:06 2005 -@@ -141,7 +141,7 @@ +--- src/url.c 2012-12-28 08:04:54.000000000 -0800 ++++ src/url.c 2012-12-31 18:03:14.000000000 -0800 +@@ -171,7 +171,7 @@ CURLcode res; char *file = url_getfilename(url); char *filename = unreal_getfilename(file); @@ -9,12 +9,12 @@ FILE *fd; -@@ -236,7 +236,7 @@ +@@ -356,7 +356,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 = malloc(sizeof(FileHandle)); + FileHandle *handle = MyMallocEx(sizeof(FileHandle)); handle->fd = fopen(tmp, "wb"); if (!handle->fd) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212311958.qBVJwhkn026944>