Attachment 219690 Details for Bug 251106 – Update Botan to 2.17.2 and add patch from upstream to fix linking issue

[patch] Update Botan to 2.17.2 and add patch from upstream to fix linking issue

botan2-2.17.2.diff (text/plain), 2.84 KB, created by Ralf van der Enden on 2020-11-14 20:45:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2020-11-14 20:45:38 UTC

Size: 2.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 555056)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	botan
>-DISTVERSION=	2.17.1
>+DISTVERSION=	2.17.2
> CATEGORIES=	security
> MASTER_SITES=	http://botan.randombit.net/releases/
> PKGNAMESUFFIX=	2
>Index: distinfo
>===================================================================
>--- distinfo	(revision 555056)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1604775880
>-SHA256 (Botan-2.17.1.tar.xz) = 741358b3f1638ed7d9b2f59b4e344aa46f4966b15958b5434c0ac1580df0c0c1
>-SIZE (Botan-2.17.1.tar.xz) = 5970240
>+TIMESTAMP = 1605386323
>+SHA256 (Botan-2.17.2.tar.xz) = ebe27dfe2b55d7e02bf520e926606c48b76b22facb483256b13ab38e018e1e6c
>+SIZE (Botan-2.17.2.tar.xz) = 5940964
>Index: files/patch-fix-link-paths
>===================================================================
>--- files/patch-fix-link-paths	(nonexistent)
>+++ files/patch-fix-link-paths	(working copy)
>@@ -0,0 +1,36 @@
>+From 639a5c4515a36bcbadb82145d755005620c535c3 Mon Sep 17 00:00:00 2001
>+From: Jack Lloyd <jack@randombit.net>
>+Date: Fri, 13 Nov 2020 18:04:09 -0500
>+Subject: [PATCH] Fix use of -L flag when combined with --external-libdir
>+
>+GH #2496
>+--- configure.py.orig	2020-11-14 16:39:43 UTC
>++++ configure.py
>+@@ -2118,9 +2118,9 @@ def create_template_vars(source_paths, build_paths, op
>+ 
>+         'visibility_attribute': cc.gen_visibility_attribute(options),
>+ 
>+-        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
>+-        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
>+-        'post_link_cmd': '',
>++        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options),
>++        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options),
>++        'external_link_cmd': external_link_cmd(),
>+ 
>+         'ar_command': ar_command(),
>+         'ar_options': options.ar_options or cc.ar_options or osinfo.ar_options,
>+ configure.py               | 6 +++---
>+ src/build-data/makefile.in | 2 +-
>+ 2 files changed, 4 insertions(+), 4 deletions(-)
>+
>+--- src/build-data/makefile.in.orig	2020-11-07 07:43:35 UTC
>++++ src/build-data/makefile.in
>+@@ -20,7 +20,7 @@ LDFLAGS        = %{ldflags}
>+ 
>+ EXE_LINK_CMD   = %{exe_link_cmd}
>+ 
>+-LIB_LINKS_TO   = %{link_to}
>++LIB_LINKS_TO   = %{external_link_cmd} %{link_to}
>+ EXE_LINKS_TO   = %{link_to_botan} $(LIB_LINKS_TO)
>+ 
>+ BUILD_FLAGS    = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
>
>Property changes on: files/patch-fix-link-paths
>___________________________________________________________________
>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

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 251106: 219640 | 219643 | 219660 | 219690