znc: updated to 1.7.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: znc: updated to 1.7.1
From: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Date: Fri, 14 Dec 2018 13:06:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Fri Dec 14 14:06:52 2018 +0100
Changeset:	a000680c6e51faf3c0ec63cb93dd16b0223d28a9

Modified Files:
	znc/MESSAGE
	znc/Makefile
	znc/PLIST
	znc/PLIST.cyrus
	znc/PLIST.openssl
	znc/PLIST.perl
	znc/PLIST.python
	znc/PLIST.tcl
	znc/distinfo
	znc/options.mk

Log Message:
znc: updated to 1.7.1

ZNC 1.7.1 (2018-07-17)

Security critical fixes
* CVE-2018-14055: non-admin user could gain admin privileges and shell access by injecting values into znc.conf.
* CVE-2018-14056: path traversal in HTTP handler via ../ in a web skin name.

Core
* Fix znc-buildmod to not hardcode the compiler used to build ZNC anymore in CMake build
* Fix language selector. Russian and German were both not selectable.
* Fix build without SSL support
* Fix several broken strings
* Stop spamming users about debug mode. This feature was added in 1.7.0, now reverted.

New
* Add partial Spanish, Indonesian, and Dutch translations

Modules
* adminlog: Log the error message again (regression of 1.7.0)
* admindebug: New module, which allows admins to turn on/off --debug in runtime
* flooddetach: Fix description of commands
* modperl: Fix memory leak in NV handling
* modperl: Fix functions which return VCString
* modpython: Fix functions which return VCString
* webadmin: Fix fancy CTCP replies editor for Firefox. It was showing the plain version even when JS is enabled

Internal
* Deprecate one of the overloads of CMessage::GetParams(), rename it to CMessage::GetParamsColon()
* Don't throw from destructor in the integration test
* Fix a warning with integration test / gmake / znc-buildmod interaction.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a000680c6e51faf3c0ec63cb93dd16b0223d28a9

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

diffstat:
 znc/MESSAGE       |  2 +-
 znc/Makefile      | 33 +++++++++++++++------------------
 znc/PLIST         | 14 ++++++++++++++
 znc/PLIST.cyrus   |  2 +-
 znc/PLIST.openssl |  2 +-
 znc/PLIST.perl    |  2 +-
 znc/PLIST.python  |  3 ++-
 znc/PLIST.tcl     |  2 +-
 znc/distinfo      | 10 +++++-----
 znc/options.mk    | 40 ++++++++++------------------------------
 10 files changed, 51 insertions(+), 59 deletions(-)

diffs:
diff --git a/znc/MESSAGE b/znc/MESSAGE
index dd9add3624..a0b15bafb6 100644
--- a/znc/MESSAGE
+++ b/znc/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+$NetBSD$
 
 ZNC - An advanced IRC bouncer with IPv6 and SSL support
 
diff --git a/znc/Makefile b/znc/Makefile
index 9b1275bbd6..6596488305 100644
--- a/znc/Makefile
+++ b/znc/Makefile
@@ -1,30 +1,26 @@
-# $NetBSD: Makefile,v 1.7 2013/11/11 12:14:47 obache Exp $
-#
+# $NetBSD$
 
-DISTNAME=		znc-1.6.3
-CATEGORIES=		net
-MASTER_SITES=		http://znc.in/releases/archive/
+DISTNAME=	znc-1.7.1
+CATEGORIES=	net
+MASTER_SITES=	http://znc.in/releases/archive/
 
-MAINTAINER=		florian%geiges.net@localhost
-HOMEPAGE=		http://znc.in/
-COMMENT=		Advanced IRC bouncer with IPv6 and SSL support
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	florian%geiges.net@localhost
+HOMEPAGE=	http://znc.in/
+COMMENT=	Advanced IRC bouncer with IPv6 and SSL support
+LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
-
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		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}"
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-PKGCONFIG_OVERRIDE+=	znc.pc.in
-
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"
@@ -54,7 +50,8 @@ OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR} ${ZNC_USER} ${ZNC_GROUP} 0755
 
 MANCOMPRESSED=		yes
 
-.include		"./options.mk"
+.include "options.mk"
 
-.include 		"../../devel/libgetopt/buildlink3.mk"
-.include		"../../mk/bsd.pkg.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/znc/PLIST b/znc/PLIST
index c64014ab7a..8f5766d1af 100644
--- a/znc/PLIST
+++ b/znc/PLIST
@@ -13,6 +13,7 @@ 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
@@ -22,6 +23,7 @@ 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
@@ -33,6 +35,7 @@ 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
@@ -76,6 +79,7 @@ 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
@@ -83,6 +87,7 @@ 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
@@ -97,6 +102,8 @@ 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
@@ -119,7 +126,14 @@ 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
diff --git a/znc/PLIST.cyrus b/znc/PLIST.cyrus
index 52c71b9b14..6ebe48b1b4 100644
--- a/znc/PLIST.cyrus
+++ b/znc/PLIST.cyrus
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.cyrus,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+@comment $NetBSD$
 lib/znc/cyrusauth.so
