diff options
author | nia <nia@pkgsrc.org> | 2019-05-17 09:59:18 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-05-17 09:59:18 +0000 |
commit | 4ea743e00140898c0ebf8735927632dc61d54938 (patch) | |
tree | 18ee8e2d059c75bf6209a61425b5f145feb23848 | |
parent | 4c69eff433353cd17ca5887703eb0b25297da42a (diff) | |
download | pkgsrc-4ea743e00140898c0ebf8735927632dc61d54938.tar.gz |
inspircd3: Update to 3.1.0
Changes:
* Added a configure option, --disable-auto-extras, which disables
automatically enabling extras for which the dependencies are
available.
* Added support for disabling a STS policy for users in specific
connect classes.
* Added support for the IRCv3 Message IDs specification.
* Fixed a crash in the silence module on some older versions of
GCC.
* Fixed linking against v2 servers running the ASCII case mapping
module from inspircd-extras.
* Fixed an inverted condition in the commonchans module which made
the module not work.
* Fixed configure not failing when invalid options were passed to
it.
* Fixed pending X-lines only being applied to a single user.
* Fixed servers not specifying whether they are hidden. If no
visibility is specified then servers default to the visibility of
their parent server.
-rw-r--r-- | chat/inspircd3/Makefile | 23 | ||||
-rw-r--r-- | chat/inspircd3/PLIST | 4 | ||||
-rw-r--r-- | chat/inspircd3/distinfo | 12 | ||||
-rw-r--r-- | chat/inspircd3/options.mk | 38 | ||||
-rw-r--r-- | chat/inspircd3/patches/patch-docs_conf_inspircd.conf.example | 28 |
5 files changed, 46 insertions, 59 deletions
diff --git a/chat/inspircd3/Makefile b/chat/inspircd3/Makefile index 9b4329e5e83..91fbd418ba1 100644 --- a/chat/inspircd3/Makefile +++ b/chat/inspircd3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2019/05/11 21:15:26 nia Exp $ +# $NetBSD: Makefile,v 1.7 2019/05/17 09:59:18 nia Exp $ -DISTNAME= inspircd-3.0.1 -PKGREVISION= 1 +DISTNAME= inspircd-3.1.0 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=inspircd/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +12,7 @@ LICENSE= gnu-gpl-v2 EXTRACT_USING= bsdtar USE_TOOLS+= gmake perl pkg-config -USE_LANGUAGES= c gnu++03 +USE_LANGUAGES= c99 c++03 HAS_CONFIGURE= yes MAKE_FILE= GNUmakefile MAKE_ENV+= INSTALL=${INSTALL:Q} @@ -29,6 +28,9 @@ CONFIGURE_ARGS+= --config-dir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --data-dir=${PREFIX}/inspircd/data CONFIGURE_ARGS+= --log-dir=${PREFIX}/inspircd/logs CONFIGURE_ARGS+= --script-dir=${PREFIX}/inspircd/scripts +CONFIGURE_ARGS+= --disable-auto-extras +CONFIGURE_ARGS+= --distribution-label=pkgsrc + CONFIG_SHELL= ${PERL5} REPLACE_PERL+= tools/genssl @@ -90,17 +92,18 @@ INSTALLATION_DIRS+= ${EGDIR} INSTALLATION_DIRS+= ${EGDIR}/sql INSTALLATION_DIRS+= ${EGDIR}/services -INSPIRCD_EXTRAS_OFF+= m_regex_re2.cpp -INSPIRCD_EXTRAS_OFF+= m_regex_tre.cpp - -CONFIGURE_ARGS+= --distribution-label=pkgsrc +INSPIRCD_EXTRAS+= m_regex_posix.cpp .include "options.mk" +.if !empty(PKG_OPTIONS:Mopenssl) || !empty(PKG_OPTIONS:Mgnutls) || \ + !empty(PKG_OPTIONS:Mmbedtls) +INSPIRCD_EXTRAS+= m_sslrehashsignal.cpp +.endif + post-configure: cd ${WRKSRC} && ${CONFIGURE_ENV} ${PERL5} ./configure \ - --enable-extras=${INSPIRCD_EXTRAS_ON:C/\.cpp[ ]* m_/.cpp,m_/gW} \ - --disable-extras=${INSPIRCD_EXTRAS_OFF:C/\.cpp[ ]* m_/.cpp,m_/gW} + --enable-extras=${INSPIRCD_EXTRAS:S/.cpp m_/.cpp,m_/gW} post-install: ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR} diff --git a/chat/inspircd3/PLIST b/chat/inspircd3/PLIST index c050324733e..4f7b44bc612 100644 --- a/chat/inspircd3/PLIST +++ b/chat/inspircd3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2019/05/04 10:50:04 nia Exp $ +@comment $NetBSD: PLIST,v 1.3 2019/05/17 09:59:18 nia Exp $ bin/inspircd bin/inspircd-genssl lib/inspircd/modules/core_channel.so @@ -101,11 +101,13 @@ lib/inspircd/modules/m_ircv3_chghost.so lib/inspircd/modules/m_ircv3_ctctags.so lib/inspircd/modules/m_ircv3_echomessage.so lib/inspircd/modules/m_ircv3_invitenotify.so +lib/inspircd/modules/m_ircv3_msgid.so lib/inspircd/modules/m_ircv3_servertime.so lib/inspircd/modules/m_ircv3_sts.so lib/inspircd/modules/m_joinflood.so lib/inspircd/modules/m_kicknorejoin.so lib/inspircd/modules/m_knock.so +${PLIST.ldap}lib/inspircd/modules/m_ldap.so lib/inspircd/modules/m_ldapauth.so lib/inspircd/modules/m_ldapoper.so lib/inspircd/modules/m_lockserv.so diff --git a/chat/inspircd3/distinfo b/chat/inspircd3/distinfo index da64b23aad3..0e4db32a795 100644 --- a/chat/inspircd3/distinfo +++ b/chat/inspircd3/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2019/05/10 09:40:01 nia Exp $ +$NetBSD: distinfo,v 1.5 2019/05/17 09:59:18 nia Exp $ -SHA1 (inspircd-3.0.1.tar.gz) = 726fcc5f77c5f9d233a337de612ec27ff3f97348 -RMD160 (inspircd-3.0.1.tar.gz) = 4f72ee1f4c01bad5a04ecdb20fcba8ddcb4374f3 -SHA512 (inspircd-3.0.1.tar.gz) = 0c944719e5174fd1051ccd37569ee8fd2ce2ec53c4977219b72b1b74a014ac2406d4ef58bb72caf05db20fedd8345a50708067ddc86ab444269dc405f68d2892 -Size (inspircd-3.0.1.tar.gz) = 794215 bytes -SHA1 (patch-docs_conf_inspircd.conf.example) = c6e9da54f81a2a5d34e933281d997b5ec687da52 +SHA1 (inspircd-3.1.0.tar.gz) = 5f520f97177c9c92337170d1e25695411ca3ef59 +RMD160 (inspircd-3.1.0.tar.gz) = 8ac3d8404266f2a211dd12e074a4f6a536e21f77 +SHA512 (inspircd-3.1.0.tar.gz) = 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c +Size (inspircd-3.1.0.tar.gz) = 795435 bytes +SHA1 (patch-docs_conf_inspircd.conf.example) = 077c5b474c7ce70096b25b48b66817422b134ce0 SHA1 (patch-docs_conf_modules.conf.example) = 4a4ef063ae1c908268a34f0407a00c1df70a6a18 SHA1 (patch-docs_conf_services_anope.conf.example) = ab9078cf3bbe5e7393a8463c95b8db02bc5c019f SHA1 (patch-docs_conf_services_atheme.conf.example) = ad1dc932b17497ef49c6daf50984f566c402eb2b diff --git a/chat/inspircd3/options.mk b/chat/inspircd3/options.mk index cf2ac0d2b48..7afd1cd05bc 100644 --- a/chat/inspircd3/options.mk +++ b/chat/inspircd3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/05/03 17:14:27 nia Exp $ +# $NetBSD: options.mk,v 1.2 2019/05/17 09:59:18 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.inspircd PKG_SUPPORTED_OPTIONS= gnutls geoip openssl mysql mbedtls ldap pcre pgsql sqlite3 @@ -9,72 +9,54 @@ PLIST_VARS+= gnutls geoip openssl mysql mbedtls ldap pcre pgsql sqlite3 .if !empty(PKG_OPTIONS:Mgeoip) PLIST.geoip= yes -INSPIRCD_EXTRAS_ON+= m_geo_maxmind.cpp +INSPIRCD_EXTRAS+= m_geo_maxmind.cpp .include "../../geography/libmaxminddb/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_geo_maxmind.cpp .endif .if !empty(PKG_OPTIONS:Mgnutls) PLIST.gnutls= yes -INSPIRCD_EXTRAS_ON+= m_ssl_gnutls.cpp +INSPIRCD_EXTRAS+= m_ssl_gnutls.cpp .include "../../security/gnutls/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_ssl_gnutls.cpp .endif .if !empty(PKG_OPTIONS:Mopenssl) PLIST.openssl= yes -INSPIRCD_EXTRAS_ON+= m_ssl_openssl.cpp +INSPIRCD_EXTRAS+= m_ssl_openssl.cpp .include "../../security/openssl/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_ssl_openssl.cpp .endif .if !empty(PKG_OPTIONS:Mmbedtls) PLIST.mbedtls= yes -INSPIRCD_EXTRAS_ON+= m_ssl_mbedtls.cpp +INSPIRCD_EXTRAS+= m_ssl_mbedtls.cpp .include "../../security/mbedtls/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_ssl_mbedtls.cpp .endif .if !empty(PKG_OPTIONS:Mmysql) PLIST.mysql= yes -INSPIRCD_EXTRAS_ON+= m_mysql.cpp +INSPIRCD_EXTRAS+= m_mysql.cpp .include "../../mk/mysql.buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_mysql.cpp .endif .if !empty(PKG_OPTIONS:Mldap) PLIST.ldap= yes -INSPIRCD_EXTRAS_ON+= m_mysql.cpp +INSPIRCD_EXTRAS+= m_ldap.cpp .include "../../databases/openldap-client/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_mysql.cpp .endif .if !empty(PKG_OPTIONS:Mpcre) PLIST.pcre= yes -INSPIRCD_EXTRAS_ON+= m_regex_pcre.cpp +INSPIRCD_EXTRAS+= m_regex_pcre.cpp .include "../../devel/pcre/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_regex_pcre.cpp .endif .if !empty(PKG_OPTIONS:Mpgsql) PLIST.pgsql= yes -INSPIRCD_EXTRAS_ON+= m_pgsql.cpp +INSPIRCD_EXTRAS+= m_pgsql.cpp .include "../../mk/pgsql.buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_pgsql.cpp .endif .if !empty(PKG_OPTIONS:Msqlite3) PLIST.sqlite3= yes -INSPIRCD_EXTRAS_ON+= m_sqlite3.cpp +INSPIRCD_EXTRAS+= m_sqlite3.cpp .include "../../databases/sqlite3/buildlink3.mk" -.else -INSPIRCD_EXTRAS_OFF+= m_sqlite3.cpp .endif diff --git a/chat/inspircd3/patches/patch-docs_conf_inspircd.conf.example b/chat/inspircd3/patches/patch-docs_conf_inspircd.conf.example index e55c4b8abf9..e85ae3a6bb5 100644 --- a/chat/inspircd3/patches/patch-docs_conf_inspircd.conf.example +++ b/chat/inspircd3/patches/patch-docs_conf_inspircd.conf.example @@ -1,26 +1,26 @@ -$NetBSD: patch-docs_conf_inspircd.conf.example,v 1.1 2019/05/03 17:14:28 nia Exp $ +$NetBSD: patch-docs_conf_inspircd.conf.example,v 1.2 2019/05/17 09:59:18 nia Exp $ -Don't use /etc/inspircd/examples. +Don't use ${PKG_SYSCONFDIR}/inspircd/examples. Set pidfile. ---- docs/conf/inspircd.conf.example.orig 2019-05-03 13:07:32.000000000 +0000 +--- docs/conf/inspircd.conf.example.orig 2019-05-17 08:51:03.000000000 +0000 +++ docs/conf/inspircd.conf.example -@@ -457,11 +457,11 @@ +@@ -465,11 +465,11 @@ # This file has all the information about oper classes, types and o:lines. # You *MUST* edit it. --<include file="examples/opers.conf.example"> -+<include file="opers.conf"> +-#<include file="examples/opers.conf.example"> ++#<include file="opers.conf"> # This file has all the information about server links and ulined servers. # You *MUST* edit it if you intend to link servers. --<include file="examples/links.conf.example"> -+<include file="links.conf"> +-#<include file="examples/links.conf.example"> ++#<include file="links.conf"> #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # -@@ -470,7 +470,7 @@ +@@ -478,7 +478,7 @@ # # motd - displayed on connect and when a user executes /MOTD # Modules can also define their own files @@ -29,7 +29,7 @@ Set pidfile. # Example of an executable file include. Note this will be read on rehash, # not when the command is run. -@@ -506,7 +506,7 @@ +@@ -514,7 +514,7 @@ # the default of 'inspircd.pid' is used. # # # @@ -38,16 +38,16 @@ Set pidfile. #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# # # -@@ -1002,7 +1002,7 @@ +@@ -1012,7 +1012,7 @@ # provide almost all the features of InspIRCd. :) # # # # The default does nothing -- we include it for simplicity for you. # --<include file="examples/modules.conf.example"> -+<include file="modules.conf"> +-#<include file="examples/modules.conf.example"> ++#<include file="modules.conf"> #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# # # -@@ -1011,13 +1011,13 @@ +@@ -1021,13 +1021,13 @@ # exemptions for services pseudoclients: # # # Anope users should uncomment this: |