Index: head/irc/ircd-ratbox/Makefile =================================================================== --- head/irc/ircd-ratbox/Makefile (revision 430903) +++ head/irc/ircd-ratbox/Makefile (revision 430904) @@ -1,184 +1,183 @@ # Created by: Shaun Amott # $FreeBSD$ PORTNAME= ircd-ratbox -PORTVERSION= 3.0.8 -PORTREVISION= 9 +PORTVERSION= 3.0.10 CATEGORIES= irc ipv6 MASTER_SITES= http://www.ratbox.org/download/ \ http://www.ratbox.org/download/old/ MAINTAINER= moggie@elasticmind.net COMMENT= Advanced, stable IRC daemon, used widely on EFnet LICENSE= GPLv2 CONFLICTS= ircd-ratbox-devel-[0-9]* charybdis-[0-9]* BROKEN_aarch64= Fails to link: missing sbrk USES= cpe libtool sqlite tar:bzip2 CPE_VENDOR= ratbox USE_RC_SUBR= ircd-ratbox USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox MAKE_JOBS_UNSAFE= yes USERS= ircd GROUPS= ${USERS} LOGDIR?= /var/log/${PORTNAME} RUNDIR?= /var/run/${PORTNAME} DBDIR?= /var/db/${PORTNAME} SUB_FILES= pkg-message PLIST_SUB= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/${PORTNAME} \ --with-logdir=/var/log/${PORTNAME} \ --with-moduledir=${PREFIX}/lib/${PORTNAME}/modules \ --libexecdir=${PREFIX}/libexec \ --with-helpdir=${DATADIR}/help \ --libdir=${PREFIX}/lib/${PORTNAME} \ --with-sqlite3=${LOCALBASE} \ --disable-backups INSTALL_TARGET= install-strip PORTDOCS= [^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.* #-- Options ------------------------------------------------------------ OPTIONS_DEFINE= OPENSSL IPV6 ZIPLINKS SHARED_MODS ASSERT SMALL_NET \ SERVICES SHORTCUTS ZIPLINKS_DESC= Support compressed server links SHARED_MODS_DESC= Support shared modules ASSERT_DESC= Enable debugging code SMALL_NET_DESC= Tune server internals for small networks SERVICES_DESC= Enable ratbox-services compatibility code SHORTCUTS_DESC= Build with ircd-shortcut commands OPTIONS_DEFAULT= OPENSSL ZIPLINKS SHARED_MODS OPTIONS_EXCLUDE= NLS EXAMPLES OPTIONS_SUB= yes ASSERT_CONFIGURE_ENABLE= assert IPV6_CONFIGURE_ENABLE= ipv6 OPENSSL_USE= openssl=yes OPENSSL_CONFIGURE_ON= --enable-openssl=${OPENSSLBASE} OPENSSL_CONFIGURE_OFF= --disable-openssl SERVICES_CONFIGURE_ENABLE= services SHARED_MODS_CONFIGURE_ON= --disable-static SHARED_MODS_CONFIGURE_OFF= --enable-static SHORTCUTS_USES= perl5 SHORTCUTS_USE= perl5=build SMALL_NET_CONFIGURE_ENABLE= small-net ZIPLINKS_CONFIGURE_ENABLE= zlib #-- User Configuration ------------------------------------------------- .if !empty(NICKLEN) CONFIGURE_ARGS+= --with-nicklen=${NICKLEN} .endif #----------------------------------------------------------------------- .include .if ${ARCH} == "i386" USE_GCC= yes .endif post-patch: .if !defined(WITH_DEBUG) ${REINPLACE_CMD} 's|@INSTALL@|@INSTALL@ -s|' ${WRKSRC}/install-mod.sh.in .endif pre-configure: @${ECHO_MSG} "" @${ECHO_MSG} "This port has additional options:" @${ECHO_MSG} " NICKLEN [default 9, max 50] - Max nick length on server" @${ECHO_MSG} "" @${ECHO_MSG} " SERVER_NAME [default 'services.ircd-ratbox.org'] - Name of services" @${ECHO_MSG} " USER_SERV [default 'USERSERV'] - Name of user registration service" @${ECHO_MSG} " CHAN_SERV [default 'CHANSERV'] - Name of channel registration serv'" @${ECHO_MSG} " NICK_SERV [default 'NICKSERV'] - Name of nickname registration serv'" @${ECHO_MSG} " ALIS_SERV [default 'ALIS'] - Name of channel list service" @${ECHO_MSG} " OPER_BOT [default 'OPERBOT'] - Name of operbot service" @${ECHO_MSG} " OPER_SERV [default 'OPERSERV'] - Name of oper command service" @${ECHO_MSG} " JUPE_SERV [default 'JUPESERV'] - Name of jupe service" @${ECHO_MSG} " GLOBAL_SERV [default 'GLOBAL'] - Name of global announce service" @${ECHO_MSG} "" @${ECHO_MSG} "Press CTRL+C now if you wish to set them." @${ECHO_MSG} "" pre-build: @${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g" \ ${WRKSRC}/doc/example.conf \ ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g" \ ${WRKSRC}/doc/example.conf \ ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" \ ${WRKSRC}/doc/example.conf \ ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h #-- ircd-shortcut.pl ratbox-services commands -------------------------------------- @${REINPLACE_CMD} -e "s#ALIS#${ALIS_SERV:UALIS}#" \ -e "s#CHANSERV#${CHAN_SERV:UCHANSERV}#" -e "s#GLOBAL#${GLOBAL_SERV:UGLOBAL}#" \ -e "s#JUPESERV#${JUPE_SERV:UJUPESERV}#" -e "s#NICKSERV#${NICK_SERV:UNICKSERV}#" \ -e "s#OPERBOT#${OPER_BOT:UOPERBOT}#" -e "s#USERSERV#${USER_SERV:UUSERSERV}#" \ -e "s#services.ircd-ratbox.org#${SERVER_NAME:Uservices.ircd-ratbox.org}#" \ -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl # ----- Execute ircd-shortcut perl script to generate the .c file. ----- .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Executing ircd-shortcut.pl for ircd-shortcuts generation." ${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl .endif post-build: @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ---- .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts." @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la .endif pre-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${DATADIR}/help ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${RUNDIR} ${MKDIR} ${STAGEDIR}${DBDIR} ${MKDIR} ${STAGEDIR}${LOGDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample ${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/genssl.sh .if !defined(WITH_DEBUG) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ircd-ratbox/libcore.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ircd-ratbox/libratbox.so .endif # ----- We need to install the shortcut.pl module ---- .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation." ${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/contrib .endif .include Index: head/irc/ircd-ratbox/distinfo =================================================================== --- head/irc/ircd-ratbox/distinfo (revision 430903) +++ head/irc/ircd-ratbox/distinfo (revision 430904) @@ -1,2 +1,3 @@ -SHA256 (ircd-ratbox-3.0.8.tar.bz2) = 6d871030ed6fba2b6f46c3e2f3bd37f375fae5dc91441081f9aabc8ccbe2d603 -SIZE (ircd-ratbox-3.0.8.tar.bz2) = 2419597 +TIMESTAMP = 1483736802 +SHA256 (ircd-ratbox-3.0.10.tar.bz2) = 8d871ab81e8581179c3b831e25bd2f6d4f6dfc77380cb190237221bda247ead4 +SIZE (ircd-ratbox-3.0.10.tar.bz2) = 2937050 Index: head/irc/ircd-ratbox/files/patch-contrib_Makefile.in =================================================================== --- head/irc/ircd-ratbox/files/patch-contrib_Makefile.in (revision 430903) +++ head/irc/ircd-ratbox/files/patch-contrib_Makefile.in (nonexistent) @@ -1,25 +0,0 @@ -Fix linking ssl, used /usr/include/openssl even when --enable-openssl=%LOCALBASE% -was used - ---- contrib/Makefile.in.orig 2012-03-11 00:12:06 UTC -+++ contrib/Makefile.in -@@ -202,7 +202,7 @@ coredir = @moduledir@ - servicesdir = @moduledir@/autoload - libmodulesdir = @moduledir@ - contribdir = @moduledir@/contrib --INCLUDES = -I../include -I../libratbox/include $(INCLTDL) -+INCLUDES = -I../include -I../libratbox/include $(INCLTDL) $(SSL_INCLUDES) - AM_CFLAGS = $(WARNFLAGS) - SRCS = \ - example_module.c \ -@@ -429,8 +429,8 @@ clean-generic: - $(LIBTOOL) --mode=clean $(RB_RM) -f $(S_OBJS) $(S_CORE_OBJS) $(ST_OBJS) - - install_modules: $(S_OBJS) -- -@@$(MKDIR_P) $(contribdir); \ -- for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(contribdir);done -+ -@@$(MKDIR_P) $(DESTDIR)$(contribdir); \ -+ for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(DESTDIR)$(contribdir);done - - #install-mkdirs: - # @echo "ircd: setting up modular directory structure" Property changes on: head/irc/ircd-ratbox/files/patch-contrib_Makefile.in ___________________________________________________________________ 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: head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c =================================================================== --- head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c (revision 430903) +++ head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c (nonexistent) @@ -1,15 +0,0 @@ ---- libratbox/src/openssl.c.orig 2012-03-16 07:29:42.000000000 +0100 -+++ libratbox/src/openssl.c 2015-03-10 21:01:33.572383130 +0100 -@@ -556,10 +556,12 @@ - - switch (seed_type) - { -+#ifndef OPENSSL_NO_EGD - case RB_PRNG_EGD: - if(RAND_egd(path) == -1) - return -1; - break; -+#endif - case RB_PRNG_FILE: - if(RAND_load_file(path, -1) == -1) - return -1; Property changes on: head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.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