Here is an update to ZNC 1.2.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/znc/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 17 Jul 2013 07:19:38 -0000 1.19
+++ Makefile 1 Dec 2013 03:02:16 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.0
-REVISION= 1
+DISTNAME= znc-1.2
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}releases/
@@ -13,18 +12,21 @@ HOMEPAGE= http://znc.in/
MAINTAINER= Brad Smith <b...@comstyle.com>
-# GPLv2
+# Apache 2.0
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto m ssl stdc++
+MODULES= converters/libiconv
+WANTLIB= c crypto m pthread ssl stdc++ z
MAKE_FLAGS= VERBOSE=1
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.68
+CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-optimization
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ ac_cv_path_GNUMAKE=gmake
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/znc/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 17 Nov 2012 00:16:54 -0000 1.12
+++ distinfo 30 Nov 2013 21:00:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (znc-1.0.tar.gz) = qFU52kJpeybk1GIF3vNrt5n4PWru9AHVPEnuZ0FCBio=
-SIZE (znc-1.0.tar.gz) = 1222361
+SHA256 (znc-1.2.tar.gz) = 2aLNKkhP8j5vycvejdikPvvNjSiK/KexJokUyg0YcB0=
+SIZE (znc-1.2.tar.gz) = 1235150
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 1 Apr 2013 14:30:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2013/04/01 14:30:32 brad Exp $
-
-Remove incredibly stupid autoconf test which assumes that the lack
-of the getaddrinfo() flag AI_ADDRCONFIG means getaddrinfo() is not
-thread-safe. Although that was the case in the past it is no longer
-true.
-
---- configure.ac.orig Mon Apr 1 03:13:31 2013
-+++ configure.ac Mon Apr 1 03:24:30 2013
-@@ -219,29 +219,7 @@ AC_SEARCH_LIBS([dlopen], [dl], [],
- DNS_TEXT=blocking
- if test "x$TDNS" != "xno"; then
- old_TDNS=$TDNS
-- AX_PTHREAD([
-- AC_MSG_CHECKING([whether getaddrinfo() supports AI_ADDRCONFIG])
-- AC_COMPILE_IFELSE([
-- AC_LANG_PROGRAM([[
-- #include <sys/types.h>
-- #include <sys/socket.h>
-- #include <netdb.h>
-- ]], [[
-- int x = AI_ADDRCONFIG;
-- (void) x;
-- ]])
-- ], [
-- AC_MSG_RESULT([yes])
-- TDNS=yes
-- ], [
-- AC_MSG_RESULT([no])
-- TDNS=no
-- # Note that broken systems, such as OpenBSD, NetBSD,
which don't support AI_ADDRCONFIG,
-- # also have thread-unsafe getaddrinfo().
-- ])
-- ], [
-- TDNS=no
-- ])
-+ AX_PTHREAD([TDNS=yes], [TDNS=no])
- if test "x$TDNS" = "xyes"; then
- DNS_TEXT=threads
- AC_DEFINE([HAVE_THREADED_DNS], [1], [Define if threaded DNS is
enabled])
Index: patches/patch-modules_webadmin_cpp
===================================================================
RCS file: patches/patch-modules_webadmin_cpp
diff -N patches/patch-modules_webadmin_cpp
--- patches/patch-modules_webadmin_cpp 17 Jul 2013 07:19:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-modules_webadmin_cpp,v 1.1 2013/07/17 07:19:38 jasper Exp $
-
-Security fix for CVE-2013-2130,
-ZNC Multiple NULL Pointer Dereference Vulnerabilities
-
-Patch from upstream:
-https://github.com/znc/znc/commit/2bd410ee5570cea127233f1133ea22f25174eb28
-
---- modules/webadmin.cpp.orig Tue Nov 6 17:02:20 2012
-+++ modules/webadmin.cpp Tue Jul 16 11:02:02 2013
-@@ -404,7 +404,7 @@ class CWebAdminMod : public CModule { (public)
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())){
- return false;
- }
-
-@@ -433,7 +433,7 @@ class CWebAdminMod : public CModule { (public)
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -457,7 +457,7 @@ class CWebAdminMod : public CModule { (public)
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -471,7 +471,7 @@ class CWebAdminMod : public CModule { (public)
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
Index: patches/patch-src_Socket_cpp
===================================================================
RCS file: patches/patch-src_Socket_cpp
diff -N patches/patch-src_Socket_cpp
--- patches/patch-src_Socket_cpp 1 Apr 2013 14:30:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_Socket_cpp,v 1.1 2013/04/01 14:30:32 brad Exp $
---- src/Socket.cpp.orig Mon Apr 1 03:16:32 2013
-+++ src/Socket.cpp Mon Apr 1 03:16:52 2013
-@@ -114,7 +114,9 @@ void CSockManager::DoDNS(TDNSArg *arg) {
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
-+#ifdef AI_ADDRCONFIG
- hints.ai_flags = AI_ADDRCONFIG;
-+#endif
- arg->iRes = getaddrinfo(arg->sHostname.c_str(), NULL, &hints,
&arg->aiResult);
- if (EAGAIN != arg->iRes) {
- break;
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/znc/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 17 Nov 2012 00:16:54 -0000 1.10
+++ pkg/PLIST 1 Dec 2013 00:44:58 -0000
@@ -20,6 +20,7 @@ include/znc/SHA256.h
include/znc/Server.h
include/znc/Socket.h
include/znc/Template.h
+include/znc/Threads.h
include/znc/User.h
include/znc/Utils.h
include/znc/WebModules.h
@@ -48,6 +49,7 @@ lib/znc/buffextras.so
lib/znc/cert.so
lib/znc/certauth.so
lib/znc/chansaver.so
+lib/znc/charset.so
lib/znc/clearbufferonmsg.so
lib/znc/clientnotify.so
lib/znc/controlpanel.so
@@ -65,6 +67,7 @@ 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
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
