Aaron M. Ucko pushed to branch master at Debian Med / ncbi-vdb
Commits: a6a4a594 by Aaron M. Ucko at 2024-04-11T17:33:48-04:00 Add debian/patches/system_mbedtls_3.patch. Reinstate test for system mbed TLS, tweaking it to accept (and moreover require) 3.x. - - - - - 5dc35d4a by Aaron M. Ucko at 2024-04-11T17:36:08-04:00 Version libmbedtls-dev B-D to (>= 3) [experimental] Match recent versions' usage. - - - - - 5c48af82 by Aaron M. Ucko at 2024-04-11T17:38:28-04:00 Reenable aptly per the need to target experimental again for now. - - - - - 495b52bf by Aaron M. Ucko at 2024-04-11T17:40:20-04:00 routine-update: Ready to upload to experimental - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/series - + debian/patches/system_mbedtls_3.patch - debian/salsa-ci.yml Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,17 @@ -ncbi-vdb (3.0.9+dfsg-1) UNRELEASED; urgency=medium +ncbi-vdb (3.0.9+dfsg-1) experimental; urgency=medium + [ Andreas Tille ] * New upstream version - TODO: Wait for mbedtls 3.x - see https://lists.debian.org/debian-med/2023/12/msg00029.html - -- Andreas Tille <[email protected]> Sun, 10 Dec 2023 10:49:48 +0100 + [ Aaron M. Ucko ] + * debian/control: Version libmbedtls-dev B-D to (>= 3), so far available + only in experimental, to match recent versions' usage. + * debian/patches/system_mbedtls_3.patch (new): Reinstate test for system + mbed TLS, tweaking it to accept (and moreover require) 3.x. + * debian/salsa-ci.yml: Reenable aptly per the need to target + experimental again for now. + + -- Aaron M. Ucko <[email protected]> Thu, 11 Apr 2024 17:40:20 -0400 ncbi-vdb (3.0.2+dfsg-2) unstable; urgency=medium ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends-Arch: cmake, libbz2-dev, libxml2-dev, libmagic-dev, - libmbedtls-dev, + libmbedtls-dev (>= 3), zlib1g-dev, libzstd-dev, flex, ===================================== debian/patches/series ===================================== @@ -6,3 +6,4 @@ soversion.patch libsam-extract_shared.patch detect_BITS.patch fix_x32.patch +system_mbedtls_3.patch ===================================== debian/patches/system_mbedtls_3.patch ===================================== @@ -0,0 +1,23 @@ +Index: b/build/common.cmake +=================================================================== +--- a/build/common.cmake ++++ b/build/common.cmake +@@ -225,8 +225,7 @@ function( AddExecutableTest test_name so + endfunction() + + include(CheckIncludeFileCXX) +-#check_include_file_cxx(mbedtls/md.h HAVE_MBEDTLS_H) +-set(HAVE_MBEDTLS_H 0) # TODO: disabling system mbedtls since it may be outdated ++check_include_file_cxx(mbedtls/md.h HAVE_MBEDTLS_H) + set( MBEDTLS_LIBS mbedx509 mbedtls mbedcrypto ) # need to link against mbedtls in any case: system or local mbedtls + set(CMAKE_REQUIRED_LIBRARIES ${MBEDTLS_LIBS}) + if ( HAVE_MBEDTLS_H ) +@@ -239,7 +238,7 @@ int main(int argc, char *argv[]) { + mbedtls_md_context_t ctx; + mbedtls_md_type_t md_type = MBEDTLS_MD_SHA256; + mbedtls_md_init(&ctx); +- printf(\"test p: %p\", ctx.md_ctx); ++ printf(\"test p: %p\", mbedtls_md_info_from_ctx(&ctx)); + } + " HAVE_MBEDTLS_F) + else() ===================================== debian/salsa-ci.yml ===================================== @@ -2,3 +2,5 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + SALSA_CI_DISABLE_APTLY: 0 View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/4322984b6e9a886b7cfffc3513c0ed300da2f4f9...495b52bfc25edf7250906cdc3bac5576c66c7f6d -- View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/4322984b6e9a886b7cfffc3513c0ed300da2f4f9...495b52bfc25edf7250906cdc3bac5576c66c7f6d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
