Received: by mail.netbsd.org (Postfix, from userid 605) id 578D584D7B; Wed, 7 Aug 2019 13:14:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D2AE384D66 for ; Wed, 7 Aug 2019 13:14:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id D8hLqpGK2rcJ for ; Wed, 7 Aug 2019 13:14:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 79A0584D25 for ; Wed, 7 Aug 2019 13:14:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6ECCAFBF4; Wed, 7 Aug 2019 13:14:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1565183656174440" MIME-Version: 1.0 Date: Wed, 7 Aug 2019 13:14:16 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/chat/unrealircd To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190807131416.6ECCAFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1565183656174440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Aug 7 13:14:16 UTC 2019 Modified Files: pkgsrc/chat/unrealircd: Makefile PLIST distinfo Removed Files: pkgsrc/chat/unrealircd/patches: patch-Makefile.in Log Message: unrealircd: Update to 4.2.4.1 This release fixes a crash issue if UnrealIRCd is configured to use utf8 or chinese character sets in set::allowed-nickchars. We don't expect many users to run their IRCd with this enabled, as the utf8 support was tagged as experimental and the chinese/gbk implementation is incomplete. This release also contains a number of other fixes and enhancements. In particular the reputation and connthrottle modules are now working better and there were some major Windows fixes. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 pkgsrc/chat/unrealircd/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/unrealircd/PLIST cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/unrealircd/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/chat/unrealircd/patches/patch-Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1565183656174440 Content-Disposition: inline Content-Length: 9128 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/unrealircd/Makefile diff -u pkgsrc/chat/unrealircd/Makefile:1.61 pkgsrc/chat/unrealircd/Makefile:1.62 --- pkgsrc/chat/unrealircd/Makefile:1.61 Sat Jul 20 22:46:11 2019 +++ pkgsrc/chat/unrealircd/Makefile Wed Aug 7 13:14:16 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.61 2019/07/20 22:46:11 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2019/08/07 13:14:16 nia Exp $ -DISTNAME= unrealircd-4.2.2 -PKGREVISION= 3 +DISTNAME= unrealircd-4.2.4.1 CATEGORIES= chat MASTER_SITES= https://www.unrealircd.org/unrealircd4/ @@ -16,24 +15,23 @@ GNU_CONFIGURE= YES USE_TOOLS+= aclocal autoconf autoheader automake bash USE_TOOLS+= gmake gunzip pkg-config -# 4.2.2 tarball was changed, remove on next update -DIST_SUBDIR= unrealircd-20190402 - .include "options.mk" +PKG_SYSCONFSUBDIR= unrealircd + # Quoth ./configure, # "noone knows if disabling dynamic linking actually does anything or not". # Also needed to configure non-interactively. CONFIGURE_ARGS+= --enable-dynamic-linking -# not building without SSL is apparently unsupported but this still -# seems to be required or the build breaks... -CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-ssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-system-cares -CONFIGURE_ARGS+= --with-system-tre CONFIGURE_ARGS+= --with-system-pcre2 +# Deprecated +CONFIGURE_ARGS+= --without-tre + CONFIGURE_ARGS+= --with-permissions=0660 CONFIGURE_ARGS+= --with-datadir=${PREFIX}/unrealircd/data CONFIGURE_ARGS+= --with-cachedir=${PREFIX}/unrealircd/cache @@ -44,7 +42,7 @@ CONFIGURE_ARGS+= --with-scriptdir=${PREF CONFIGURE_ARGS+= --with-bindir=${PREFIX}/bin CONFIGURE_ARGS+= --with-modulesdir=${PREFIX}/lib/unrealircd/modules CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/unrealircd -CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR}/unrealircd +CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} OWN_DIRS_PERMS+= ${PREFIX}/unrealircd ${UIRCD_USER} ${UIRCD_GROUP} 0755 OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/data ${UIRCD_USER} ${UIRCD_GROUP} 0700 @@ -53,12 +51,11 @@ OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/lo OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0700 CONFIGURE_ARGS+= --with-sendq=${UIRCD_SENDQ:Q} -CONFIGURE_ARGS+= --with-fd-setsize=${UIRCD_FDSIZE:Q} CONFIGURE_ARGS+= --with-nick-history=${UIRCD_NICKHIST:Q} IRCD_EG= ${PREFIX}/share/examples/unrealircd -BUILD_DEFS+= UIRCD_SENDQ UIRCD_NICKHIST UIRCD_FDSIZE VARBASE +BUILD_DEFS+= UIRCD_SENDQ UIRCD_NICKHIST VARBASE PTHREAD_OPTS+= require @@ -69,7 +66,6 @@ PTHREAD_OPTS+= require # UIRCD_SENDQ?= 3000000 UIRCD_NICKHIST?= 2000 -UIRCD_FDSIZE?= 1024 UIRCD_USER?= uircd UIRCD_GROUP?= uircd @@ -89,18 +85,55 @@ FILES_SUBST+= UIRCD_GROUP=${UIRCD_GROUP} CFLAGS.Darwin+= -DUSE_LOCALE CFLAGS.SunOS+= -DUSE_LOCALE +INSTALLATION_DIRS+= bin INSTALLATION_DIRS+= unrealircd/scripts +INSTALLATION_DIRS+= lib/unrealircd/modules +INSTALLATION_DIRS+= lib/unrealircd/modules/usermodes +INSTALLATION_DIRS+= lib/unrealircd/modules/chanmodes +INSTALLATION_DIRS+= lib/unrealircd/modules/snomasks +INSTALLATION_DIRS+= lib/unrealircd/modules/extbans +INSTALLATION_DIRS+= lib/unrealircd/modules/cap +INSTALLATION_DIRS+= lib/unrealircd/modules/third +INSTALLATION_DIRS+= share/doc/unrealircd INSTALLATION_DIRS+= ${IRCD_EG} +INSTALLATION_DIRS+= ${IRCD_EG}/aliases +INSTALLATION_DIRS+= ${IRCD_EG}/help +INSTALLATION_DIRS+= ${IRCD_EG}/examples +INSTALLATION_DIRS+= ${IRCD_EG}/ssl + +OWN_DIRS_PERMS+= unrealircd/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0755 +OWN_DIRS_PERMS+= unrealircd/logs ${UIRCD_USER} ${UIRCD_GROUP} 0755 +OWN_DIRS_PERMS+= unrealircd/data ${UIRCD_USER} ${UIRCD_GROUP} 0755 +OWN_DIRS_PERMS+= unrealircd/cache ${UIRCD_USER} ${UIRCD_GROUP} 0755 +OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${UIRCD_USER} ${UIRCD_GROUP} 0755 pre-configure: cd ${WRKSRC} && ${BASH} ./autogen.sh -post-install: - ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/unrealircd/* ${DESTDIR}${IRCD_EG} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${DESTDIR}${PREFIX}/bin/unrealircd + ${INSTALL_DATA} ${WRKSRC}/doc/Authors ${DESTDIR}${PREFIX}/share/doc/unrealircd + ${INSTALL_DATA} ${WRKSRC}/doc/coding-guidelines ${DESTDIR}${PREFIX}/share/doc/unrealircd + ${INSTALL_DATA} ${WRKSRC}/doc/tao.of.irc ${DESTDIR}${PREFIX}/share/doc/unrealircd + ${INSTALL_DATA} ${WRKSRC}/doc/conf/*.default.conf ${DESTDIR}${IRCD_EG} + ${INSTALL_DATA} ${WRKSRC}/doc/conf/*.optional.conf ${DESTDIR}${IRCD_EG} + ${INSTALL_DATA} ${WRKSRC}/doc/conf/spamfilter.conf ${DESTDIR}${IRCD_EG} + ${INSTALL_DATA} ${WRKSRC}/doc/conf/badwords.conf ${DESTDIR}${IRCD_EG} + ${INSTALL_DATA} ${WRKSRC}/doc/conf/dccallow.conf ${DESTDIR}${IRCD_EG} + ${INSTALL_DATA} ${WRKSRC}/doc/conf/aliases/*.conf ${DESTDIR}${IRCD_EG}/aliases + ${INSTALL_DATA} ${WRKSRC}/doc/conf/help/*.conf ${DESTDIR}${IRCD_EG}/help + ${INSTALL_DATA} ${WRKSRC}/doc/conf/examples/*.conf ${DESTDIR}${IRCD_EG}/examples + ${INSTALL_DATA} ${WRKSRC}/doc/conf/ssl/curl-ca-bundle.crt ${DESTDIR}${IRCD_EG}/ssl + ${INSTALL_SCRIPT} ${WRKSRC}/unrealircd ${DESTDIR}${PREFIX}/unrealircd/scripts + ${INSTALL_LIB} ${WRKSRC}/src/modules/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules + ${INSTALL_LIB} ${WRKSRC}/src/modules/usermodes/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/usermodes + ${INSTALL_LIB} ${WRKSRC}/src/modules/chanmodes/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/chanmodes + ${INSTALL_LIB} ${WRKSRC}/src/modules/snomasks/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/snomasks + ${INSTALL_LIB} ${WRKSRC}/src/modules/extbans/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/extbans + ${INSTALL_LIB} ${WRKSRC}/src/modules/cap/*.so ${DESTDIR}${PREFIX}/lib/unrealircd/modules/cap .include "../../net/libcares/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../devel/tre/buildlink3.mk" .include "../../devel/pcre2/buildlink3.mk" .include "../../security/argon2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" Index: pkgsrc/chat/unrealircd/PLIST diff -u pkgsrc/chat/unrealircd/PLIST:1.12 pkgsrc/chat/unrealircd/PLIST:1.13 --- pkgsrc/chat/unrealircd/PLIST:1.12 Sat Feb 9 15:23:15 2019 +++ pkgsrc/chat/unrealircd/PLIST Wed Aug 7 13:14:16 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2019/02/09 15:23:15 nia Exp $ +@comment $NetBSD: PLIST,v 1.13 2019/08/07 13:14:16 nia Exp $ bin/unrealircd lib/unrealircd/modules/antimixedutf8.so lib/unrealircd/modules/antirandom.so @@ -28,6 +28,7 @@ lib/unrealircd/modules/chanmodes/secureo lib/unrealircd/modules/chanmodes/stripcolor.so lib/unrealircd/modules/charsys.so lib/unrealircd/modules/cloak.so +lib/unrealircd/modules/connthrottle.so lib/unrealircd/modules/extbans/account.so lib/unrealircd/modules/extbans/certfp.so lib/unrealircd/modules/extbans/inchannel.so @@ -102,6 +103,7 @@ lib/unrealircd/modules/m_sethost.so lib/unrealircd/modules/m_setident.so lib/unrealircd/modules/m_setname.so lib/unrealircd/modules/m_silence.so +lib/unrealircd/modules/m_sinfo.so lib/unrealircd/modules/m_sjoin.so lib/unrealircd/modules/m_sqline.so lib/unrealircd/modules/m_squit.so @@ -142,6 +144,7 @@ lib/unrealircd/modules/m_whois.so lib/unrealircd/modules/m_whowas.so lib/unrealircd/modules/m_whox.so lib/unrealircd/modules/nocodes.so +lib/unrealircd/modules/reputation.so lib/unrealircd/modules/snomasks/dccreject.so lib/unrealircd/modules/ssl_antidos.so lib/unrealircd/modules/usermodes/bot.so @@ -186,9 +189,4 @@ share/examples/unrealircd/operclass.defa share/examples/unrealircd/spamfilter.conf share/examples/unrealircd/ssl/curl-ca-bundle.crt unrealircd/scripts/unrealircd -@pkgdir unrealircd/tmp -@pkgdir unrealircd/logs -@pkgdir unrealircd/data -@pkgdir unrealircd/cache @pkgdir lib/unrealircd/modules/third -@pkgdir etc/unrealircd Index: pkgsrc/chat/unrealircd/distinfo diff -u pkgsrc/chat/unrealircd/distinfo:1.23 pkgsrc/chat/unrealircd/distinfo:1.24 --- pkgsrc/chat/unrealircd/distinfo:1.23 Tue Apr 2 13:20:21 2019 +++ pkgsrc/chat/unrealircd/distinfo Wed Aug 7 13:14:16 2019 @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.23 2019/04/02 13:20:21 wiz Exp $ +$NetBSD: distinfo,v 1.24 2019/08/07 13:14:16 nia Exp $ -SHA1 (unrealircd-20190402/unrealircd-4.2.2.tar.gz) = 3d29867f65cd407db207f3eb4a2038cafea75caa -RMD160 (unrealircd-20190402/unrealircd-4.2.2.tar.gz) = a6c39a01c3a20fe481da3b8516b49ca213fd18fa -SHA512 (unrealircd-20190402/unrealircd-4.2.2.tar.gz) = 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad -Size (unrealircd-20190402/unrealircd-4.2.2.tar.gz) = 6060272 bytes -SHA1 (patch-Makefile.in) = f42dbe01865c99f16db227bec251a0d78bdddd2c +SHA1 (unrealircd-4.2.4.1.tar.gz) = cf9ac43cff3f69c77852e1b0526b84662acb66fd +RMD160 (unrealircd-4.2.4.1.tar.gz) = 8202b2059811a7da1c1c9fc831492784ef196979 +SHA512 (unrealircd-4.2.4.1.tar.gz) = 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686 +Size (unrealircd-4.2.4.1.tar.gz) = 6090725 bytes SHA1 (patch-ac) = 644990fd93c6754778d4c0a8b3a2aab34a1bcbb3 SHA1 (patch-ae) = 14499974009921e55fbf2c1719f7588b17f1315c --_----------=_1565183656174440--