Index: branches/2015Q3/irc/unreal/Makefile =================================================================== --- branches/2015Q3/irc/unreal/Makefile (revision 394632) +++ branches/2015Q3/irc/unreal/Makefile (revision 394633) @@ -1,143 +1,143 @@ # Created by: Gerrit Beine () # $FreeBSD$ PORTNAME= Unreal -PORTVERSION= 3.2.10.4 -PORTREVISION= 2 +PORTVERSION= 3.2.10.5 +PORTREVISION= 0 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:${PORTSDIR}/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:${PORTSDIR}/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} -m 0700 ${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 post-install: .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: branches/2015Q3/irc/unreal/distinfo =================================================================== --- branches/2015Q3/irc/unreal/distinfo (revision 394632) +++ branches/2015Q3/irc/unreal/distinfo (revision 394633) @@ -1,2 +1,2 @@ -SHA256 (Unreal3.2.10.4.tar.gz) = 5041b67745d0bd2072cf9b74c07853085b8b5b07330263f0986bdc56eda98aa8 -SIZE (Unreal3.2.10.4.tar.gz) = 3540227 +SHA256 (Unreal3.2.10.5.tar.gz) = fd1482356763dce30144ad425704e5d6527195acf564a02419006004c8c632fd +SIZE (Unreal3.2.10.5.tar.gz) = 3537602 Index: branches/2015Q3/irc/unreal/files/patch-configure.ac =================================================================== --- branches/2015Q3/irc/unreal/files/patch-configure.ac (revision 394632) +++ branches/2015Q3/irc/unreal/files/patch-configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- configure.ac.orig 2014-07-26 15:42:10 UTC -+++ configure.ac -@@ -93,6 +93,8 @@ AC_CHECK_LIB(socket, socket, - AC_CHECK_LIB(nsl, inet_ntoa, - [IRCDLIBS="$IRCDLIBS-lnsl " - INETLIB="-lnsl"]) -+AC_CHECK_LIB(crypto, RAND_egd, -+ AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd])) - - AC_SUBST(IRCDLIBS) - AC_SUBST(MKPASSWDLIBS) Property changes on: branches/2015Q3/irc/unreal/files/patch-configure.ac ___________________________________________________________________ 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: branches/2015Q3/irc/unreal/files/patch-include_dynconf.h =================================================================== --- branches/2015Q3/irc/unreal/files/patch-include_dynconf.h (revision 394632) +++ branches/2015Q3/irc/unreal/files/patch-include_dynconf.h (nonexistent) @@ -1,14 +0,0 @@ ---- include/dynconf.h.orig 2014-07-26 15:42:10 UTC -+++ include/dynconf.h -@@ -204,7 +204,11 @@ extern MODVAR aConfiguration iConf; - #define SHOWCONNECTINFO iConf.show_connect_info - #define OPER_ONLY_STATS iConf.oper_only_stats - #define ANTI_SPAM_QUIT_MSG_TIME iConf.anti_spam_quit_message_time -+#ifdef HAVE_RAND_EGD - #define USE_EGD iConf.use_egd -+#else -+#define USE_EGD 0 -+#endif - #define EGD_PATH iConf.egd_path - - #define ircnetwork iConf.network.x_ircnetwork Property changes on: branches/2015Q3/irc/unreal/files/patch-include_dynconf.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: branches/2015Q3/irc/unreal/files/patch-src_random.c =================================================================== --- branches/2015Q3/irc/unreal/files/patch-src_random.c (revision 394632) +++ branches/2015Q3/irc/unreal/files/patch-src_random.c (nonexistent) @@ -1,20 +0,0 @@ ---- src/random.c.orig 2014-07-26 15:42:10 UTC -+++ src/random.c -@@ -163,7 +163,7 @@ unsigned char mdbuf[16]; - void init_random() - { - struct { --#ifdef USE_SSL -+#if defined(USE_SSL) - char egd[32]; /* from EGD */ - #endif - #ifndef _WIN32 -@@ -187,7 +187,7 @@ MEMORYSTATUS mstat; - - /* Grab non-OS specific "random" data */ - #ifdef USE_SSL -- #if OPENSSL_VERSION_NUMBER >= 0x000907000 -+ #if OPENSSL_VERSION_NUMBER >= 0x000907000 && defined(HAVE_RAND_EGD) - if (EGD_PATH) { - n = RAND_query_egd_bytes(EGD_PATH, rdat.egd, sizeof(rdat.egd)); - } Property changes on: branches/2015Q3/irc/unreal/files/patch-src_random.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: branches/2015Q3 =================================================================== --- branches/2015Q3 (revision 394632) +++ branches/2015Q3 (revision 394633) Property changes on: branches/2015Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r394632