Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devel/qca/Portfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt6-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt6: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt5-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt5-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt5-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-qt5: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-26

port lint qca: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt6-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt6: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt5-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt5-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt5-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-qt5: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint qca: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt6-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt6: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt5-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt5-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt5-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-qt5: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-pkcs11: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-ossl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca-cyrus-sasl: Error: Line 197 repeats inclusion of PortGroup openssl

Check warning on line 1 in devel/qca/Portfile

View workflow job for this annotation

GitHub Actions / macos-15

port lint qca: Error: Line 197 repeats inclusion of PortGroup openssl

PortSystem 1.0

Expand Down Expand Up @@ -169,7 +169,7 @@
if {${subport} eq "${name}${qv}"} {
# revbump for botan2
revision 0
depends_lib-append port:botan \
depends_lib-append port:botan2 \
port:libgcrypt \
port:nss
configure.args-append -DBUILD_PLUGINS:STRING="botan\;gcrypt\;gnupg\;logger\;nss\;softstore"
Expand Down
82 changes: 57 additions & 25 deletions security/botan/Portfile → security/botan2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ PortGroup legacysupport 1.1
# botan needs clock_gettime & getentropy which are missing until osx 10.11 (=darwin 15)
legacysupport.newest_darwin_requires_legacy 15

name botan
name botan2
version 2.19.5
revision 0
revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories security devel
maintainers nomaintainer
Expand All @@ -30,21 +30,41 @@ checksums rmd160 b82daea6a81d29aeb425bfceeb80826ff1ee1fb3 \
sha256 dfeea0e0a6f26d6724c4af01da9a7b88487adb2d81ba7c72fcaf52db522c9ad4 \
size 6140148

depends_build port:python312
depends_lib port:bzip2 \
port:lzma \
port:sqlite3 \
port:zlib
# please remove after 2028-01-01
subport botan {
PortGroup obsolete 1.0
replaced_by botan2
}

# respect MacPorts configure values
patchfiles-append patch-compiler_flags.diff

platform powerpc {
# https://github.com/macos-powerpc/powerpc-ports/blob/main/security/botan/files/patch-cstdint.diff
patchfiles-append \
patch-cstdint.diff
}

post-patch {
reinplace -W ${worksrcpath}/src/build-data/cc \
"s|__MACPORTS_CXX_STDLIB__|${configure.cxx_stdlib}|g" \
clang.txt
}

# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
set python_version 314
set python_branch [string index ${python_version} 0].[string range ${python_version} 1 end]

depends_build-append \
port:python${python_version} \
port:py${python_version}-standard-distutils

depends_lib-append \
port:bzip2 \
port:lzma \
port:sqlite3 \
port:zlib

compiler.cxx_standard 2011
# botan uses thread_local, which is not supported in Xcode < 8
compiler.thread_local_storage yes
Expand All @@ -55,14 +75,13 @@ if {[tbool configure.ccache]} {
configure.args-append --cc-bin=${configure.cxx}
}

set python_branch 3.12
configure.cmd ${prefix}/bin/python${python_branch} ./configure.py
configure.cmd ${prefix}/bin/python${python_branch} ./configure.py
configure.args-append --docdir=share/doc \
--system-cert-bundle=${prefix}/share/curl/curl-ca-bundle.crt \
--with-bzip2 \
--with-lzma \
--with-sqlite3 \
--with-zlib
--system-cert-bundle=${prefix}/share/curl/curl-ca-bundle.crt \
--with-bzip2 \
--with-lzma \
--with-sqlite3 \
--with-zlib

# List of all intrinsics that can be disabled
set intrinsics {
Expand Down Expand Up @@ -110,18 +129,31 @@ variant native description {Enable all intrinsics} {
}
}

configure.args.ppc "--cpu=ppc --cc-abi-flags='-arch ppc'"
configure.args.i386 "--cpu=ia32 --cc-abi-flags='-arch i386'"
configure.args.ppc64 "--cpu=ppc64 --cc-abi-flags='-arch ppc64'"
configure.args.x86_64 "--cpu=amd64 --cc-abi-flags='-arch x86_64'"
configure.args.arm64 "--cpu=arm64 --cc-abi-flags='-arch arm64'"
configure.args.ppc "--cpu=ppc --cc-abi-flags='-arch ppc'"
configure.args.i386 "--cpu=ia32 --cc-abi-flags='-arch i386'"
configure.args.ppc64 "--cpu=ppc64 --cc-abi-flags='-arch ppc64'"
configure.args.x86_64 "--cpu=amd64 --cc-abi-flags='-arch x86_64'"
configure.args.arm64 "--cpu=arm64 --cc-abi-flags='-arch arm64'"

# configure.py rejects --host
triplet.add_host {none}

livecheck.regex Botan-(${branch}\\.\[0-9.\]+)${extract.suffix}
# configure.py rejects --host
triplet.add_host {none}

post-destroot {
xinstall -d ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib
move ${destroot}${prefix}/lib/python${python_branch} ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}
# avoid botan3 conflicts
move \
${destroot}${prefix}/bin/botan \
${destroot}${prefix}/bin/${name}
if {[file exists ${destroot}${prefix}/share/man/man1/botan.1.gz]} {
move \
${destroot}${prefix}/share/man/man1/botan.1.gz \
${destroot}${prefix}/share/man/man1/${name}.1.gz
}

xinstall -d \
${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib
move \
${destroot}${prefix}/lib/python${python_branch} \
${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}
}

livecheck.regex Botan-(${branch}\\.\[0-9.\]+)${extract.suffix}
10 changes: 10 additions & 0 deletions security/botan2/files/patch-cstdint.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- src/cli/cli.h 2024-07-08 18:54:05.000000000 +0800
+++ src/cli/cli.h 2026-07-26 09:32:37.000000000 +0800
@@ -8,6 +8,7 @@
#define BOTAN_CLI_H_

#include <botan/build.h>
+#include <cstdint>
#include <functional>
#include <ostream>
#include <map>