Sat Jun 22 09:31:01 2019 UTC ()
znc: Update to 1.7.4

Changes:

* Local patch for CVE-2019-12816 removed due to presence in release
* Send "Connected!" messages to client to the correct nick (#1665)


(nia)
diff -r1.7 -r1.8 pkgsrc/chat/znc/Makefile
diff -r1.4 -r1.5 pkgsrc/chat/znc/distinfo
diff -r1.1 -r0 pkgsrc/chat/znc/patches/patch-include_znc_Modules.h
diff -r1.1 -r0 pkgsrc/chat/znc/patches/patch-src_Modules.cpp
cvs diff -r1.7 -r1.8 pkgsrc/chat/znc/Makefile (switch to unified diff)

--- pkgsrc/chat/znc/Makefile 2019/06/18 10:21:37 1.7
+++ pkgsrc/chat/znc/Makefile 2019/06/22 09:31:00 1.8
@@ -1,68 +1,67 @@ @@ -1,68 +1,67 @@
1# $NetBSD: Makefile,v 1.7 2019/06/18 10:21:37 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2019/06/22 09:31:00 nia Exp $
2 2
3DISTNAME= znc-1.7.3 3DISTNAME= znc-1.7.4
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= https://znc.in/releases/archive/ 5MASTER_SITES= https://znc.in/releases/archive/
7 6
8MAINTAINER= nia@NetBSD.org 7MAINTAINER= nia@NetBSD.org
9HOMEPAGE= https://znc.in/ 8HOMEPAGE= https://znc.in/
10COMMENT= Advanced IRC bouncer with IPv6 and SSL support 9COMMENT= Advanced IRC bouncer with IPv6 and SSL support
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15USE_TOOLS+= bsdtar gmake pkg-config 14USE_TOOLS+= bsdtar gmake pkg-config
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
18PKGCONFIG_OVERRIDE+= znc.pc.in 17PKGCONFIG_OVERRIDE+= znc.pc.in
19 18
20PLIST_SRC= PLIST 19PLIST_SRC= PLIST
21PLIST_SUBST+= ZNC_USER="${ZNC_USER}" 20PLIST_SUBST+= ZNC_USER="${ZNC_USER}"
22PLIST_SUBST+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" 21PLIST_SUBST+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
23PLIST_SUBST+= PKG_PREFIX="${PREFIX}" 22PLIST_SUBST+= PKG_PREFIX="${PREFIX}"
24 23
25PKG_SYSCONFSUBDIR= ${PKGBASE} 24PKG_SYSCONFSUBDIR= ${PKGBASE}
26 25
27.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
28 27
29ZNC_USER?= znc 28ZNC_USER?= znc
30ZNC_GROUP?= znc 29ZNC_GROUP?= znc
31PKG_GROUPS= ${ZNC_GROUP} 30PKG_GROUPS= ${ZNC_GROUP}
32PKG_USERS= ${ZNC_USER}:${ZNC_GROUP} 31PKG_USERS= ${ZNC_USER}:${ZNC_GROUP}
33PKG_GROUPS_VARS= ZNC_USER 32PKG_GROUPS_VARS= ZNC_USER
34PKG_USERS_VARS= ZNC_GROUP 33PKG_USERS_VARS= ZNC_GROUP
35 34
36SUBST_CLASSES+= fix-man-znc 35SUBST_CLASSES+= fix-man-znc
37SUBST_STAGE.fix-man-znc= pre-configure 36SUBST_STAGE.fix-man-znc= pre-configure
38SUBST_MESSAGE.fix-man-znc= Fixing absolute paths in znc.1 manpage. 37SUBST_MESSAGE.fix-man-znc= Fixing absolute paths in znc.1 manpage.
39SUBST_FILES.fix-man-znc= man/znc.1 38SUBST_FILES.fix-man-znc= man/znc.1
40SUBST_SED.fix-man-znc= -e 's,\~\/\.znc,${PKG_SYSCONFDIR},g' 39SUBST_SED.fix-man-znc= -e 's,\~\/\.znc,${PKG_SYSCONFDIR},g'
41SUBST_SED.fix-man-znc+= -e 's,\/usr\/local,${PREFIX},g' 40SUBST_SED.fix-man-znc+= -e 's,\/usr\/local,${PREFIX},g'
42 41
43SUBST_CLASSES+= fix-tar 42SUBST_CLASSES+= fix-tar
44SUBST_STAGE.fix-tar= pre-build 43SUBST_STAGE.fix-tar= pre-build
45SUBST_MESSAGE.fix-tar= Replace tar executable name. 44SUBST_MESSAGE.fix-tar= Replace tar executable name.
46SUBST_FILES.fix-tar+= modules/modperl/Makefile.inc 45SUBST_FILES.fix-tar+= modules/modperl/Makefile.inc
47SUBST_FILES.fix-tar+= modules/modpython/Makefile.inc 46SUBST_FILES.fix-tar+= modules/modpython/Makefile.inc
48SUBST_SED.fix-tar= -e 's,tar -xf ,bsdtar -xf ,g' 47SUBST_SED.fix-tar= -e 's,tar -xf ,bsdtar -xf ,g'
49 48
50BUILD_DEFS+= VARBASE 49BUILD_DEFS+= VARBASE
51BUILD_DEFS+= PKG_SYSCONFDIR 50BUILD_DEFS+= PKG_SYSCONFDIR
52BUILD_DEFS+= ZNC_USER 51BUILD_DEFS+= ZNC_USER
53BUILD_DEFS+= ZNC_GROUP 52BUILD_DEFS+= ZNC_GROUP
54 53
55RCD_SCRIPTS+= znc 54RCD_SCRIPTS+= znc
56PTHREAD_AUTO_VARS= yes 55PTHREAD_AUTO_VARS= yes
57 56
58OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${ZNC_USER} ${ZNC_GROUP} 0755 57OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${ZNC_USER} ${ZNC_GROUP} 0755
59 58
60MANCOMPRESSED= yes 59MANCOMPRESSED= yes
61 60
62.include "options.mk" 61.include "options.mk"
63 62
64.include "../../devel/libgetopt/buildlink3.mk" 63.include "../../devel/libgetopt/buildlink3.mk"
65.include "../../security/openssl/buildlink3.mk" 64.include "../../security/openssl/buildlink3.mk"
66.include "../../textproc/icu/buildlink3.mk" 65.include "../../textproc/icu/buildlink3.mk"
67.include "../../mk/pthread.buildlink3.mk" 66.include "../../mk/pthread.buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/chat/znc/distinfo (switch to unified diff)

--- pkgsrc/chat/znc/distinfo 2019/06/18 10:21:37 1.4
+++ pkgsrc/chat/znc/distinfo 2019/06/22 09:31:00 1.5
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
1$NetBSD: distinfo,v 1.4 2019/06/18 10:21:37 nia Exp $ 1$NetBSD: distinfo,v 1.5 2019/06/22 09:31:00 nia Exp $
2 2
3SHA1 (znc-1.7.3.tar.gz) = 76c1c32d3ec6fc052b0c3854dbbb8896aecafee5 3SHA1 (znc-1.7.4.tar.gz) = 0755deabfcaebdefc433265b418e8c105043c84b
4RMD160 (znc-1.7.3.tar.gz) = a52f7f8500dc3156dd3387f9450e8558132013d6 4RMD160 (znc-1.7.4.tar.gz) = c660ce405d95767b7f93c1dc43888332f9449544
5SHA512 (znc-1.7.3.tar.gz) = 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8 5SHA512 (znc-1.7.4.tar.gz) = ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
6Size (znc-1.7.3.tar.gz) = 2084575 bytes 6Size (znc-1.7.4.tar.gz) = 2084756 bytes
7SHA1 (patch-include_znc_Modules.h) = 57f5d2dcb0021c3c7c0162ccd06ad8698e68022e 
8SHA1 (patch-src_Modules.cpp) = adb6f87f4c441cd438110aa58fdb31b481212eff 
File Deleted: pkgsrc/chat/znc/patches/Attic/patch-include_znc_Modules.h
File Deleted: pkgsrc/chat/znc/patches/Attic/patch-src_Modules.cpp