Andreas Tille pushed to branch master at Debian Med / htslib
Commits: 84fcfcfd by Andreas Tille at 2020-10-02T11:33:59+02:00 Fix plugin code - - - - - 88644ba8 by Andreas Tille at 2020-10-02T11:35:55+02:00 Enable plugins - - - - - 4 changed files: - debian/changelog - + debian/patches/273c5e76a1694aa2a13fd51c133abed2ef8ab4d3.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +htslib (1.11-2) UNRELEASED; urgency=medium + + * Enable plugins + Closes: #971542 + + -- Andreas Tille <[email protected]> Fri, 02 Oct 2020 11:35:21 +0200 + htslib (1.11-1) unstable; urgency=medium * New upstream version ===================================== debian/patches/273c5e76a1694aa2a13fd51c133abed2ef8ab4d3.patch ===================================== @@ -0,0 +1,22 @@ +From 273c5e76a1694aa2a13fd51c133abed2ef8ab4d3 Mon Sep 17 00:00:00 2001 +From: Andrew Whitwham <[email protected]> +Date: Wed, 30 Sep 2020 09:37:45 +0100 +Subject: [PATCH] Variable name used in dlsym corrected. +Bug-Debian: https://bugs.debian.org/971542 + +The hfile irods plugin depends on a constructed symbol name which was no longer being used. +--- + plugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/plugin.c ++++ b/plugin.c +@@ -153,7 +153,7 @@ plugin_void_func *load_plugin(void **plu + const char *basename = slash? slash+1 : filename; + kputsn(basename, strcspn(basename, ".-+"), &symbolg); + +- *(void **) &sym = dlsym(lib, symbol); ++ *(void **) &sym = dlsym(lib, symbolg.s); + free(symbolg.s); + if (sym == NULL) goto error; + } ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ testShebang.patch fix_float_precision # big-endian cram_to_bam_export.patch +273c5e76a1694aa2a13fd51c133abed2ef8ab4d3.patch ===================================== debian/rules ===================================== @@ -26,7 +26,7 @@ endif cp -a test test_backup # to help with cross building, otherwise MMAP might get turned off export ac_cv_func_mmap_fixed_mapped=yes && autoconf && \ - dh_auto_configure -- --enable-libcurl --enable-gcs --enable-s3 + dh_auto_configure -- --enable-libcurl --enable-gcs --enable-s3 --enable-plugins --with-plugin-path='/usr/local/lib/htslib:$(plugindir)' override_dh_auto_build-arch: dh_auto_build -- \ View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/a587563772cd52381796f8ded644d4142282ebf7...88644ba8e4096302d996dae2a0399195e2e53819 -- View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/a587563772cd52381796f8ded644d4142282ebf7...88644ba8e4096302d996dae2a0399195e2e53819 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
