Étienne Mollier pushed to branch master at Debian Med / qrisk2
Commits: 2738a7d2 by Étienne Mollier at 2024-05-22T09:54:11+02:00 glibc-2.38.patch: new: fix ftbfs with glibc 2.38. Closes: #1071339 - - - - - 5f519cfd by Étienne Mollier at 2024-05-22T07:55:57+00:00 Update lintian override info format in d/qrisk2.lintian-overrides on line 2. Changes-By: lintian-brush Fixes: lintian: mismatched-override See-also: https://lintian.debian.org/tags/mismatched-override.html - - - - - 17a33bf8 by Étienne Mollier at 2024-05-22T07:55:57+00:00 Use secure URI in Homepage field. Changes-By: lintian-brush Fixes: lintian: homepage-field-uses-insecure-uri See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html - - - - - 89353545 by Étienne Mollier at 2024-05-22T09:57:30+02:00 Update standards version to 4.7.0, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html - - - - - f1300993 by Étienne Mollier at 2024-05-22T10:01:01+02:00 ready to upload to unstable. - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/glibc-2.38.patch - debian/patches/series - debian/qrisk2.lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +qrisk2 (0.1.20150729-6) unstable; urgency=medium + + * Team upload. + * glibc-2.38.patch: new: fix ftbfs with glibc 2.38. (Closes: #1071339) + * Update lintian override format in d/qrisk2.lintian-overrides on line 2. + * Use secure URI in Homepage field. + * Update standards version to 4.7.0, no changes needed. + + -- Étienne Mollier <emoll...@debian.org> Wed, 22 May 2024 09:57:37 +0200 + qrisk2 (0.1.20150729-5) unstable; urgency=medium * Team Upload. ===================================== debian/control ===================================== @@ -6,10 +6,10 @@ Section: science Priority: optional Build-Depends: debhelper-compat (= 13), xutils-dev -Standards-Version: 4.5.0 +Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/med-team/qrisk2 Vcs-Git: https://salsa.debian.org/med-team/qrisk2.git -Homepage: http://qrisk.org/ +Homepage: https://qrisk.org/ Rules-Requires-Root: no Package: qrisk2 ===================================== debian/patches/glibc-2.38.patch ===================================== @@ -0,0 +1,39 @@ +Description: port to glibc 2.38. + The code includes a definition of strlcat that has been introduced in glibc + version 2.38. This definition is clashing with the glibc. This change + plainly erases the definition from upstream source code. + . + The change would be improved by better detection of the libc level in use. + Upstream moved on to qrisk3 which has a different implementation (possibly + non-free as far as I could see), hence no forwarding needed, possible, or even + suitable. + +Author: Étienne Mollier <emoll...@debian.org> +Bug-Debian: https://bugs.debian.org/1071339 +Forwarded: not-needed +Last-Update: 2024-05-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- qrisk2.orig/include/clinrisk/utils.h ++++ qrisk2/include/clinrisk/utils.h +@@ -38,6 +38,3 @@ + int is_boolean(int b) ; + int d_in_range(double x, double min, double max) ; + int i_in_range(int x, int min, int max) ; +-#ifndef __APPLE__ +-void strlcat(char *dst, char *src, int n) ; +-#endif +--- qrisk2.orig/c/utils.c ++++ qrisk2/c/utils.c +@@ -53,11 +53,3 @@ + int i_in_range(int x, int min, int max) { + return !(x<min || x>max); + } +- +-#ifndef __APPLE__ +-void strlcat(char *dst, char *src, int n) { +- if (strlen(src) + 1 > n - strlen(dst)) +- strcpy(dst, "errorBuf has been truncated"); +- (void)strncat(dst, src, n - strlen(dst) - 1); +-} +-#endif ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ hardening-flags.patch build_on_non-linux_systems.patch multiarch-libc.patch +glibc-2.38.patch ===================================== debian/qrisk2.lintian-overrides ===================================== @@ -1,3 +1,3 @@ # these flags are really used -qrisk2: hardening-no-fortify-functions usr/bin/Q*_commandLine +qrisk2: hardening-no-fortify-functions [usr/bin/Q*_commandLine] View it on GitLab: https://salsa.debian.org/med-team/qrisk2/-/compare/8dd8362615ac2761d0375e1dbf38d16457d287a1...f1300993b94399be2d10b3787e4e649865755131 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/med-team/qrisk2/-/compare/8dd8362615ac2761d0375e1dbf38d16457d287a1...f1300993b94399be2d10b3787e4e649865755131 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
