<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84894aa33265247825ba232d5dac7ff24d46f4ca">https://github.com/macports/macports-ports/commit/84894aa33265247825ba232d5dac7ff24d46f4ca</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 84894aa3326 botan: update to 2.18.2
</span>84894aa3326 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84894aa33265247825ba232d5dac7ff24d46f4ca
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Sun Nov 14 19:25:48 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> botan: update to 2.18.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to 2.18.2
</span><span style='display:block; white-space:pre;color:#404040;'> * update legacysupport PG to 1.1
</span><span style='display:block; white-space:pre;color:#404040;'> * set legacysupport.newest_darwin_requires_legacy to 15 for clock_gettime & getentropy
</span><span style='display:block; white-space:pre;color:#404040;'> * use python 3.9 instead of 2.7
</span><span style='display:block; white-space:pre;color:#404040;'> * compile with lzma & sqlite3 support
</span><span style='display:block; white-space:pre;color:#404040;'> * remove obsolete patches
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix ld flags order. fixes build when an older version of botan is already installed
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch to fix missing sys/types.h
</span>---
security/botan/Portfile | 51 ++++++++-------
.../files/patch-fix-install-with-destdir.diff | 13 ----
security/botan/files/patch-fix-ldflags-order.diff | 75 ++++++++++++++++++++++
.../botan/files/patch-fix-missing-sys-types.h.diff | 28 ++++++++
security/botan/files/patch-map_anon.diff | 13 ----
security/botan/files/patch-python_exe.diff | 13 ----
6 files changed, 130 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/Portfile b/security/botan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb3ab4082fa..8ac8f7fbab9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,15 @@
</span>
PortSystem 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for arc4random_buf(), which is missing on 10.6 (Darwin 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# botan needs clock_gettime & getentropy which are missing until osx 10.11 (=darwin 15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span>
name botan
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.18.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories security devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,20 +25,22 @@ long_description Botan is a C++ library implementing a variety of \
</span> homepage https://botan.randombit.net
master_sites ${homepage}/releases/
distname Botan-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f3a4c1b963b47d543430f8705d7db87c64e013b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7240021
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d4c98a021d8519660538269c5713550bbabd2cd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5996928
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl port:zlib port:bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lzma \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
# respect MacPorts configure values
patchfiles-append patch-compiler_flags.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-install-with-destdir.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python_exe.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-map_anon.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-missing-sys-types.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-ldflags-order.diff
</span>
post-patch {
reinplace -W ${worksrcpath}/src/build-data/cc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +58,14 @@ if {[tbool configure.ccache]} {
</span> configure.args-append --cc-bin=${configure.cxx}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${prefix}/bin/python2.7 ./configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --docdir=share/doc --with-openssl --with-zlib --with-bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ${prefix}/bin/python3.9 ./configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --docdir=share/doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --system-cert-bundle=${prefix}/share/curl/curl-ca-bundle.crt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lzma \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zlib
</span>
if {[string match *clang* ${configure.compiler}]} {
configure.args-append --cc=clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,16 +73,9 @@ if {[string match *clang* ${configure.compiler}]} {
</span> configure.args-append --cc=gcc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # getentropy() appeared in OSX 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-os-features=getentropy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # no matching constructor for initialization of 'std::vector<CFStringRef>'
if {${os.major} <= 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-modules=certstor_system_macos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-modules=certstor_system_macos
</span> }
# Upstream default for both GCC and Clang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-fix-install-with-destdir.diff b/security/botan/files/patch-fix-install-with-destdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f0759462208..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/files/patch-fix-install-with-destdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/scripts/install.py src/scripts/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52a1ebdf7..e3df1b20a 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/scripts/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/scripts/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +222,7 @@ def main(args):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-change',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join('@executable_path', soname_abi),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(lib_dir, soname_abi),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join(bin_dir, cfg['cli_exe_name'])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prepend_destdir(os.path.join(bin_dir, cfg['cli_exe_name']))])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if 'botan_pkgconfig' in cfg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkgconfig_dir = os.path.join(options.prefix, options.libdir, options.pkgconfigdir)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-fix-ldflags-order.diff b/security/botan/files/patch-fix-ldflags-order.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..859c70704ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/files/patch-fix-ldflags-order.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 143683828f912ddcc028f0a338788040e5397353 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@nexenio.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 15 Nov 2021 16:09:53 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] FIX: always state -L${BUILD_DIR} before ${LDFLAGS} (fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #2847)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Co-Authored-By: Hannes Rantzsch <hannes.rantzsch@nexenio.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.py | 5 +++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/build-data/makefile.in | 13 +++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 10 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.py b/configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9b02556253..b1bb63f723 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2247,10 +2247,11 @@ def extra_libs(libs, cc):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if options.os == 'llvm' or options.compiler == 'msvc':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm-link and msvc require just naming the file directly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ variables['build_dir_link_path'] = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variables['link_to_botan'] = os.path.join(build_dir, variables['static_lib_name'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- variables['link_to_botan'] = '%s%s %s' % (cc.add_lib_dir_option, build_dir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cc.add_lib_option % variables['libname']))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ variables['build_dir_link_path'] = '%s%s' % (cc.add_lib_dir_option, build_dir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ variables['link_to_botan'] = cc.add_lib_option % variables['libname']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 82f6576650..53b361ed3c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/build-data/makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/build-data/makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,8 +19,9 @@ LDFLAGS = %{ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXE_LINK_CMD = %{exe_link_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_LINKS_TO = %{external_link_cmd} %{link_to}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{extra_libs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_LINKS_TO = %{external_link_cmd} %{link_to}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BUILD_DIR_LINK_PATH = %{build_dir_link_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{extra_libs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,10 +72,10 @@ TESTOBJS = %{join test_objs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Executable targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CLI): $(LIBRARIES) $(CLIOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(EXE_LINK_CMD) $(ABI_FLAGS) $(CLIOBJS) $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(EXE_LINK_CMD) $(ABI_FLAGS) $(CLIOBJS) $(BUILD_DIR_LINK_PATH) $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TEST): $(LIBRARIES) $(TESTOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(BUILD_DIR_LINK_PATH) $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{if build_fuzzers}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +97,7 @@ bogo_shim: %{out_dir}/botan_bogo_shim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # BoGo shim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{out_dir}/botan_bogo_shim: %{bogo_shim_src} $(LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(BUILD_FLAGS) %{include_paths} %{bogo_shim_src} $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(BUILD_FLAGS) %{include_paths} %{bogo_shim_src} $(BUILD_DIR_LINK_PATH) $(LDFLAGS) $(EXE_LINKS_TO) %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{endif}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,5 +142,5 @@ bogo_shim: %{out_dir}/botan_bogo_shim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(BUILD_FLAGS) %{isa_flags} %{include_paths} %{dash_c} %{src} %{dash_o}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{exe}: %{obj} $(LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(EXE_LINK_CMD) $(ABI_FLAGS) %{obj} $(EXE_LINKS_TO) %{fuzzer_lib} %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(EXE_LINK_CMD) $(ABI_FLAGS) %{obj} $(BUILD_DIR_LINK_PATH) $(LDFLAGS) $(EXE_LINKS_TO) %{fuzzer_lib} %{output_to_exe}$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %{endfor}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-fix-missing-sys-types.h.diff b/security/botan/files/patch-fix-missing-sys-types.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5c5c6de386d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/files/patch-fix-missing-sys-types.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0a24a0566aa7f2a1905b4f2d5f9fa54ef63e5396 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 16 Nov 2021 18:08:33 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation issue on older mac (< 10.12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Error was:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In file included from src/lib/entropy/getentropy/getentropy.cpp:13:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/sys/random.h:37:32: error: unknown type name 'u_int'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void read_random(void* buffer, u_int numBytes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/sys/random.h:38:33: error: unknown type name 'u_int'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+void read_frandom(void* buffer, u_int numBytes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/sys/random.h:39:33: error: unknown type name 'u_int'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int write_random(void* buffer, u_int numBytes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/entropy/getentropy/getentropy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/entropy/getentropy/getentropy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(BOTAN_TARGET_OS_IS_OPENBSD) || defined(BOTAN_TARGET_OS_IS_FREEBSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(BOTAN_TARGET_OS_HAS_POSIX1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-map_anon.diff b/security/botan/files/patch-map_anon.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6e05b67a608..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/files/patch-map_anon.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/lib/utils/os_utils.cpp src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f30f18ae9..f5a08ca4c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -425,7 +425,7 @@ std::vector<void*> OS::allocate_locked_pages(size_t count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptr = ::mmap(nullptr, 2*page_size,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROT_READ | PROT_WRITE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MAP_ANONYMOUS | MAP_PRIVATE | MAP_NOCORE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*fd=*/-1, /*offset=*/0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ptr == MAP_FAILED)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-python_exe.diff b/security/botan/files/patch-python_exe.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1dfba90ff52..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/files/patch-python_exe.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.py configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b892389e3..4469bc50e 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2009,7 +2009,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'mp_bits': choose_mp_bits(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'python_exe': os.path.basename(sys.executable),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'python_exe': sys.executable,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'python_version': options.python_version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cxx': (options.compiler_binary or cc.binary_name),
</span></pre><pre style='margin:0'>
</pre>