Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_154492592491140"
MIME-Version: 1.0
Date: Sun, 16 Dec 2018 02:05:24 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/chat
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20181216020524.45046FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_154492592491140
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Dec 16 02:05:24 UTC 2018

Modified Files:
	pkgsrc/chat: Makefile
Added Files:
	pkgsrc/chat/znc: DESCR MESSAGE Makefile PLIST PLIST.cyrus PLIST.perl
	    PLIST.python PLIST.tcl distinfo options.mk
	pkgsrc/chat/znc/files: znc.sh

Log Message:
chat/znc: Import version 1.7.1. Based on work in pkgsrc-wip.

ZNC is an advanced IRC bouncer with IPv6 and SSL support.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 pkgsrc/chat/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/znc/DESCR pkgsrc/chat/znc/MESSAGE \
    pkgsrc/chat/znc/Makefile pkgsrc/chat/znc/PLIST \
    pkgsrc/chat/znc/PLIST.cyrus pkgsrc/chat/znc/PLIST.perl \
    pkgsrc/chat/znc/PLIST.python pkgsrc/chat/znc/PLIST.tcl \
    pkgsrc/chat/znc/distinfo pkgsrc/chat/znc/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/znc/files/znc.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_154492592491140
Content-Disposition: inline
Content-Length: 13986
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/chat/Makefile
diff -u pkgsrc/chat/Makefile:1.209 pkgsrc/chat/Makefile:1.210
--- pkgsrc/chat/Makefile:1.209	Wed Nov 28 15:12:27 2018
+++ pkgsrc/chat/Makefile	Sun Dec 16 02:05:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.209 2018/11/28 15:12:27 nia Exp $
+# $NetBSD: Makefile,v 1.210 2018/12/16 02:05:23 nia Exp $
 #
 
 COMMENT=	Communication programs
@@ -154,5 +154,6 @@ SUBDIR+=	ysm
 SUBDIR+=	zenicb
 SUBDIR+=	zenirc
 SUBDIR+=	zircon
+SUBDIR+=	znc
 
 .include "../mk/misc/category.mk"

Added files:

