UPDATE: znc-1.4

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: znc-1.4

Edd Barrett
See below a diff updating net/znc to version 1.4.

Have been using it the last few days on multiple irc networks and with
icbirc to connect to icb via znc. Also tested with android clients.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/znc/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 30 Apr 2014 14:12:19 -0000 1.20
+++ Makefile 17 Jun 2014 23:16:19 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
 
 COMMENT= advanced IRC bouncer
 
-DISTNAME= znc-1.0
-REVISION= 2
+DISTNAME= znc-1.4
 CATEGORIES= net
 MASTER_SITES= ${HOMEPAGE}releases/
 
@@ -16,7 +15,7 @@ MAINTAINER= Brad Smith <[hidden email]
 # GPLv2
 PERMIT_PACKAGE_CDROM= Yes
 
-WANTLIB= c crypto m ssl stdc++
+WANTLIB= c crypto m pthread ssl stdc++ z
 
 MAKE_FLAGS= VERBOSE=1
 
Index: distinfo
===================================================================
RCS file: /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 17 Jun 2014 23:16:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (znc-1.0.tar.gz) = qFU52kJpeybk1GIF3vNrt5n4PWru9AHVPEnuZ0FCBio=
-SIZE (znc-1.0.tar.gz) = 1222361
+SHA256 (znc-1.4.tar.gz) = humP0O0YLTmCjJJoCfgHXYNu47cKbdQ9+7Q0gi8qe1I=
+SIZE (znc-1.4.tar.gz) = 1239648
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: pkg/PLIST
===================================================================
RCS file: /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 17 Jun 2014 23:16:19 -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
@@ -65,6 +66,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

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: znc-1.4

Brad Smith-14
On 17/06/14 7:20 PM, Edd Barrett wrote:
> See below a diff updating net/znc to version 1.4.
>
> Have been using it the last few days on multiple irc networks and with
> icbirc to connect to icb via znc. Also tested with android clients.
>
> OK?

http://marc.info/?l=openbsd-ports&m=139994600000909&w=2

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/znc/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 30 Apr 2014 14:12:19 -0000 1.20
> +++ Makefile 17 Jun 2014 23:16:19 -0000
> @@ -4,8 +4,7 @@ SHARED_ONLY= Yes
>
>   COMMENT= advanced IRC bouncer
>
> -DISTNAME= znc-1.0
> -REVISION= 2
> +DISTNAME= znc-1.4
>   CATEGORIES= net
>   MASTER_SITES= ${HOMEPAGE}releases/
>
> @@ -16,7 +15,7 @@ MAINTAINER= Brad Smith <[hidden email]
>   # GPLv2
>   PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB= c crypto m ssl stdc++
> +WANTLIB= c crypto m pthread ssl stdc++ z
>
>   MAKE_FLAGS= VERBOSE=1
>
> Index: distinfo
> ===================================================================
> RCS file: /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 17 Jun 2014 23:16:19 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (znc-1.0.tar.gz) = qFU52kJpeybk1GIF3vNrt5n4PWru9AHVPEnuZ0FCBio=
> -SIZE (znc-1.0.tar.gz) = 1222361
> +SHA256 (znc-1.4.tar.gz) = humP0O0YLTmCjJJoCfgHXYNu47cKbdQ9+7Q0gi8qe1I=
> +SIZE (znc-1.4.tar.gz) = 1239648
> 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: pkg/PLIST
> ===================================================================
> RCS file: /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 17 Jun 2014 23:16:19 -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
> @@ -65,6 +66,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.