[arch-commits] Commit in mbedtls/repos (3 files)

[Antonio Rojas]

    Date: Sunday, July 4, 2021 @ 17:30:56
  Author: arojas
Revision: 972165

archrelease: copy trunk to community-testing-x86_64

Added:
  mbedtls/repos/community-testing-x86_64/
  mbedtls/repos/community-testing-x86_64/PKGBUILD
    (from rev 972164, mbedtls/trunk/PKGBUILD)
Modified:
  mbedtls/repos/community-x86_64/PKGBUILD

-----------------------------------+
 community-testing-x86_64/PKGBUILD |   62 ++++++++++++++++++++++++++++++++++++
 community-x86_64/PKGBUILD         |   11 +++---
 2 files changed, 68 insertions(+), 5 deletions(-)

Copied: mbedtls/repos/community-testing-x86_64/PKGBUILD (from rev 972164, mbedtls/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2021-07-04 17:30:56 UTC (rev 972165)
@@ -0,0 +1,62 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Mihai Militaru <mihai militaru at xmpp dot ro>
+# Contributor: carstene1ns <arch carsten-teibes.de>
+
+pkgname=mbedtls
+pkgver=2.26.0
+pkgrel=1
+pkgdesc="Portable cryptographic and SSL/TLS library, aka polarssl"
+arch=('x86_64')
+url="https://tls.mbed.org"
+license=('Apache')
+depends=('glibc' 'sh')
+checkdepends=('python')
+makedepends=('cmake')
+provides=('polarssl' 'libmbedcrypto.so' 'libmbedtls.so' 'libmbedx509.so')
+replaces=('polarssl')
+conflicts=('polarssl')
+options=('staticlibs')
+source=(https://github.com/ARMmbed/mbedtls/archive/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('35d8d87509cd0d002bddbd5508b9d2b931c5e83747d087234cc7ad551d53fe05')
+b2sums=('549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad')
+
+prepare() {
+  cd "$pkgname-$pkgname-$pkgver"
+  # enable flags for non-embedded systems
+  sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
+  sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
+}
+
+build() {
+  cd "$pkgname-$pkgname-$pkgver"
+  cmake \
+    -B build \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMBEDTLS_FATAL_WARNINGS=OFF \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
+	-DCMAKE_INSTALL_RPATH=
+  make -C build
+}
+
+check() {
+  cd "$pkgname-$pkgname-$pkgver"
+  make -C build test
+  # make check?
+}
+
+package() {
+  cd "$pkgname-$pkgname-$pkgver"
+  make -C build DESTDIR="$pkgdir" install
+
+  # rename generic utils
+  local _prog _baseprog
+  for _prog in "$pkgdir"/usr/bin/*; do
+	_baseprog=$(basename "$_prog")
+    mv -v "$_prog" "${_prog//$_baseprog/mbedtls_$_baseprog}"
+  done
+
+  # fixup static lib permissions
+  chmod 644 "$pkgdir"/usr/lib/*.a
+}

Modified: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2021-07-04 17:30:43 UTC (rev 972164)
+++ community-x86_64/PKGBUILD	2021-07-04 17:30:56 UTC (rev 972165)
@@ -27,11 +27,11 @@
   sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
 
   # broken in 2.25.0
-  sed -i 's/thread_id, -ret/thread_id, (unsigned int)(-ret)/' programs/ssl/ssl_pthread_server.c
-  sed -i 's/thread_id, ret/thread_id, (unsigned int)ret/' programs/ssl/ssl_pthread_server.c
-  sed -i 's/ -ret );/ (unsigned int)(-ret) );/' programs/ssl/ssl_pthread_server.c
-  sed -i 's/ -ret, error_buf/ (unsigned int)(-ret), error_buf/' programs/ssl/ssl_pthread_server.c
-  sed -i 's/04x\\n", ret /04x\\n", (unsigned int)ret /' programs/ssl/ssl_pthread_server.c
+#  sed -i 's/thread_id, -ret/thread_id, (unsigned int)(-ret)/' programs/ssl/ssl_pthread_server.c
+#  sed -i 's/thread_id, ret/thread_id, (unsigned int)ret/' programs/ssl/ssl_pthread_server.c
+#  sed -i 's/ -ret );/ (unsigned int)(-ret) );/' programs/ssl/ssl_pthread_server.c
+#  sed -i 's/ -ret, error_buf/ (unsigned int)(-ret), error_buf/' programs/ssl/ssl_pthread_server.c
+#  sed -i 's/04x\\n", ret /04x\\n", (unsigned int)ret /' programs/ssl/ssl_pthread_server.c
 }
 
 build() {
@@ -40,6 +40,7 @@
     -B build \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMBEDTLS_FATAL_WARNINGS=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
 	-DCMAKE_INSTALL_RPATH=