Index: pkgsrc/chat/znc/DESCR
diff -u /dev/null pkgsrc/chat/znc/DESCR:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/DESCR	Sun Dec 16 02:05:23 2018
@@ -0,0 +1 @@
+ZNC is an advanced IRC bouncer with IPv6 and SSL support.
Index: pkgsrc/chat/znc/MESSAGE
diff -u /dev/null pkgsrc/chat/znc/MESSAGE:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/MESSAGE	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2018/12/16 02:05:23 nia Exp $
+
+Add the following to /etc/rc.conf:
+
+znc=YES
+znc_user="znc"
+
+===========================================================================
Index: pkgsrc/chat/znc/Makefile
diff -u /dev/null pkgsrc/chat/znc/Makefile:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/Makefile	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,67 @@
+# $NetBSD: Makefile,v 1.1 2018/12/16 02:05:23 nia Exp $
+
+DISTNAME=	znc-1.7.1
+CATEGORIES=	net
+MASTER_SITES=	http://znc.in/releases/archive/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://znc.in/
+COMMENT=	Advanced IRC bouncer with IPv6 and SSL support
+LICENSE=	gnu-gpl-v2
+
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		bsdtar gmake pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+PKGCONFIG_OVERRIDE+=	znc.pc.in
+
+PLIST_SRC=		PLIST
+PLIST_SUBST+=		ZNC_USER="${ZNC_USER}"
+PLIST_SUBST+=		PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+PLIST_SUBST+=		PKG_PREFIX="${PREFIX}"
+
+PKG_SYSCONFSUBDIR=	${PKGBASE}
+
+.include "../../mk/bsd.prefs.mk"
+
+ZNC_USER?=		znc
+ZNC_GROUP?=		znc
+PKG_GROUPS=		${ZNC_GROUP}
+PKG_USERS=		${ZNC_USER}:${ZNC_GROUP}
+PKG_GROUPS_VARS=	ZNC_USER
+PKG_USERS_VARS=		ZNC_GROUP
+
+SUBST_CLASSES+=			fix-man-znc
+SUBST_STAGE.fix-man-znc=	pre-configure
+SUBST_MESSAGE.fix-man-znc=	Fixing absolute paths in znc.1 manpage.
+SUBST_FILES.fix-man-znc=	man/znc.1
+SUBST_SED.fix-man-znc=		-e 's,\~\/\.znc,${PKG_SYSCONFDIR},g'
+SUBST_SED.fix-man-znc+=		-e 's,\/usr\/local,${PREFIX},g'
+
+SUBST_CLASSES+=			fix-tar
+SUBST_STAGE.fix-tar=		pre-build
+SUBST_MESSAGE.fix-tar=		Replace tar executable name.
+SUBST_FILES.fix-tar+=		modules/modperl/Makefile.inc
+SUBST_FILES.fix-tar+=		modules/modpython/Makefile.inc
+SUBST_SED.fix-tar=		-e 's,tar -xf ,bsdtar -xf ,g'
+
+BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		PKG_SYSCONFDIR
+BUILD_DEFS+=		ZNC_USER
+BUILD_DEFS+=		ZNC_GROUP
+
+RCD_SCRIPTS+=		znc
+PTHREAD_AUTO_VARS=	yes
+
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR} ${ZNC_USER} ${ZNC_GROUP} 0755
+
+MANCOMPRESSED=		yes
+
+.include "options.mk"
+
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/znc/PLIST
diff -u /dev/null pkgsrc/chat/znc/PLIST:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/PLIST	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,173 @@
+@comment $NetBSD: PLIST,v 1.1 2018/12/16 02:05:23 nia Exp $
+bin/znc
+bin/znc-buildmod
+include/znc/Buffer.h
+include/znc/Chan.h
+include/znc/Client.h
+include/znc/Config.h
+include/znc/Csocket.h
+include/znc/ExecSock.h
+include/znc/FileUtils.h
+include/znc/HTTPSock.h
+include/znc/IRCNetwork.h
+include/znc/IRCSock.h
+include/znc/Listener.h
+include/znc/MD5.h
+include/znc/Message.h
+include/znc/Modules.h
+include/znc/Nick.h
+include/znc/Query.h
+include/znc/SHA256.h
+include/znc/SSLVerifyHost.h
+include/znc/Server.h
+include/znc/Socket.h
+include/znc/Template.h
+include/znc/Threads.h
+include/znc/Translation.h
+include/znc/User.h
+include/znc/Utils.h
+include/znc/WebModules.h
+include/znc/ZNCDebug.h
+include/znc/ZNCString.h
+include/znc/defines.h
+include/znc/main.h
+include/znc/version.h
+include/znc/znc.h
+include/znc/zncconfig.h
+lib/pkgconfig/znc.pc
+lib/znc/admindebug.so
+lib/znc/adminlog.so
+lib/znc/alias.so
+lib/znc/autoattach.so
+lib/znc/autocycle.so
+lib/znc/autoop.so
+lib/znc/autoreply.so
+lib/znc/autovoice.so
+lib/znc/awaynick.so
+lib/znc/awaystore.so
+lib/znc/block_motd.so
+lib/znc/blockuser.so
+lib/znc/bouncedcc.so
+lib/znc/buffextras.so
+lib/znc/cert.so
+lib/znc/certauth.so
+lib/znc/chansaver.so
+lib/znc/clearbufferonmsg.so
+lib/znc/clientnotify.so
+lib/znc/controlpanel.so
+lib/znc/crypt.so
+lib/znc/ctcpflood.so
+lib/znc/dcc.so
+lib/znc/disconkick.so
+lib/znc/fail2ban.so
+lib/znc/flooddetach.so
+lib/znc/identfile.so
+lib/znc/imapauth.so
+lib/znc/keepnick.so
+lib/znc/kickrejoin.so
+lib/znc/lastseen.so
+lib/znc/listsockets.so
+lib/znc/log.so
+lib/znc/missingmotd.so
+lib/znc/modules_online.so
+lib/znc/nickserv.so
+lib/znc/notes.so
+lib/znc/notify_connect.so
+lib/znc/partyline.so
+lib/znc/perform.so
+lib/znc/q.so
+lib/znc/raw.so
+lib/znc/route_replies.so
+lib/znc/sample.so
+lib/znc/samplewebapi.so
+lib/znc/sasl.so
+lib/znc/savebuff.so
+lib/znc/schat.so
+lib/znc/send_raw.so
+lib/znc/shell.so
+lib/znc/simple_away.so
+lib/znc/stickychan.so
+lib/znc/stripcontrols.so
+lib/znc/watch.so
+lib/znc/webadmin.so
+man/man1/znc-buildmod.1
+man/man1/znc.1
+share/znc/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl
+share/znc/modules/cert/tmpl/index.tmpl
+share/znc/modules/certauth/tmpl/index.tmpl
+share/znc/modules/lastseen/tmpl/index.tmpl
+share/znc/modules/lastseen/tmpl/lastseen_WebadminUser.tmpl
+share/znc/modules/listsockets/tmpl/index.tmpl
+share/znc/modules/notes/files/trash.gif
+share/znc/modules/notes/tmpl/index.tmpl
+share/znc/modules/perform/tmpl/index.tmpl
+share/znc/modules/q/tmpl/index.tmpl
+share/znc/modules/samplewebapi/tmpl/index.tmpl
+share/znc/modules/sasl/tmpl/index.tmpl
+share/znc/modules/send_raw/files/select.js
+share/znc/modules/send_raw/tmpl/index.tmpl
+share/znc/modules/stickychan/tmpl/index.tmpl
+share/znc/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
+share/znc/modules/webadmin/files/webadmin.css
+share/znc/modules/webadmin/files/webadmin.js
+share/znc/modules/webadmin/tmpl/add_edit_chan.tmpl
+share/znc/modules/webadmin/tmpl/add_edit_network.tmpl
+share/znc/modules/webadmin/tmpl/add_edit_user.tmpl
+share/znc/modules/webadmin/tmpl/del_network.tmpl
+share/znc/modules/webadmin/tmpl/del_user.tmpl
+share/znc/modules/webadmin/tmpl/encoding_settings.tmpl
+share/znc/modules/webadmin/tmpl/index.tmpl
+share/znc/modules/webadmin/tmpl/listusers.tmpl
+share/znc/modules/webadmin/tmpl/settings.tmpl
+share/znc/modules/webadmin/tmpl/traffic.tmpl
+share/znc/webskins/_default_/pub/External.png
+share/znc/webskins/_default_/pub/_default_.css
+share/znc/webskins/_default_/pub/favicon.ico
+share/znc/webskins/_default_/pub/global.css
+share/znc/webskins/_default_/pub/jquery-1.11.2.js
+share/znc/webskins/_default_/pub/jquery-1.11.2.min.js
+share/znc/webskins/_default_/pub/jquery-ui-sortable.1.11.4.css
+share/znc/webskins/_default_/pub/jquery-ui-sortable.1.11.4.js
+share/znc/webskins/_default_/pub/jquery-ui-sortable.1.11.4.min.css
+share/znc/webskins/_default_/pub/jquery-ui-sortable.1.11.4.min.js
+share/znc/webskins/_default_/pub/robots.txt
+share/znc/webskins/_default_/pub/selectize-0.12.1.css
+share/znc/webskins/_default_/pub/selectize-standalone-0.12.1.js
+share/znc/webskins/_default_/pub/selectize-standalone-0.12.1.min.js
+share/znc/webskins/_default_/tmpl/Banner.tmpl
+share/znc/webskins/_default_/tmpl/BaseHeader.tmpl
+share/znc/webskins/_default_/tmpl/BreadCrumbs.tmpl
+share/znc/webskins/_default_/tmpl/DocType.tmpl
+share/znc/webskins/_default_/tmpl/Error.tmpl
+share/znc/webskins/_default_/tmpl/ExtraHeader.tmpl
+share/znc/webskins/_default_/tmpl/Footer.tmpl
+share/znc/webskins/_default_/tmpl/FooterTag.tmpl
+share/znc/webskins/_default_/tmpl/Header.tmpl
+share/znc/webskins/_default_/tmpl/InfoBar.tmpl
+share/znc/webskins/_default_/tmpl/LoginBar.tmpl
+share/znc/webskins/_default_/tmpl/LowerBanner.tmpl
+share/znc/webskins/_default_/tmpl/Menu.tmpl
+share/znc/webskins/_default_/tmpl/MessageBar.tmpl
+share/znc/webskins/_default_/tmpl/Options.tmpl
+share/znc/webskins/_default_/tmpl/_csrf_check.tmpl
+share/znc/webskins/_default_/tmpl/index.tmpl
+share/znc/webskins/dark-clouds/pub/clouds-header.jpg
+share/znc/webskins/dark-clouds/pub/dark-clouds.css
+share/znc/webskins/dark-clouds/pub/favicon.ico
+share/znc/webskins/dark-clouds/tmpl/Banner.tmpl
+share/znc/webskins/dark-clouds/tmpl/FooterTag.tmpl
+share/znc/webskins/dark-clouds/tmpl/Header.tmpl
+share/znc/webskins/dark-clouds/tmpl/LowerBanner.tmpl
+share/znc/webskins/forest/pub/favicon.ico
+share/znc/webskins/forest/pub/forest-header.png
+share/znc/webskins/forest/pub/forest.css
+share/znc/webskins/forest/tmpl/Banner.tmpl
+share/znc/webskins/forest/tmpl/FooterTag.tmpl
+share/znc/webskins/forest/tmpl/Header.tmpl
+share/znc/webskins/forest/tmpl/LowerBanner.tmpl
+share/znc/webskins/ice/pub/favicon.ico
+share/znc/webskins/ice/pub/ice.css
+share/znc/webskins/ice/pub/linkbg.jpg
+share/znc/webskins/ice/pub/pagebg.gif
+share/znc/webskins/ice/tmpl/FooterTag.tmpl
+share/znc/webskins/ice/tmpl/Header.tmpl
Index: pkgsrc/chat/znc/PLIST.cyrus
diff -u /dev/null pkgsrc/chat/znc/PLIST.cyrus:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/PLIST.cyrus	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.cyrus,v 1.1 2018/12/16 02:05:23 nia Exp $
+lib/znc/cyrusauth.so
Index: pkgsrc/chat/znc/PLIST.perl
diff -u /dev/null pkgsrc/chat/znc/PLIST.perl:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/PLIST.perl	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.perl,v 1.1 2018/12/16 02:05:23 nia Exp $
+lib/znc/modperl.so
+lib/znc/modperl/ZNC.pm
+lib/znc/modperl/ZNC.so
+lib/znc/modperl/startup.pl
+lib/znc/perleval.pm
Index: pkgsrc/chat/znc/PLIST.python
diff -u /dev/null pkgsrc/chat/znc/PLIST.python:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/PLIST.python	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.python,v 1.1 2018/12/16 02:05:23 nia Exp $
+lib/znc/modpython.so
+lib/znc/modpython/_znc_core.so
+lib/znc/modpython/znc.py
+lib/znc/modpython/znc_core.py
+lib/znc/pyeval.py
Index: pkgsrc/chat/znc/PLIST.tcl
diff -u /dev/null pkgsrc/chat/znc/PLIST.tcl:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/PLIST.tcl	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.tcl,v 1.1 2018/12/16 02:05:23 nia Exp $
+lib/znc/modtcl.so
+share/znc/modtcl/binds.tcl
+share/znc/modtcl/modtcl.tcl
Index: pkgsrc/chat/znc/distinfo
diff -u /dev/null pkgsrc/chat/znc/distinfo:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/distinfo	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2018/12/16 02:05:23 nia Exp $
+
+SHA1 (znc-1.7.1.tar.gz) = 6ad5ace06eb99e8b37adc1a9994e48b98cf14262
+RMD160 (znc-1.7.1.tar.gz) = 0223cc889466b0f41f52535b1ed866dabc708e5c
+SHA512 (znc-1.7.1.tar.gz) = 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
+Size (znc-1.7.1.tar.gz) = 2041669 bytes
Index: pkgsrc/chat/znc/options.mk
diff -u /dev/null pkgsrc/chat/znc/options.mk:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/options.mk	Sun Dec 16 02:05:23 2018
@@ -0,0 +1,48 @@
+# $NetBSD: options.mk,v 1.1 2018/12/16 02:05:23 nia Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.znc
+PKG_SUPPORTED_OPTIONS=	debug inet6 perl python sasl tcl
+PKG_SUGGESTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+# Debug build
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+# IPv6 support
+.if empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+# Perl support
+.if !empty(PKG_OPTIONS:Mperl)
+.include		"../../lang/perl5/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-perl
+USE_TOOLS+=		perl
+PLIST_SRC+=		PLIST.perl
+.endif
+
+# TCL option
+.if !empty(PKG_OPTIONS:Mtcl)
+.include		"../../lang/tcl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-tcl
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+PLIST_SRC+=		PLIST.tcl
+.endif
+
+# Python support
+.if !empty(PKG_OPTIONS:Mpython)
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+.include		"../../lang/python/extension.mk"
+CONFIGURE_ARGS+=	--enable-python=python-${PYVERSSUFFIX}
+PLIST_SRC+=		PLIST.python
+.endif
+
+# Cyrus SASL support
+.if !empty(PKG_OPTIONS:Msasl)
+.include		"../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cyrus
+PLIST_SRC+=		PLIST.cyrus
+.endif

