Index: head/irc/inspircd/Makefile =================================================================== --- head/irc/inspircd/Makefile (revision 538259) +++ head/irc/inspircd/Makefile (revision 538260) @@ -1,120 +1,124 @@ # Created by: Craig Edwards # $FreeBSD$ PORTNAME= inspircd DISTVERSIONPREFIX= v -DISTVERSION= 3.5.0 +DISTVERSION= 3.6.0 CATEGORIES= irc MAINTAINER= dmgk@FreeBSD.org COMMENT= Modular C++ IRC daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/docs/LICENSE.txt # Configure script is written in perl USES= compiler:c++11-lang cpe gmake localbase:ldflags perl5 USE_GITHUB= yes USE_PERL5= build CPE_VENDOR= inspire_ircd CPE_PRODUCT= inspircd HAS_CONFIGURE= yes CONFIGURE_ARGS= --binary-dir=${PREFIX}/bin \ --config-dir=${ETCDIR} \ --data-dir=${INSPIRCD_DBDIR} \ --log-dir=${INSPIRCD_LOGDIR} \ --manual-dir=${MANPREFIX}/man/man1 \ --module-dir=${PREFIX}/libexec/${PORTNAME}/modules \ --prefix=${PREFIX}/libexec/${PORTNAME} \ --distribution-label=${OPSYS}-${PORTVERSION} \ + --uid=0 --gid=0 \ --disable-auto-extras USE_RC_SUBR= ${PORTNAME} MAKEFILE= GNUmakefile USERS= ircd GROUPS= ircd INSPIRCD_UID= 72 INSPIRCD_GID= 72 INSPIRCD_DBDIR?= /var/db/${PORTNAME} INSPIRCD_LOGDIR?= /var/log/${PORTNAME} INSPIRCD_RUNDIR?= /var/run/${PORTNAME} SUB_FILES= pkg-message SUB_LIST= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \ INSPIRCD_GROUP=${GROUPS} \ INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \ INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \ INSPIRCD_USER=${USERS} \ PORTNAME=${PORTNAME} PLIST_SUB= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \ INSPIRCD_GROUP=${GROUPS} \ INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \ INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \ INSPIRCD_USER=${USERS} -OPTIONS_DEFINE= GNUTLS IPV6 LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX SQLITE +OPTIONS_DEFINE= GNUTLS IPV6 LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX SQLITE SSLREHASH OPTIONS_DEFAULT= OPENSSL POSIX OPTIONS_SUB= yes GNUTLS_DESC= Build m_ssl_gnutls module LDAP_DESC= Build m_ldap module MBEDTLS_DESC= Build m_ssl_mbedtls module MYSQL_DESC= Build m_mysql module OPENSSL_DESC= Build m_ssl_openssl module PCRE_DESC= Build m_regex_pcre module PGSQL_DESC= Build m_pgsql module POSIX_DESC= Build m_regex_posix module SQLITE_DESC= Build m_sqlite3 module +SSLREHASH_DESC= Build m_sslrehashsignal module GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp LDAP_USE= OPENLDAP=yes LDAP_VARS= EXTRAS+=m_ldap.cpp MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp MYSQL_USES= mysql MYSQL_VARS= EXTRAS+=m_mysql.cpp OPENSSL_USES= pkgconfig ssl OPENSSL_VARS= EXTRAS+=m_ssl_openssl.cpp PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_VARS= EXTRAS+=m_regex_pcre.cpp PGSQL_USES= pgsql PGSQL_VARS= EXTRAS+=m_pgsql.cpp POSIX_VARS= EXTRAS+=m_regex_posix.cpp SQLITE_USES= pkgconfig sqlite SQLITE_VARS= EXTRAS+=m_sqlite3.cpp + +SSLREHASH_VARS+= EXTRAS+=m_sslrehashsignal.cpp pre-configure: @(cd ${WRKSRC}/src/modules && for m in ${EXTRAS}; do ${RLN} extra/$$m $$m; done) post-patch: @${REINPLACE_CMD} -e 's|%%INSPIRCD_USER%%|${USERS}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%INSPIRCD_UID%%|${INSPIRCD_UID}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%INSPIRCD_GROUP%%|${GROUPS}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%INSPIRCD_GID%%|${INSPIRCD_GID}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"${INSPIRCD_RUNDIR}/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/inspircd.conf.example @${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/modules.conf.example @${RM} ${WRKSRC}/make/template/main.mk.orig post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/modules/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${INSPIRCD_DBDIR} @${MKDIR} ${STAGEDIR}${INSPIRCD_LOGDIR} @${MKDIR} ${STAGEDIR}${INSPIRCD_RUNDIR} .include Index: head/irc/inspircd/distinfo =================================================================== --- head/irc/inspircd/distinfo (revision 538259) +++ head/irc/inspircd/distinfo (revision 538260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580731499 -SHA256 (inspircd-inspircd-v3.5.0_GH0.tar.gz) = c7e61d02bf6bde873bdf4696bf1b695e09d2d396fcaa05ff37942290d1b75c63 -SIZE (inspircd-inspircd-v3.5.0_GH0.tar.gz) = 835283 +TIMESTAMP = 1591531437 +SHA256 (inspircd-inspircd-v3.6.0_GH0.tar.gz) = f9a80ddfd8354163e0935ec65ea2c596c93152560ebb56dbeb5f8b3e1b53eb1e +SIZE (inspircd-inspircd-v3.6.0_GH0.tar.gz) = 851768 Index: head/irc/inspircd/files/patch-configure =================================================================== --- head/irc/inspircd/files/patch-configure (revision 538259) +++ head/irc/inspircd/files/patch-configure (nonexistent) @@ -1,64 +0,0 @@ ---- configure.orig 2020-01-31 12:49:58 UTC -+++ configure -@@ -208,57 +208,10 @@ if (defined $opt_system) { - $config{SCRIPT_DIR} = $opt_script_dir // $config{SCRIPT_DIR} // $config{BASE_DIR}; - } - --# Parse --gid=123 or --gid=foo and extract the group id. --my @group; --if (defined $opt_gid) { -- @group = $opt_gid =~ /^\d+$/ ? getgrgid($opt_gid) : getgrnam($opt_gid); -- print_error "there is no '$opt_gid' group on this system!" unless @group; --} else { -- @group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} // getgid()); -- print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group; -- unless ($group[2]) { -- print_warning <<"EOW"; --You are building as the privileged $group[0] group and have not specified --an unprivileged group to run InspIRCd as. -- --This is almost never what you should do. You should probably either create a new --unprivileged user/group to build and run as or pass the '--gid [id|name]' flag --to specify an unprivileged group to run as. --EOW -- if (!prompt_bool $interactive, "Are you sure you want to build as the $group[0] group?", 0) { -- say STDERR "If you are sure you want to build as the $group[0] group pass the --gid $group[2] flag." unless $interactive; -- exit 1; -- } -- } --} --$config{GROUP} = $group[0]; --$config{GID} = $group[2]; -- --# Parse --uid=123 or --uid=foo and extract the user id. --my @user; --if (defined $opt_uid) { -- @user = $opt_uid =~ /^\d+$/ ? getpwuid($opt_uid) : getpwnam($opt_uid); -- print_error "there is no '$opt_uid' user on this system!" unless @user; --} else { -- @user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} // getuid()); -- print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user; -- unless ($user[2]) { -- print_warning <<"EOW"; --You are building as the privileged $user[0] user and have not specified --an unprivileged user to run InspIRCd as. -- --This is almost never what you should do. You should probably either create a new --unprivileged user/group to build and run as or pass the '--uid [id|name]' flag --to specify an unprivileged user to run as. --EOW -- if (!prompt_bool $interactive, "Are you sure you want to build as the $user[0] user?", 0) { -- say STDERR "If you are sure you want to build as the $user[0] user pass the --uid $user[2] flag." unless $interactive; -- exit 1; -- } -- } --} --$config{USER} = $user[0]; --$config{UID} = $user[2]; -+$config{GROUP} = "%%INSPIRCD_GROUP%%"; -+$config{GID} = %%INSPIRCD_GID%%; -+$config{USER} = "%%INSPIRCD_USER%%"; -+$config{UID} = %%INSPIRCD_UID%%; - - # Warn the user about clock drifting when running on OpenVZ. - if (-e '/proc/user_beancounters' || -e '/proc/vz/vzaquota') { Property changes on: head/irc/inspircd/files/patch-configure ___________________________________________________________________ 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/inspircd/pkg-plist =================================================================== --- head/irc/inspircd/pkg-plist (revision 538259) +++ head/irc/inspircd/pkg-plist (revision 538260) @@ -1,229 +1,230 @@ bin/inspircd bin/inspircd-genssl @sample %%ETCDIR%%/examples/filter.conf.example %%ETCDIR%%/filter.conf @sample %%ETCDIR%%/examples/helpop.conf.example %%ETCDIR%%/helpop.conf @sample %%ETCDIR%%/examples/inspircd.conf.example %%ETCDIR%%/inspircd.conf @sample %%ETCDIR%%/examples/links.conf.example %%ETCDIR%%/links.conf @sample %%ETCDIR%%/examples/modules.conf.example %%ETCDIR%%/modules.conf @sample %%ETCDIR%%/examples/motd.txt.example %%ETCDIR%%/motd.txt @sample %%ETCDIR%%/examples/opermotd.txt.example %%ETCDIR%%/opermotd.txt @sample %%ETCDIR%%/examples/opers.conf.example %%ETCDIR%%/opers.conf @sample %%ETCDIR%%/examples/quotes.txt.example %%ETCDIR%%/quotes.txt %%ETCDIR%%/examples/codepages/ascii.conf.example %%ETCDIR%%/examples/codepages/latin1.conf.example %%ETCDIR%%/examples/codepages/rfc1459.conf.example %%ETCDIR%%/examples/codepages/strict-rfc1459.conf.example %%ETCDIR%%/examples/providers/irccloud.conf.example %%ETCDIR%%/examples/providers/kiwiirc-com.conf.example %%ETCDIR%%/examples/services/anope.conf.example %%ETCDIR%%/examples/services/atheme.conf.example %%ETCDIR%%/examples/services/generic.conf.example %%ETCDIR%%/examples/sql/sqloper.mysql.sql %%ETCDIR%%/examples/sql/sqloper.pgsql.sql %%ETCDIR%%/examples/sql/sqloper.sqlite3.sql libexec/inspircd/inspircd libexec/inspircd/modules/core_channel.so libexec/inspircd/modules/core_dns.so libexec/inspircd/modules/core_hostname_lookup.so libexec/inspircd/modules/core_info.so libexec/inspircd/modules/core_list.so libexec/inspircd/modules/core_loadmodule.so libexec/inspircd/modules/core_lusers.so libexec/inspircd/modules/core_message.so libexec/inspircd/modules/core_mode.so libexec/inspircd/modules/core_oper.so libexec/inspircd/modules/core_reloadmodule.so libexec/inspircd/modules/core_serialize_rfc.so libexec/inspircd/modules/core_stats.so libexec/inspircd/modules/core_stub.so libexec/inspircd/modules/core_user.so libexec/inspircd/modules/core_wallops.so libexec/inspircd/modules/core_who.so libexec/inspircd/modules/core_whois.so libexec/inspircd/modules/core_whowas.so libexec/inspircd/modules/core_xline.so libexec/inspircd/modules/m_abbreviation.so libexec/inspircd/modules/m_alias.so libexec/inspircd/modules/m_allowinvite.so libexec/inspircd/modules/m_alltime.so libexec/inspircd/modules/m_anticaps.so libexec/inspircd/modules/m_auditorium.so libexec/inspircd/modules/m_autoop.so libexec/inspircd/modules/m_banexception.so libexec/inspircd/modules/m_banredirect.so libexec/inspircd/modules/m_bcrypt.so libexec/inspircd/modules/m_blockamsg.so libexec/inspircd/modules/m_blockcaps.so libexec/inspircd/modules/m_blockcolor.so libexec/inspircd/modules/m_botmode.so libexec/inspircd/modules/m_callerid.so libexec/inspircd/modules/m_cap.so libexec/inspircd/modules/m_cban.so libexec/inspircd/modules/m_censor.so libexec/inspircd/modules/m_cgiirc.so libexec/inspircd/modules/m_chancreate.so libexec/inspircd/modules/m_chanfilter.so libexec/inspircd/modules/m_chanhistory.so libexec/inspircd/modules/m_chanlog.so libexec/inspircd/modules/m_channames.so libexec/inspircd/modules/m_channelban.so libexec/inspircd/modules/m_check.so libexec/inspircd/modules/m_chghost.so libexec/inspircd/modules/m_chgident.so libexec/inspircd/modules/m_chgname.so libexec/inspircd/modules/m_classban.so libexec/inspircd/modules/m_clearchan.so libexec/inspircd/modules/m_cloaking.so libexec/inspircd/modules/m_clones.so libexec/inspircd/modules/m_codepage.so libexec/inspircd/modules/m_commonchans.so libexec/inspircd/modules/m_conn_join.so libexec/inspircd/modules/m_conn_umodes.so libexec/inspircd/modules/m_conn_waitpong.so libexec/inspircd/modules/m_connectban.so libexec/inspircd/modules/m_connflood.so libexec/inspircd/modules/m_customprefix.so libexec/inspircd/modules/m_customtitle.so libexec/inspircd/modules/m_cycle.so libexec/inspircd/modules/m_dccallow.so libexec/inspircd/modules/m_deaf.so libexec/inspircd/modules/m_delayjoin.so libexec/inspircd/modules/m_delaymsg.so libexec/inspircd/modules/m_denychans.so libexec/inspircd/modules/m_disable.so libexec/inspircd/modules/m_dnsbl.so libexec/inspircd/modules/m_exemptchanops.so libexec/inspircd/modules/m_filter.so libexec/inspircd/modules/m_flashpolicyd.so libexec/inspircd/modules/m_gecosban.so libexec/inspircd/modules/m_geoban.so libexec/inspircd/modules/m_geoclass.so libexec/inspircd/modules/m_globalload.so libexec/inspircd/modules/m_globops.so libexec/inspircd/modules/m_haproxy.so libexec/inspircd/modules/m_helpop.so libexec/inspircd/modules/m_hidechans.so libexec/inspircd/modules/m_hidelist.so libexec/inspircd/modules/m_hidemode.so libexec/inspircd/modules/m_hideoper.so libexec/inspircd/modules/m_hostchange.so libexec/inspircd/modules/m_hostcycle.so libexec/inspircd/modules/m_httpd.so libexec/inspircd/modules/m_httpd_acl.so libexec/inspircd/modules/m_httpd_config.so libexec/inspircd/modules/m_httpd_stats.so libexec/inspircd/modules/m_ident.so libexec/inspircd/modules/m_inviteexception.so libexec/inspircd/modules/m_ircv3.so libexec/inspircd/modules/m_ircv3_accounttag.so libexec/inspircd/modules/m_ircv3_batch.so libexec/inspircd/modules/m_ircv3_capnotify.so libexec/inspircd/modules/m_ircv3_chghost.so libexec/inspircd/modules/m_ircv3_ctctags.so libexec/inspircd/modules/m_ircv3_echomessage.so libexec/inspircd/modules/m_ircv3_invitenotify.so libexec/inspircd/modules/m_ircv3_labeledresponse.so libexec/inspircd/modules/m_ircv3_msgid.so libexec/inspircd/modules/m_ircv3_servertime.so libexec/inspircd/modules/m_ircv3_sts.so libexec/inspircd/modules/m_joinflood.so libexec/inspircd/modules/m_kicknorejoin.so libexec/inspircd/modules/m_knock.so libexec/inspircd/modules/m_lockserv.so libexec/inspircd/modules/m_maphide.so libexec/inspircd/modules/m_md5.so libexec/inspircd/modules/m_messageflood.so libexec/inspircd/modules/m_mlock.so libexec/inspircd/modules/m_modenotice.so libexec/inspircd/modules/m_monitor.so libexec/inspircd/modules/m_muteban.so libexec/inspircd/modules/m_namedmodes.so libexec/inspircd/modules/m_namesx.so libexec/inspircd/modules/m_nationalchars.so libexec/inspircd/modules/m_nickflood.so libexec/inspircd/modules/m_nicklock.so libexec/inspircd/modules/m_noctcp.so libexec/inspircd/modules/m_nokicks.so libexec/inspircd/modules/m_nonicks.so libexec/inspircd/modules/m_nonotice.so libexec/inspircd/modules/m_nopartmsg.so libexec/inspircd/modules/m_ojoin.so libexec/inspircd/modules/m_operchans.so libexec/inspircd/modules/m_operjoin.so libexec/inspircd/modules/m_operlevels.so libexec/inspircd/modules/m_operlog.so libexec/inspircd/modules/m_opermodes.so libexec/inspircd/modules/m_opermotd.so libexec/inspircd/modules/m_operprefix.so libexec/inspircd/modules/m_override.so libexec/inspircd/modules/m_passforward.so libexec/inspircd/modules/m_password_hash.so libexec/inspircd/modules/m_pbkdf2.so libexec/inspircd/modules/m_permchannels.so libexec/inspircd/modules/m_randquote.so libexec/inspircd/modules/m_redirect.so libexec/inspircd/modules/m_regex_glob.so libexec/inspircd/modules/m_remove.so libexec/inspircd/modules/m_repeat.so libexec/inspircd/modules/m_restrictchans.so libexec/inspircd/modules/m_restrictmsg.so libexec/inspircd/modules/m_rline.so libexec/inspircd/modules/m_rmode.so libexec/inspircd/modules/m_sajoin.so libexec/inspircd/modules/m_sakick.so libexec/inspircd/modules/m_samode.so libexec/inspircd/modules/m_sanick.so libexec/inspircd/modules/m_sapart.so libexec/inspircd/modules/m_saquit.so libexec/inspircd/modules/m_sasl.so libexec/inspircd/modules/m_satopic.so libexec/inspircd/modules/m_securelist.so libexec/inspircd/modules/m_seenicks.so libexec/inspircd/modules/m_serverban.so libexec/inspircd/modules/m_services_account.so libexec/inspircd/modules/m_servprotect.so libexec/inspircd/modules/m_sethost.so libexec/inspircd/modules/m_setident.so libexec/inspircd/modules/m_setidle.so libexec/inspircd/modules/m_setname.so libexec/inspircd/modules/m_sha1.so libexec/inspircd/modules/m_sha256.so libexec/inspircd/modules/m_showfile.so libexec/inspircd/modules/m_showwhois.so libexec/inspircd/modules/m_shun.so libexec/inspircd/modules/m_silence.so libexec/inspircd/modules/m_spanningtree.so libexec/inspircd/modules/m_sqlauth.so libexec/inspircd/modules/m_sqloper.so libexec/inspircd/modules/m_sslinfo.so libexec/inspircd/modules/m_sslmodes.so libexec/inspircd/modules/m_starttls.so libexec/inspircd/modules/m_stripcolor.so libexec/inspircd/modules/m_svshold.so libexec/inspircd/modules/m_swhois.so libexec/inspircd/modules/m_timedbans.so libexec/inspircd/modules/m_tline.so libexec/inspircd/modules/m_topiclock.so libexec/inspircd/modules/m_uhnames.so libexec/inspircd/modules/m_uninvite.so libexec/inspircd/modules/m_userip.so libexec/inspircd/modules/m_vhost.so libexec/inspircd/modules/m_watch.so libexec/inspircd/modules/m_websocket.so libexec/inspircd/modules/m_xline_db.so %%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so %%LDAP%%libexec/inspircd/modules/m_ldap.so %%LDAP%%libexec/inspircd/modules/m_ldapauth.so %%LDAP%%libexec/inspircd/modules/m_ldapoper.so %%MBEDTLS%%libexec/inspircd/modules/m_ssl_mbedtls.so %%MYSQL%%libexec/inspircd/modules/m_mysql.so %%OPENSSL%%libexec/inspircd/modules/m_ssl_openssl.so %%PCRE%%libexec/inspircd/modules/m_regex_pcre.so %%PGSQL%%libexec/inspircd/modules/m_pgsql.so %%POSIX%%libexec/inspircd/modules/m_regex_posix.so %%SQLITE%%libexec/inspircd/modules/m_sqlite3.so +%%SSLREHASH%%libexec/inspircd/modules/m_sslrehashsignal.so man/man1/inspircd-genssl.1.gz man/man1/inspircd.1.gz @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,750) %%INSPIRCD_DBDIR%% @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_LOGDIR%% @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_RUNDIR%%