Botan3: TPM 1.2 support is deprecated, TPM 2.0 support is still rudimentary, so remov...

diff --git a/Botan3/Botan3.SlackBuild b/Botan3/Botan3.SlackBuild
index 6f49366048c70f4266ee28fee65f00cbb5f8b464..acb58d64157a9a852c15675ca65bad9d6a2125e7 100644 (file)
--- a/Botan3/Botan3.SlackBuild
+++ b/Botan3/Botan3.SlackBuild
@@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=Botan3
 VERSION=${VERSION:-3.9.0}
 BUILD=${BUILD:-1}
-TAG=${TAG:-fsleg}
-PKGTYPE=${PKGTYPE:-txz}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -81,14 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "${TPM:-NO}" = "YES" ]; then
-  TPMFLAG="--with-tpm"
-fi
-
-if [ "${TPM2:-NO}" = "YES" ]; then
-  TPM2FLAG="--with-tpm2"
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 python3 configure.py \
@@ -104,9 +96,7 @@ python3 configure.py \
   --with-boost \
   --with-sqlite3 \
   --with-commoncrypto \
-  --program-suffix=3 \
-  $TPMFLAG \
-  $TPM2FLAG
+  --program-suffix=3
 
 make
 make install DESTDIR=$PKG

diff --git a/Botan3/README b/Botan3/README
index 81300cb959d7ec898835dee7900861d9605cc0de..7ec74e11a25b7cf36aa682e57877da42e478489f 100644 (file)
--- a/Botan3/README
+++ b/Botan3/README
@@ -6,10 +6,4 @@ features.
 
 Botan relies on Python3 for its compilation configuration.
 
-To build TPM support, use `TPM=YES`. This option adds a dependency on
-`system/trousers`.
-
-To build TPM2 support, use `TPM2=YES`. This option adds a dependency on
-tpm2-tss (not on SBo).
-
 This package can be safely installed alongside Botan.