Attachment 153555 Details for Bug 198060 – irc/znc-1.4 -> 1.6.0 port patch

[patch] irc/znc-1.4 -> 1.6.0 port patch

irc-znc-1.6.0.patch (text/plain), 12.23 KB, created by Matthew Connelly on 2015-02-26 18:59:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Connelly

Created: 2015-02-26 18:59:25 UTC

Size: 12.23 KB

patch

obsolete

>diff -Naur a/irc/znc/Makefile b/irc/znc/Makefile
>--- a/irc/znc/Makefile	2015-02-26 18:22:02.000000000 +0000
>+++ b/irc/znc/Makefile	2015-02-26 18:08:38.000000000 +0000
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	znc
>-PORTVERSION=	1.4
>+PORTVERSION=	1.6.0
> CATEGORIES=	irc ipv6
> MASTER_SITES=	http://znc.in/releases/
> 
>@@ -17,7 +17,7 @@
> 
> NO_OPTIONS_SORT=	yes
> 
>-OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL DOCS
>+OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL CHARSET DOCS
> OPTIONS_DEFAULT=	OPENSSL PERL
> OPTIONS_SUB=	yes
> 
>@@ -25,6 +25,7 @@
> DEBUG_DESC=	Debugging support
> PERL_DESC=	Perl scripting module
> PYTHON_DESC=	Python scripting module
>+CHARSET_DESC=	Character encoding support via ICU
> TCL_DESC=	Tcl scripting module
> 
> CYRUS_CONFIGURE_ON=	--enable-cyrus
>@@ -32,14 +33,16 @@
> CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
> DEBUG_CONFIGURE_ON=	--enable-debug
> IPV6_CONFIGURE_OFF=	--disable-ipv6
>-PERL_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
>+PERL_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
> PERL_CONFIGURE_ENABLE=	perl
> PERL_CONFIGURE_ON=	--enable-swig
> PERL_USES=	perl5
>-PYTHON_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
>+PYTHON_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
> PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
> PYTHON_USES=	perl5 python:3
> OPENSSL_CONFIGURE_OFF=	--disable-openssl
>+CHARSET_CONFIGURE_OFF=	--disable-charset
>+CHARSET_BUILD_DEPENDS=	icu>=53.1:${PORTSDIR}/devel/icu
> TCL_CONFIGURE_ENABLE=	tcl
> 
> .include <bsd.port.options.mk>
>diff -Naur a/irc/znc/distinfo b/irc/znc/distinfo
>--- a/irc/znc/distinfo	2015-02-26 18:22:49.000000000 +0000
>+++ b/irc/znc/distinfo	2015-02-26 18:08:38.000000000 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (znc-1.4.tar.gz) = 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52
>-SIZE (znc-1.4.tar.gz) = 1239648
>+SHA256 (znc-1.6.0.tar.gz) = df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7
>+SIZE (znc-1.6.0.tar.gz) = 1367962
>diff -Naur a/irc/znc/files/patch-modules-modperl-Makefile_inc b/irc/znc/files/patch-modules-modperl-Makefile_inc
>--- a/irc/znc/files/patch-modules-modperl-Makefile_inc	2015-02-26 18:21:51.000000000 +0000
>+++ b/irc/znc/files/patch-modules-modperl-Makefile_inc	2015-02-26 18:08:38.000000000 +0000
>@@ -1,11 +1,11 @@
>---- modules/modperl/Makefile.inc.orig	2012-11-28 11:59:30.509460980 +0000
>-+++ modules/modperl/Makefile.inc	2012-11-28 12:00:07.142992057 +0000
>+--- modules/modperl/Makefile.inc.orig	2015-02-12 20:51:46.000000000 +0000
>++++ modules/modperl/Makefile.inc	2015-02-26 02:56:35.000000000 +0000
> @@ -6,7 +6,7 @@
>  PERL_LD    := $(shell $(PERL) -MExtUtils::Embed -e ldopts)
>  # Perl API is ugly, casting string literals to char* and redeclaring functions :(
>  PERL_CXX   += -Wno-write-strings -Wno-redundant-decls -Wno-missing-declarations
> -PERL_CXX   += -Wno-type-limits -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
> +PERL_CXX   += -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
>+ # perl 5.20 will fix this warning: https://rt.perl.org/Public/Bug/Display.html?id=120670
>+ PERL_CXX   += -Wno-reserved-user-defined-literal -Wno-literal-suffix
>  # This is for SWIG
>- PERL_CXX   += -DSWIG_TYPE_TABLE=znc
>- modperlCXXFLAGS := $(PERL_CXX) -Wno-unused-function
>diff -Naur a/irc/znc/pkg-plist b/irc/znc/pkg-plist
>--- a/irc/znc/pkg-plist	2015-02-26 18:22:17.000000000 +0000
>+++ b/irc/znc/pkg-plist	2015-02-26 18:08:38.000000000 +0000
>@@ -1,80 +1,81 @@
> 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/Threads.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/Modules.h
>-include/znc/Nick.h
>-include/znc/SHA256.h
>-include/znc/Server.h
> include/znc/Socket.h
>+include/znc/version.h
>+include/znc/IRCNetwork.h
> include/znc/Template.h
>-include/znc/Threads.h
>+include/znc/main.h
>+include/znc/HTTPSock.h
>+include/znc/defines.h
> include/znc/User.h
>-include/znc/Utils.h
>-include/znc/WebModules.h
>+include/znc/Chan.h
>+include/znc/FileUtils.h
>+include/znc/Listener.h
>+include/znc/Buffer.h
>+include/znc/Query.h
>+include/znc/Client.h
>+include/znc/SSLVerifyHost.h
>+include/znc/Nick.h
> include/znc/ZNCDebug.h
>+include/znc/Utils.h
>+include/znc/Modules.h
>+include/znc/MD5.h
> include/znc/ZNCString.h
>-include/znc/defines.h
>-include/znc/main.h
>-include/znc/version.h
>+include/znc/IRCSock.h
>+include/znc/WebModules.h
>+include/znc/SHA256.h
>+include/znc/Server.h
>+include/znc/Csocket.h
>+include/znc/Config.h
> include/znc/znc.h
>-include/znc/zncconfig.h
>-lib/znc/adminlog.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/block_motd.so
>+lib/znc/alias.so
> lib/znc/blockuser.so
>-lib/znc/bouncedcc.so
>-lib/znc/buffextras.so
>-lib/znc/chansaver.so
>-lib/znc/charset.so
>-lib/znc/clearbufferonmsg.so
>-lib/znc/clientnotify.so
>-lib/znc/controlpanel.so
>-lib/znc/ctcpflood.so
>-lib/znc/dcc.so
>-lib/znc/disconkick.so
>+lib/znc/nickserv.so
>+lib/znc/q.so
>+lib/znc/log.so
> lib/znc/fail2ban.so
>-lib/znc/flooddetach.so
> lib/znc/identfile.so
>-lib/znc/imapauth.so
> lib/znc/keepnick.so
>+lib/znc/chansaver.so
>+lib/znc/ctcpflood.so
>+lib/znc/block_motd.so
>+lib/znc/autoattach.so
>+lib/znc/controlpanel.so
>+lib/znc/watch.so
> lib/znc/kickrejoin.so
>+lib/znc/perform.so
>+lib/znc/send_raw.so
>+lib/znc/imapauth.so
>+lib/znc/adminlog.so
>+lib/znc/sasl.so
>+lib/znc/raw.so
>+lib/znc/clientnotify.so
>+lib/znc/autovoice.so
>+lib/znc/buffextras.so
>+lib/znc/autoop.so
>+lib/znc/autocycle.so
>+lib/znc/awaynick.so
> lib/znc/lastseen.so
>+lib/znc/flooddetach.so
>+lib/znc/shell.so
>+lib/znc/autoreply.so
>+lib/znc/sample.so
> lib/znc/listsockets.so
>-lib/znc/log.so
>+lib/znc/webadmin.so
> lib/znc/missingmotd.so
>+lib/znc/stickychan.so
>+lib/znc/partyline.so
>+lib/znc/simple_away.so
> lib/znc/modules_online.so
>-lib/znc/nickserv.so
>+lib/znc/disconkick.so
>+lib/znc/bouncedcc.so
>+lib/znc/route_replies.so
> lib/znc/notes.so
>+lib/znc/dcc.so
>+lib/znc/clearbufferonmsg.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/sasl.so
>-lib/znc/send_raw.so
>-lib/znc/shell.so
>-lib/znc/simple_away.so
>-lib/znc/stickychan.so
>-lib/znc/watch.so
>-lib/znc/webadmin.so
> libdata/pkgconfig/znc.pc
> man/man1/znc-buildmod.1.gz
> man/man1/znc.1.gz
>@@ -97,67 +98,72 @@
> %%TCL%%lib/znc/modtcl.so
> %%TCL%%share/znc/modtcl/binds.tcl
> %%TCL%%share/znc/modtcl/modtcl.tcl
>-%%DATADIR%%/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl
>-%%DATADIR%%/modules/cert/tmpl/index.tmpl
>-%%DATADIR%%/modules/certauth/tmpl/index.tmpl
>-%%DATADIR%%/modules/lastseen/tmpl/index.tmpl
>-%%DATADIR%%/modules/lastseen/tmpl/lastseen_WebadminUser.tmpl
>-%%DATADIR%%/modules/listsockets/tmpl/index.tmpl
>-%%DATADIR%%/modules/notes/files/trash.gif
>-%%DATADIR%%/modules/notes/tmpl/index.tmpl
>-%%DATADIR%%/modules/perform/tmpl/index.tmpl
>-%%DATADIR%%/modules/send_raw/files/select.js
>-%%DATADIR%%/modules/send_raw/tmpl/index.tmpl
>-%%DATADIR%%/modules/stickychan/tmpl/index.tmpl
>-%%DATADIR%%/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
>-%%DATADIR%%/modules/webadmin/files/webadmin.js
>-%%DATADIR%%/modules/webadmin/tmpl/add_edit_chan.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/add_edit_network.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/add_edit_user.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/del_network.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/del_user.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/index.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/listusers.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/settings.tmpl
>-%%DATADIR%%/modules/webadmin/tmpl/traffic.tmpl
>-%%DATADIR%%/webskins/_default_/pub/_default_.css
>-%%DATADIR%%/webskins/_default_/pub/favicon.ico
>-%%DATADIR%%/webskins/_default_/pub/global.css
>-%%DATADIR%%/webskins/_default_/pub/robots.txt
>-%%DATADIR%%/webskins/_default_/tmpl/Banner.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/BaseHeader.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/InfoBar.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/index.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/BreadCrumbs.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/DocType.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/Menu.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/MessageBar.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/FooterTag.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/_csrf_check.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/Error.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/ExtraHeader.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/Footer.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/FooterTag.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/Header.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/InfoBar.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/LoginBar.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/LowerBanner.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/Menu.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/MessageBar.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/ExtraHeader.tmpl
> %%DATADIR%%/webskins/_default_/tmpl/Options.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/_csrf_check.tmpl
>-%%DATADIR%%/webskins/_default_/tmpl/index.tmpl
>-%%DATADIR%%/webskins/dark-clouds/pub/clouds-header.jpg
>-%%DATADIR%%/webskins/dark-clouds/pub/dark-clouds.css
>-%%DATADIR%%/webskins/dark-clouds/pub/favicon.ico
>+%%DATADIR%%/webskins/_default_/tmpl/Header.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/LoginBar.tmpl
>+%%DATADIR%%/webskins/_default_/tmpl/Banner.tmpl
>+%%DATADIR%%/webskins/_default_/pub/_default_.css
>+%%DATADIR%%/webskins/_default_/pub/favicon.ico
>+%%DATADIR%%/webskins/_default_/pub/External.png
>+%%DATADIR%%/webskins/_default_/pub/robots.txt
>+%%DATADIR%%/webskins/_default_/pub/jquery-1.11.2.min.js
>+%%DATADIR%%/webskins/_default_/pub/global.css
>+%%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl
>+%%DATADIR%%/webskins/ice/tmpl/Header.tmpl
>+%%DATADIR%%/webskins/ice/pub/pagebg.gif
>+%%DATADIR%%/webskins/ice/pub/linkbg.jpg
>+%%DATADIR%%/webskins/ice/pub/favicon.ico
>+%%DATADIR%%/webskins/ice/pub/ice.css
> %%DATADIR%%/webskins/dark-clouds/tmpl/Banner.tmpl
> %%DATADIR%%/webskins/dark-clouds/tmpl/FooterTag.tmpl
>-%%DATADIR%%/webskins/dark-clouds/tmpl/Header.tmpl
> %%DATADIR%%/webskins/dark-clouds/tmpl/LowerBanner.tmpl
>-%%DATADIR%%/webskins/forest/pub/favicon.ico
>-%%DATADIR%%/webskins/forest/pub/forest-header.png
>-%%DATADIR%%/webskins/forest/pub/forest.css
>+%%DATADIR%%/webskins/dark-clouds/tmpl/Header.tmpl
>+%%DATADIR%%/webskins/dark-clouds/pub/favicon.ico
>+%%DATADIR%%/webskins/dark-clouds/pub/clouds-header.jpg
>+%%DATADIR%%/webskins/dark-clouds/pub/dark-clouds.css
> %%DATADIR%%/webskins/forest/tmpl/Banner.tmpl
> %%DATADIR%%/webskins/forest/tmpl/FooterTag.tmpl
>-%%DATADIR%%/webskins/forest/tmpl/Header.tmpl
> %%DATADIR%%/webskins/forest/tmpl/LowerBanner.tmpl
>-%%DATADIR%%/webskins/ice/pub/favicon.ico
>-%%DATADIR%%/webskins/ice/pub/ice.css
>-%%DATADIR%%/webskins/ice/pub/linkbg.jpg
>-%%DATADIR%%/webskins/ice/pub/pagebg.gif
>-%%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl
>-%%DATADIR%%/webskins/ice/tmpl/Header.tmpl
>+%%DATADIR%%/webskins/forest/tmpl/Header.tmpl
>+%%DATADIR%%/webskins/forest/pub/favicon.ico
>+%%DATADIR%%/webskins/forest/pub/forest-header.png
>+%%DATADIR%%/webskins/forest/pub/forest.css
>+%%DATADIR%%/modules/notes/tmpl/index.tmpl
>+%%DATADIR%%/modules/notes/files/trash.gif
>+%%DATADIR%%/modules/stickychan/tmpl/index.tmpl
>+%%DATADIR%%/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
>+%%DATADIR%%/modules/send_raw/tmpl/index.tmpl
>+%%DATADIR%%/modules/send_raw/files/select.js
>+%%DATADIR%%/modules/q/tmpl/index.tmpl
>+%%DATADIR%%/modules/perform/tmpl/index.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/encoding_settings.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/index.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/traffic.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/add_edit_chan.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/del_network.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/del_user.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/settings.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/add_edit_user.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/add_edit_network.tmpl
>+%%DATADIR%%/modules/webadmin/tmpl/listusers.tmpl
>+%%DATADIR%%/modules/webadmin/files/webadmin.css
>+%%DATADIR%%/modules/webadmin/files/webadmin.js
>+%%DATADIR%%/modules/listsockets/tmpl/index.tmpl
>+%%DATADIR%%/modules/lastseen/tmpl/index.tmpl
>+%%DATADIR%%/modules/lastseen/tmpl/lastseen_WebadminUser.tmpl
>+%%DATADIR%%/modules/certauth/tmpl/index.tmpl
>+%%DATADIR%%/modules/cert/tmpl/index.tmpl
>+%%DATADIR%%/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl

Actions: View | Diff

Attachments on bug 198060: 153555 | 153557 | 153586