diff --git a/znc/PLIST.openssl b/znc/PLIST.openssl
index 2caa8b258e..d51f08fbc2 100644
--- a/znc/PLIST.openssl
+++ b/znc/PLIST.openssl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.openssl,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+@comment $NetBSD$
 lib/znc/awaystore.so
 lib/znc/cert.so
 lib/znc/certauth.so
diff --git a/znc/PLIST.perl b/znc/PLIST.perl
index 0450e62eb1..f226dc3a00 100644
--- a/znc/PLIST.perl
+++ b/znc/PLIST.perl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.perl,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+@comment $NetBSD$
 lib/znc/modperl.so
 lib/znc/modperl/ZNC.pm
 lib/znc/modperl/ZNC.so
diff --git a/znc/PLIST.python b/znc/PLIST.python
index bfdf15ca04..88059cb8aa 100644
--- a/znc/PLIST.python
+++ b/znc/PLIST.python
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.python,v 1.1 2013/11/10 13:07:07 obache Exp $
+@comment $NetBSD$
 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
diff --git a/znc/PLIST.tcl b/znc/PLIST.tcl
index b1b2606ba3..d660f0a9a2 100644
--- a/znc/PLIST.tcl
+++ b/znc/PLIST.tcl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.tcl,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+@comment $NetBSD$
 lib/znc/modtcl.so
 share/znc/modtcl/binds.tcl
 share/znc/modtcl/modtcl.tcl
diff --git a/znc/distinfo b/znc/distinfo
index d72c0320b8..f01d91fd35 100644
--- a/znc/distinfo
+++ b/znc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/03/29 21:17:02 florian-geiges Exp $
+$NetBSD$
 
-SHA1 (znc-1.6.3.tar.gz) = 89e8c2a32c8c0a95d0464a3cbfb06e6b050c6c72
-RMD160 (znc-1.6.3.tar.gz) = 2c306679192afd160c320d53229ceb22dc3895d9
-SHA512 (znc-1.6.3.tar.gz) = 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b
-Size (znc-1.6.3.tar.gz) = 1464200 bytes
+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
diff --git a/znc/options.mk b/znc/options.mk
index 02e203c5cc..72f974a7d7 100644
--- a/znc/options.mk
+++ b/znc/options.mk
@@ -1,55 +1,42 @@
-# $NetBSD: options.mk,v 1.9 2015/04/13 23:22:03 othyro Exp $
-#
+# $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.znc
-PKG_SUPPORTED_OPTIONS=	debug poll inet6 openssl perl python tcl tdns sasl
-PKG_SUGGESTED_OPTIONS=	poll inet6 openssl tdns
+PKG_SUPPORTED_OPTIONS=	debug inet6 openssl perl poll python sasl tcl tdns
+PKG_SUGGESTED_OPTIONS=	inet6 openssl poll tdns
 
-.include 		"../../mk/bsd.options.mk"
+.include "../../mk/bsd.options.mk"
 
-#
 # Debug build
-#
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-#
 # Use select() instead of poll()
-#
 .if empty(PKG_OPTIONS:Mpoll)
 CONFIGURE_ARGS+=	--disable-poll
 .endif
 
-#
 # IPv6 support
-#
 .if empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-#
 # OpenSSL support
-#
-.if empty(PKG_OPTIONS:Mopenssl)
-CONFIGURE_ARGS+=	--disable-openssl
-.else
+.if !empty(PKG_OPTIONS:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
 PLIST_SRC+=		PLIST.openssl
+.else
+CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-#
 # Threaded DNS
-#
-.if empty(PKG_OPTIONS:Mtdns)
-CONFIGURE_ARGS+=	--disable-tdns
-.else
+.if !empty(PKG_OPTIONS:Mtdns)
 .include "../../mk/pthread.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-tdns
 .endif
 
-#
 # Perl support
-#
 .if !empty(PKG_OPTIONS:Mperl)
 .include		"../../lang/perl5/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-perl
@@ -57,9 +44,7 @@ USE_TOOLS+=		perl
 PLIST_SRC+=		PLIST.perl
 .endif
 
-#
 # TCL option
-#
 .if !empty(PKG_OPTIONS:Mtcl)
 .include		"../../lang/tcl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-tcl
@@ -67,21 +52,16 @@ CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 PLIST_SRC+=		PLIST.tcl
 .endif
 
-#
 # Python support
-#
 .if !empty(PKG_OPTIONS:Mpython)
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PY_PEP3147=	no
 .include		"../../lang/python/extension.mk"
 CONFIGURE_ARGS+=	--enable-python=python-${PYVERSSUFFIX}
 USE_TOOLS+=		python
 PLIST_SRC+=		PLIST.python
 .endif
 
-#
 # Cyrus SASL support
-#
 .if !empty(PKG_OPTIONS:Msasl)
 .include		"../../security/cyrus-sasl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cyrus
Prev by Date: Added pulseaudio support. Re-organized the code.
Next by Date: cliqz: Implemented the suggestions from leot.
Previous by Thread: Added pulseaudio support. Re-organized the code.
Next by Thread: cliqz: Implemented the suggestions from leot.
Indexes:
Home | Main Index | Thread Index | Old Index