diff options
author | nia <nia@pkgsrc.org> | 2019-08-23 10:51:48 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-08-23 10:51:48 +0000 |
commit | 5ab646a4b518e31c21c1d2971f7b54cba3a5decc (patch) | |
tree | 4ee957d1dc633f8a6ecce8b98fe292a915887343 | |
parent | bf7a3252b4beb876329120ae6081dacffbc29de6 (diff) | |
download | pkgsrc-5ab646a4b518e31c21c1d2971f7b54cba3a5decc.tar.gz |
inspircd: Update to 2.0.28
This release fixes a crash bug in the mysql module as well as fixing
several minor issues:
* Fixed BanCache entries existing after X-line expiry.
* Replaced all references to the dead InspIRCd wiki with the new InspIRCd
docs site.
* Updated all documentation links to use https.
* Updated the Module Manager source list for the new inspircd-contrib
repository.
InspIRCd v2 is now deprecated and will no longer receive security updates
after 2020-06-01.
-rw-r--r-- | chat/inspircd/DESCR | 5 | ||||
-rw-r--r-- | chat/inspircd/Makefile | 31 | ||||
-rw-r--r-- | chat/inspircd/distinfo | 10 | ||||
-rw-r--r-- | chat/inspircd/files/inspircd.conf | 8 | ||||
-rw-r--r-- | chat/inspircd/files/inspircd.sh | 4 |
5 files changed, 32 insertions, 26 deletions
diff --git a/chat/inspircd/DESCR b/chat/inspircd/DESCR index 03fb3135eab..fe1bfbf82a6 100644 --- a/chat/inspircd/DESCR +++ b/chat/inspircd/DESCR @@ -4,3 +4,8 @@ It was created from scratch to be stable, modern and lightweight. It avoids a number of design flaws and performance issues that plague other more established projects, such as UnrealIRCd, while providing the same level of feature parity. + +This is the legacy 2.0.x branch, kept for config compatibility. + +It is still maintained, but please use chat/inspircd3 if you don't +need configuration compatibility. diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile index d01f3522678..3fb76332e62 100644 --- a/chat/inspircd/Makefile +++ b/chat/inspircd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2019/08/11 13:18:03 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2019/08/23 10:51:48 nia Exp $ -DISTNAME= inspircd-2.0.27 -PKGREVISION= 4 +DISTNAME= inspircd-2.0.28 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=inspircd/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -19,10 +18,12 @@ MAKE_FILE= BSDmakefile BUILD_DEFS+= PKG_SYSCONFDIR +PKG_SYSCONFSUBDIR= inspircd + CONFIGURE_ARGS+= --with-cc="${CXX} ${CXXFLAGS} ${LDFLAGS}" CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --module-dir=${PREFIX}/lib/inspircd/modules -CONFIGURE_ARGS+= --config-dir=${PKG_SYSCONFDIR}/inspircd +CONFIGURE_ARGS+= --config-dir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --data-dir=${PREFIX}/inspircd/data CONFIGURE_ARGS+= --log-dir=${PREFIX}/inspircd/logs CONFIG_SHELL= ${PERL5} @@ -47,14 +48,14 @@ RCD_SCRIPTS= inspircd EGDIR= ${PREFIX}/share/examples/inspircd -CONF_FILES+= ${EGDIR}/motd.txt ${PKG_SYSCONFDIR}/inspircd/motd.txt -CONF_FILES+= ${EGDIR}/rules.txt ${PKG_SYSCONFDIR}/inspircd/rules.txt -CONF_FILES+= ${EGDIR}/inspircd.conf ${PKG_SYSCONFDIR}/inspircd/inspircd.conf -CONF_FILES+= ${EGDIR}/links.conf ${PKG_SYSCONFDIR}/inspircd/links.conf -CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/inspircd/modules.conf -CONF_FILES+= ${EGDIR}/opers.conf ${PKG_SYSCONFDIR}/inspircd/opers.conf -CONF_FILES+= ${EGDIR}/motd.txt ${PKG_SYSCONFDIR}/inspircd/motd.txt -CONF_FILES+= ${EGDIR}/rules.txt ${PKG_SYSCONFDIR}/inspircd/rules.txt +CONF_FILES+= ${EGDIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt +CONF_FILES+= ${EGDIR}/rules.txt ${PKG_SYSCONFDIR}/rules.txt +CONF_FILES+= ${EGDIR}/inspircd.conf ${PKG_SYSCONFDIR}/inspircd.conf +CONF_FILES+= ${EGDIR}/links.conf ${PKG_SYSCONFDIR}/links.conf +CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf +CONF_FILES+= ${EGDIR}/opers.conf ${PKG_SYSCONFDIR}/opers.conf +CONF_FILES+= ${EGDIR}/motd.txt ${PKG_SYSCONFDIR}/motd.txt +CONF_FILES+= ${EGDIR}/rules.txt ${PKG_SYSCONFDIR}/rules.txt SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure @@ -78,9 +79,9 @@ post-extract: post-install: ${RM} -f ${DESTDIR}${PREFIX}/.gdbargs - ${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/inspircd/examples/motd.txt.example ${DESTDIR}${EGDIR}/motd.txt - ${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/inspircd/examples/rules.txt.example ${DESTDIR}${EGDIR}/rules.txt - ${RM} -rf ${DESTDIR}${PKG_SYSCONFDIR}/inspircd/examples + ${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/examples/motd.txt.example ${DESTDIR}${EGDIR}/motd.txt + ${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/examples/rules.txt.example ${DESTDIR}${EGDIR}/rules.txt + ${RM} -rf ${DESTDIR}${PKG_SYSCONFDIR}/examples ${INSTALL_DATA} ${WRKSRC}/conf/*.conf ${DESTDIR}${EGDIR} .include "../../mk/pthread.buildlink3.mk" diff --git a/chat/inspircd/distinfo b/chat/inspircd/distinfo index 12e0e210710..b0ddabf1c6a 100644 --- a/chat/inspircd/distinfo +++ b/chat/inspircd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.20 2019/01/30 10:16:47 nia Exp $ +$NetBSD: distinfo,v 1.21 2019/08/23 10:51:48 nia Exp $ -SHA1 (inspircd-2.0.27.tar.gz) = e6db8a29e9270ceed51bd2fa9c45bb8a0d03aba5 -RMD160 (inspircd-2.0.27.tar.gz) = f911770fed2145086cddc91ebf0ed6d5c1bad578 -SHA512 (inspircd-2.0.27.tar.gz) = 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd -Size (inspircd-2.0.27.tar.gz) = 735970 bytes +SHA1 (inspircd-2.0.28.tar.gz) = e82d043c6645be854946b79bad086d591e111f07 +RMD160 (inspircd-2.0.28.tar.gz) = e20c8193dff1b7d54eeca6e0baefc85baf7decf7 +SHA512 (inspircd-2.0.28.tar.gz) = 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a +Size (inspircd-2.0.28.tar.gz) = 735981 bytes diff --git a/chat/inspircd/files/inspircd.conf b/chat/inspircd/files/inspircd.conf index 9f5a3db07df..4cb500c6420 100644 --- a/chat/inspircd/files/inspircd.conf +++ b/chat/inspircd/files/inspircd.conf @@ -153,11 +153,11 @@ # This file has all the information about oper classes, types and o:lines. # You *MUST* edit it. -<include file="@PKG_SYSCONFDIR@/inspircd/opers.conf"> +<include file="@PKG_SYSCONFDIR@/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="@PKG_SYSCONFDIR@/inspircd/links.conf"> +<include file="@PKG_SYSCONFDIR@/links.conf"> #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # @@ -167,7 +167,7 @@ # motd - displayed on connect and when a user executes /MOTD # rules - displayed when the user executes /RULES # Modules can also define their own files -<files motd="@PKG_SYSCONFDIR@/inspircd/motd.txt" rules="@PKG_SYSCONFDIR@/inspircd/rules.txt"> +<files motd="@PKG_SYSCONFDIR@/motd.txt" rules="@PKG_SYSCONFDIR@/rules.txt"> #-#-#-#-#-#-#-#-#-#-#-#-#- SERVER OPTIONS -#-#-#-#-#-#-#-#-#-#-#-#-# # # @@ -531,7 +531,7 @@ <exception host="*@localhost" reason="localhost"> -<include file="@PKG_SYSCONFDIR@/inspircd/modules.conf"> +<include file="@PKG_SYSCONFDIR@/modules.conf"> ######################################################################### # # diff --git a/chat/inspircd/files/inspircd.sh b/chat/inspircd/files/inspircd.sh index 885a4113297..608fba62e00 100644 --- a/chat/inspircd/files/inspircd.sh +++ b/chat/inspircd/files/inspircd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: inspircd.sh,v 1.3 2019/01/30 10:16:47 nia Exp $ +# $NetBSD: inspircd.sh,v 1.4 2019/08/23 10:51:48 nia Exp $ # # PROVIDE: inspircd # REQUIRE: DAEMON @@ -10,7 +10,7 @@ name="inspircd" rcvar=${name} command="@PREFIX@/bin/inspircd" -required_files="@PKG_SYSCONFDIR@/inspircd/inspircd.conf" +required_files="@PKG_SYSCONFDIR@/inspircd.conf" pidfile="@PREFIX@/inspircd/${name}.pid" inspircd_user="@INSPIRCD_USER@" |