pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/anope anope: Update to 2.0.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/6bd1bc7f64ea
branches: trunk
changeset: 405784:6bd1bc7f64ea
user: nia <nia%pkgsrc.org@localhost>
date: Sun Dec 08 03:55:05 2019 +0000
description:
anope: Update to 2.0.7
The notable changes includes:
Fix not sending login data on successful NickServ GROUP
Fix m_httpd to not consider headers to be case sensitive
Add InspIRCd 3 protocol support
Add 'n' email token for use in the email change template
Add logging for NickServ UNGROUP
Fix setting swhois on UnrealIRCd
Add nickserv/recover permission to allow opers to recover other users
Fix superadmin not being removed when deopering
Fix setting nickserv access list in webcpanel
Add support for post-handshake SASL in Unreal 4.2.2+
Add logging for channel memo deletionso
diffstat:
chat/anope/Makefile | 59 ++++++++++++++-------------
chat/anope/PLIST | 3 +-
chat/anope/distinfo | 13 +++--
chat/anope/files/anope.sh | 4 +-
chat/anope/patches/patch-data_CMakeLists.txt | 13 ++++++
chat/anope/patches/patch-data_example.conf | 30 +++++++-------
6 files changed, 69 insertions(+), 53 deletions(-)
diffs (295 lines):
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/Makefile
--- a/chat/anope/Makefile Sun Dec 08 02:01:07 2019 +0000
+++ b/chat/anope/Makefile Sun Dec 08 03:55:05 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2019/07/20 22:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2019/12/08 03:55:05 nia Exp $
-DISTNAME= anope-2.0.6-source
-PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 3
+DISTNAME= anope-2.0.7-source
+PKGNAME= ${DISTNAME:S/-source//1}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_GITHUB:=anope/}
GITHUB_PROJECT= anope
@@ -22,13 +21,15 @@
CMAKE_ARGS+= -DDISABLE_TOOLS=ON
CMAKE_ARGS+= -DDB_DIR=anope/data
-CMAKE_ARGS+= -DCONF_DIR=${PKG_SYSCONFDIR}/anope
+CMAKE_ARGS+= -DCONF_DIR=${PKG_SYSCONFDIR}
CMAKE_ARGS+= -DLIB_DIR=lib/anope
CMAKE_ARGS+= -DLOCALE_DIR=${PKGLOCALEDIR}/locale
CMAKE_ARGS+= -DLOGS_DIR=anope/logs
.include "../../mk/bsd.prefs.mk"
+PKG_SYSCONFSUBDIR= anope
+
ANOPE_USER?= anope
ANOPE_GROUP?= anope
PKG_GROUPS= ${ANOPE_GROUP}
@@ -62,17 +63,17 @@
INSTALLATION_DIRS+= ${EGDIR}
INSTALLATION_DIRS+= ${DOCDIR}
-CONF_FILES+= ${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/anope/botserv.conf
-CONF_FILES+= ${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/anope/chanserv.conf
-CONF_FILES+= ${EGDIR}/chanstats.conf ${PKG_SYSCONFDIR}/anope/chanstats.conf
-CONF_FILES+= ${EGDIR}/services.conf ${PKG_SYSCONFDIR}/anope/services.conf
-CONF_FILES+= ${EGDIR}/global.conf ${PKG_SYSCONFDIR}/anope/global.conf
-CONF_FILES+= ${EGDIR}/hostserv.conf ${PKG_SYSCONFDIR}/anope/hostserv.conf
-CONF_FILES+= ${EGDIR}/irc2sql.conf ${PKG_SYSCONFDIR}/anope/irc2sql.conf
-CONF_FILES+= ${EGDIR}/memoserv.conf ${PKG_SYSCONFDIR}/anope/memoserv.conf
-CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/anope/modules.conf
-CONF_FILES+= ${EGDIR}/nickserv.conf ${PKG_SYSCONFDIR}/anope/nickserv.conf
-CONF_FILES+= ${EGDIR}/operserv.conf ${PKG_SYSCONFDIR}/anope/operserv.conf
+CONF_FILES+= ${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/botserv.conf
+CONF_FILES+= ${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/chanserv.conf
+CONF_FILES+= ${EGDIR}/chanstats.conf ${PKG_SYSCONFDIR}/chanstats.conf
+CONF_FILES+= ${EGDIR}/services.conf ${PKG_SYSCONFDIR}/services.conf
+CONF_FILES+= ${EGDIR}/global.conf ${PKG_SYSCONFDIR}/global.conf
+CONF_FILES+= ${EGDIR}/hostserv.conf ${PKG_SYSCONFDIR}/hostserv.conf
+CONF_FILES+= ${EGDIR}/irc2sql.conf ${PKG_SYSCONFDIR}/irc2sql.conf
+CONF_FILES+= ${EGDIR}/memoserv.conf ${PKG_SYSCONFDIR}/memoserv.conf
+CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
+CONF_FILES+= ${EGDIR}/nickserv.conf ${PKG_SYSCONFDIR}/nickserv.conf
+CONF_FILES+= ${EGDIR}/operserv.conf ${PKG_SYSCONFDIR}/operserv.conf
.include "options.mk"
@@ -82,31 +83,31 @@
.endfor
post-install:
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/botserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/botserv.example.conf \
${DESTDIR}${EGDIR}/botserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/chanserv.example.conf \
${DESTDIR}${EGDIR}/chanserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanstats.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/chanstats.example.conf \
${DESTDIR}${EGDIR}/chanstats.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/example.conf \
${DESTDIR}${EGDIR}/services.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/global.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/global.example.conf \
${DESTDIR}${EGDIR}/global.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/hostserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/hostserv.example.conf \
${DESTDIR}${EGDIR}/hostserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/irc2sql.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/irc2sql.example.conf \
${DESTDIR}${EGDIR}/irc2sql.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/memoserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/memoserv.example.conf \
${DESTDIR}${EGDIR}/memoserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/modules.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/modules.example.conf \
${DESTDIR}${EGDIR}/modules.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/nickserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/nickserv.example.conf \
${DESTDIR}${EGDIR}/nickserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/operserv.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/operserv.example.conf \
${DESTDIR}${EGDIR}/operserv.conf
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.chk \
+ ${MV} ${DESTDIR}${EGDIR}/example.chk \
${DESTDIR}${DOCDIR}/example.chk
- ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/stats.standalone.example.conf \
+ ${MV} ${DESTDIR}${EGDIR}/stats.standalone.example.conf \
${DESTDIR}${DOCDIR}/stats.standalone.example.conf
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/PLIST
--- a/chat/anope/PLIST Sun Dec 08 02:01:07 2019 +0000
+++ b/chat/anope/PLIST Sun Dec 08 03:55:05 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/02/05 19:10:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/12/08 03:55:05 nia Exp $
anope/data/modules/webcpanel/templates/default/chanserv/access.html
anope/data/modules/webcpanel/templates/default/chanserv/akick.html
anope/data/modules/webcpanel/templates/default/chanserv/chanlist.html
@@ -90,6 +90,7 @@
lib/anope/modules/hybrid.so
lib/anope/modules/inspircd12.so
lib/anope/modules/inspircd20.so
+lib/anope/modules/inspircd3.so
lib/anope/modules/m_dns.so
lib/anope/modules/m_dnsbl.so
lib/anope/modules/m_helpchan.so
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/distinfo
--- a/chat/anope/distinfo Sun Dec 08 02:01:07 2019 +0000
+++ b/chat/anope/distinfo Sun Dec 08 03:55:05 2019 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2019/02/05 19:10:50 nia Exp $
+$NetBSD: distinfo,v 1.11 2019/12/08 03:55:05 nia Exp $
-SHA1 (anope-2.0.6-source.tar.gz) = bba0c947657f7388da2980241bc11b03f9f64743
-RMD160 (anope-2.0.6-source.tar.gz) = 1771ee896cf30f9962abec56aed3a5f71f17b8e0
-SHA512 (anope-2.0.6-source.tar.gz) = c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
-Size (anope-2.0.6-source.tar.gz) = 1792912 bytes
-SHA1 (patch-data_example.conf) = 0adb909df1a7fa0ed7c96433f37119d90b0516db
+SHA1 (anope-2.0.7-source.tar.gz) = 298c21edbff18a1d3cc711bf84b55ac06ae10d6b
+RMD160 (anope-2.0.7-source.tar.gz) = fdbc31d1bcd902eddc35efbae871af2b0dddc88b
+SHA512 (anope-2.0.7-source.tar.gz) = 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
+Size (anope-2.0.7-source.tar.gz) = 1817484 bytes
+SHA1 (patch-data_CMakeLists.txt) = e0d762da4345ded9a080ea6cf216db510c4c1665
+SHA1 (patch-data_example.conf) = 5d239fdf2362561b860ffbd3b6dfe7a5dd177632
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/files/anope.sh
--- a/chat/anope/files/anope.sh Sun Dec 08 02:01:07 2019 +0000
+++ b/chat/anope/files/anope.sh Sun Dec 08 03:55:05 2019 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: anope.sh,v 1.2 2019/02/05 19:10:50 nia Exp $
+# $NetBSD: anope.sh,v 1.3 2019/12/08 03:55:05 nia Exp $
#
# PROVIDE: anope
# REQUIRE: DAEMON
@@ -10,7 +10,7 @@
name="anope"
rcvar=${name}
command="@PREFIX@/bin/anope"
-command_args="--confdir=@PKG_SYSCONFDIR@/anope"
+command_args="--confdir=@PKG_SYSCONFDIR@"
command_args="${command_args} --dbdir=@PREFIX@/anope/data"
command_args="${command_args} --localedir=@PREFIX@/@PKGLOCALEDIR@/locale"
command_args="${command_args} --logdir=@PREFIX@/anope/logs"
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/patches/patch-data_CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/anope/patches/patch-data_CMakeLists.txt Sun Dec 08 03:55:05 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-data_CMakeLists.txt,v 1.1 2019/12/08 03:55:05 nia Exp $
+
+Install config file to examples.
+
+--- data/CMakeLists.txt.orig 2019-03-19 19:11:06.000000000 +0000
++++ data/CMakeLists.txt
+@@ -2,5 +2,5 @@
+ # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
+ set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf
nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
+ install(FILES ${DATA}
+- DESTINATION ${CONF_DIR}
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/anope
+ )
diff -r 0f799c60b248 -r 6bd1bc7f64ea chat/anope/patches/patch-data_example.conf
--- a/chat/anope/patches/patch-data_example.conf Sun Dec 08 02:01:07 2019 +0000
+++ b/chat/anope/patches/patch-data_example.conf Sun Dec 08 03:55:05 2019 +0000
@@ -1,26 +1,26 @@
-$NetBSD: patch-data_example.conf,v 1.1 2019/02/05 19:10:50 nia Exp $
+$NetBSD: patch-data_example.conf,v 1.2 2019/12/08 03:55:05 nia Exp $
Fix config file filenames for pkgsrc's CONF_FILES system.
---- data/example.conf.orig 2017-03-30 21:00:24.000000000 +0000
+--- data/example.conf.orig 2019-10-14 14:51:20.000000000 +0000
+++ data/example.conf
-@@ -231,13 +231,13 @@ serverinfo
+@@ -235,13 +235,13 @@ serverinfo
* The filename containing the Services process ID. The path is relative to the
* services root directory.
*/
- pid = "data/services.pid"
-+ pid = "@PREFIX@/anope/anope.pid"
++ pid = "/usr/pkg/anope/anope.pid"
/*
* The filename containing the Message of the Day. The path is relative to the
* services root directory.
*/
- motd = "conf/services.motd"
-+ motd = "@PKG_SYSCONFDIR@/anope/services.motd"
++ motd = "/usr/pkg/etc/anope/services.motd"
}
/*
-@@ -560,7 +560,7 @@ options
+@@ -565,7 +565,7 @@ options
include
{
type = "file"
@@ -29,7 +29,7 @@
}
/*
-@@ -573,7 +573,7 @@ include
+@@ -578,7 +578,7 @@ include
include
{
type = "file"
@@ -38,7 +38,7 @@
}
/*
-@@ -586,7 +586,7 @@ include
+@@ -591,7 +591,7 @@ include
include
{
type = "file"
@@ -47,7 +47,7 @@
}
/*
-@@ -599,7 +599,7 @@ include
+@@ -604,7 +604,7 @@ include
include
{
type = "file"
@@ -56,7 +56,7 @@
}
/*
-@@ -612,7 +612,7 @@ include
+@@ -617,7 +617,7 @@ include
include
{
type = "file"
@@ -65,7 +65,7 @@
}
/*
-@@ -625,7 +625,7 @@ include
+@@ -630,7 +630,7 @@ include
include
{
type = "file"
@@ -74,7 +74,7 @@
}
/*
-@@ -638,7 +638,7 @@ include
+@@ -643,7 +643,7 @@ include
include
{
type = "file"
@@ -83,7 +83,7 @@
}
/*
-@@ -1232,7 +1232,7 @@ module { name = "enc_sha256" }
+@@ -1266,7 +1266,7 @@ module { name = "enc_sha256" }
include
{
type = "file"
@@ -92,7 +92,7 @@
}
/*
-@@ -1242,7 +1242,7 @@ include
+@@ -1276,7 +1276,7 @@ include
#include
{
type = "file"
@@ -101,7 +101,7 @@
}
/*
-@@ -1255,5 +1255,5 @@ include
+@@ -1289,5 +1289,5 @@ include
#include
{
type = "file"
Home |
Main Index |
Thread Index |
Old Index