Attachment 196755 Details for Bug 231061 – patch

[patch] patch

hexchat.patch (text/plain), 3.78 KB, created by Piotr Kubaj on 2018-08-31 22:52:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-08-31 22:52:47 UTC

Size: 3.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 478296)
>+++ Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	hexchat
>-PORTVERSION=	2.14.1
>+PORTVERSION=	2.14.2
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> CATEGORIES=	irc gnome ipv6
> 
> MAINTAINER=	pkubaj@anongoth.pl
>@@ -78,6 +77,9 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \
> 		${WRKSRC}/src/common/server.c
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
>+		-e 's|%%PERL_VER%%|${PERL_VER}|g' \
>+		${WRKSRC}/plugins/perl/meson.build
> 
> post-install:
> 	${LN} -sf ../share/icons/hicolor/48x48/apps/${PORTNAME}.png \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 478296)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1521168316
>-SHA256 (hexchat-hexchat-v2.14.1_GH0.tar.gz) = fcf96f54720f5284b8ac52964e7a5e406893069fc332535afa724f7d7d6a6a81
>-SIZE (hexchat-hexchat-v2.14.1_GH0.tar.gz) = 2748286
>+TIMESTAMP = 1535716329
>+SHA256 (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 4f2c2137020913513ea559f788c41039ca6230764d8158862d5d1ee8785592d9
>+SIZE (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 2759172
>Index: files/patch-meson__options.txt
>===================================================================
>--- files/patch-meson__options.txt	(revision 478296)
>+++ files/patch-meson__options.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- meson_options.txt.orig	2018-03-14 02:26:31 UTC
>+--- meson_options.txt.orig	2018-08-29 16:41:08 UTC
> +++ meson_options.txt
>-@@ -39,7 +39,7 @@ option('with-exec', type: 'boolean',
>+@@ -42,7 +42,7 @@ option('with-exec', type: 'boolean',
>  option('with-fishlim', type: 'boolean',
>    description: 'Fish encryption plugin, requires openssl'
>  )
>@@ -8,4 +8,4 @@
> +option('with-lua', type: 'string',
>    description: 'Lua scripting plugin, value is pkg-config name to use or "false"'
>  )
>- option('with-perl', type: 'boolean',
>+ option('with-perl', type: 'string', value: 'perl',
>Index: files/patch-plugins_perl_meson.build
>===================================================================
>--- files/patch-plugins_perl_meson.build	(nonexistent)
>+++ files/patch-plugins_perl_meson.build	(working copy)
>@@ -0,0 +1,11 @@
>+--- plugins/perl/meson.build.orig	2018-08-29 16:41:08 UTC
>++++ plugins/perl/meson.build
>+@@ -60,7 +60,7 @@ endforeach
>+ perl_cflags += [
>+   # Perl has its own 'config.h' that we must override
>+   # TODO: Just rename ours to something more unique.
>+-  '-include', meson.build_root() + '/config.h'
>++  '-include', meson.build_root() + '/config.h', '-I%%PREFIX%%/lib/perl5/%%PERL_VER%%/mach/CORE', '-L%%PREFIX%%/lib/perl5/%%PERL_VER%%/mach/CORE', '-lperl'
>+ ]
>+ 
>+ if not cc.links('''
>
>Property changes on: files/patch-plugins_perl_meson.build
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__common__server.c
>===================================================================
>--- files/patch-src__common__server.c	(revision 478296)
>+++ files/patch-src__common__server.c	(working copy)
>@@ -1,9 +1,9 @@
>---- src/common/server.c.orig	2018-03-14 02:26:31 UTC
>+--- src/common/server.c.orig	2018-08-29 16:41:08 UTC
> +++ src/common/server.c
>-@@ -749,7 +749,7 @@ server_connect_success (server *serv)
>+@@ -748,7 +748,7 @@ server_connect_success (server *serv)
>+ 
>  		/* it'll be a memory leak, if connection isn't terminated by
>  		   server_cleanup() */
>- 		serv->ssl = _SSL_socket (serv->ctx, serv->sok);
> -		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))
> +		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, "%%CA_BUNDLE%%")))
>  		{

Flags:

pkubaj: maintainer-approval+

Actions: View | Diff

Attachments on bug 231061: 196752 | 196755