Index: pkgsrc/chat/znc/files/znc.sh
diff -u /dev/null pkgsrc/chat/znc/files/znc.sh:1.1
--- /dev/null	Sun Dec 16 02:05:24 2018
+++ pkgsrc/chat/znc/files/znc.sh	Sun Dec 16 02:05:24 2018
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# $NetBSD: znc.sh,v 1.1 2018/12/16 02:05:24 nia Exp $
+#
+# RC-script for znc 1.0
+#
+
+# PROVIDE: znc
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+${_rc_subr_loaded} . /etc/rc.subr
+
+name="znc"
+rcvar="${name}"
+command="@PREFIX@/bin/${name}"
+saveconf_cmd="${name}_saveconf"
+makeconf_cmd="${name}_makeconf"
+
+conf_dir="@PKG_SYSCONFDIR@"
+conf_file="${conf_dir}/configs/${name}.conf"
+
+sig_saveconf="-USR1"
+
+required_files="${conf_file}"
+extra_commands="reload saveconf makeconf"
+command_args="-d ${conf_dir}"
+
+znc_saveconf(){
+        pids="$(check_process ${command})"
+        if [ -n "$pids" ]; then
+                echo -n "Saving znc config files"
+                for pid in $pids; do
+                        kill $sig_saveconf $pid
+                done
+                echo "."
+        fi
+}
+
+znc_makeconf(){
+	su -m ${znc_user} -c ${command} -d ${conf_dir} -r --makeconf
+}
+
+load_rc_config "${name}"
+run_rc_command "${1}"


--_----------=_154492592491140--