diff -Nru libaunit-23.0.0/debian/changelog libaunit-24.0.0/debian/changelog --- libaunit-23.0.0/debian/changelog 2023-05-10 20:30:19.000000000 +0000 +++ libaunit-24.0.0/debian/changelog 2024-03-31 01:40:05.000000000 +0000 @@ -1,3 +1,28 @@ +libaunit (24.0.0-2build1) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 01:40:05 +0000 + +libaunit (24.0.0-2) unstable; urgency=medium + + * Reupload to unstable for the gnat-13/time_t64 transition. + + -- Nicolas Boulenguez Sun, 17 Mar 2024 18:25:45 +0100 + +libaunit (24.0.0-1) experimental; urgency=medium + + * New upstream release, requiring python3-sphinx-rtd-theme. + * Upload to experimental because of the following transitions. + * Build with gnat-13. Rename library package with new SOversion. + * Build with dh-ada-library/9. Remove version from -dev package name. + Provide a name containing a hash. + Build-Depend: gnat instead of gnat-13. Break/Replace previous -devs. + * Improve readability of debian/rules. + * Simplify adapt_projects.diff. + + -- Nicolas Boulenguez Thu, 21 Dec 2023 00:02:30 +0000 + libaunit (23.0.0-3) unstable; urgency=medium * Break/Replace libaunit*-dev since oldstable. Closes: #1034934. diff -Nru libaunit-23.0.0/debian/clean libaunit-24.0.0/debian/clean --- libaunit-23.0.0/debian/clean 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/clean 2024-03-17 17:24:42.000000000 +0000 @@ -1,2 +1,3 @@ # See debian/rules: +doc/build/ doc/share/sphinx.sty diff -Nru libaunit-23.0.0/debian/control libaunit-24.0.0/debian/control --- libaunit-23.0.0/debian/control 2023-05-10 20:30:19.000000000 +0000 +++ libaunit-24.0.0/debian/control 2024-03-31 01:40:05.000000000 +0000 @@ -1,13 +1,14 @@ Source: libaunit Section: libdevel Priority: optional -Maintainer: Nicolas Boulenguez +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Nicolas Boulenguez Build-Depends: debhelper-compat (= 13), Build-Depends-Arch: - dh-ada-library (>= 8.1), + dh-ada-library (>= 9.1), dh-sequence-ada-library, - gnat-12, + gnat (>= 13.1), gprbuild, Build-Depends-Indep: dh-sequence-sphinxdoc, @@ -15,6 +16,7 @@ latexmk, # fixing #869098: python3-sphinx (>= 1.6.3-2), + python3-sphinx-rtd-theme, # To deduplicate examples in rules. rdfind, symlinks, @@ -31,9 +33,12 @@ Vcs-Browser: https://salsa.debian.org/debian/libaunit Vcs-Git: https://salsa.debian.org/debian/libaunit.git -Package: libaunit22-dev -Breaks: libaunit18-dev, libaunit19-dev, libaunit20-dev, libaunit21-dev -Replaces: libaunit18-dev, libaunit19-dev, libaunit20-dev, libaunit21-dev +Package: libaunit-dev +Breaks: libaunit18-dev, libaunit19-dev, libaunit20-dev, libaunit21-dev, + libaunit22-dev +Replaces: libaunit18-dev, libaunit19-dev, libaunit20-dev, libaunit21-dev, + libaunit22-dev +Provides: ${ada:Provides} Architecture: any Depends: ${misc:Depends}, ${ada:Depends} Suggests: libaunit-doc @@ -49,7 +54,7 @@ . Install this package if you want to write programs that use AUnit. -Package: libaunit21 +Package: libaunit22 Section: libs Architecture: any Multi-Arch: same @@ -74,8 +79,8 @@ Built-Using: ${sphinxdoc:Built-Using} Suggests: gnat # Examples were in the -dev package when there was no -doc package. -Replaces: libaunit18-dev, libaunit-dev, libaunit20-dev (<< 21.0.0.fa386849-1) -Breaks: libaunit18-dev, libaunit-dev, libaunit20-dev (<< 21.0.0.fa386849-1) +Replaces: libaunit18-dev, libaunit20-dev (<< 21.0.0.fa386849-1) +Breaks: libaunit18-dev, libaunit20-dev (<< 21.0.0.fa386849-1) Description: AUnit, a unit testing framework for Ada: documentation AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It's intended as a developer's tool to facilitate diff -Nru libaunit-23.0.0/debian/copyright libaunit-24.0.0/debian/copyright --- libaunit-23.0.0/debian/copyright 2023-05-10 20:30:19.000000000 +0000 +++ libaunit-24.0.0/debian/copyright 2024-03-17 17:25:42.000000000 +0000 @@ -3,9 +3,9 @@ Source: https://github.com/AdaCore/aunit Files: * -Copyright: 2006-2022 AdaCore +Copyright: 2006-2023 AdaCore 2004-2008 Free Software Foundation - 2013-2023 Nicolas Boulenguez + 2013-2024 Nicolas Boulenguez 2006-2012 Stephen Leake 2004-2006 Ludovic Brenta License: GPL-3+ with GCC-runtime-library exception diff -Nru libaunit-23.0.0/debian/libaunit-doc.doc-base.aunit-cookbook libaunit-24.0.0/debian/libaunit-doc.doc-base.aunit-cookbook --- libaunit-23.0.0/debian/libaunit-doc.doc-base.aunit-cookbook 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/libaunit-doc.doc-base.aunit-cookbook 2024-03-17 17:24:42.000000000 +0000 @@ -8,11 +8,11 @@ Section: Programming Format: HTML -Index: /usr/share/doc/libaunit-doc/html/aunit_cb.html -Files: /usr/share/doc/libaunit-doc/html +Index: /usr/share/doc/libaunit-dev/html/aunit_cb.html +Files: /usr/share/doc/libaunit-dev/html Format: text -Files: /usr/share/doc/libaunit-doc/aunit_cb.txt.gz +Files: /usr/share/doc/libaunit-dev/aunit_cb.txt.gz Format: pdf -Files: /usr/share/doc/libaunit-doc/aunit_cb.pdf.gz +Files: /usr/share/doc/libaunit-dev/aunit_cb.pdf.gz diff -Nru libaunit-23.0.0/debian/patches/adapt_projects.diff libaunit-24.0.0/debian/patches/adapt_projects.diff --- libaunit-23.0.0/debian/patches/adapt_projects.diff 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/patches/adapt_projects.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Description: let projects allow build flags and dynamic linking. - Allow the user to set ADAFLAGS (and LDFLAGS for dynamic links). - . - Stop testing if LIBDIR and OBJDIR exist. - The Makefile does not set them. - . - If SOVERSION is not empty, build a shared library. - This should not affect the default behaviour, - since the Makefile does not set this variable. - . - Use different object and library directories for shared and static - builds, so the patch modifies the directory names. - As far as I know, in normal usage, these directories are only used - internally by gprbuild/install/clean. -Author: Nicolas Boulenguez -Forwarded: https://github.com/AdaCore/aunit/pull/4 - ---- a/lib/gnat/aunit.gpr -+++ b/lib/gnat/aunit.gpr -@@ -15,14 +15,27 @@ - "../../include/aunit/framework/" & AUnit_Shared.Memory, - "../../include/aunit/framework/" & AUnit_Shared.FileIO); - -- for Library_Dir use AUnit_Shared.Library_Dir; -- -- Obj_Dir := external ("AUNIT_OBJDIR", "../aunit-obj/" -- & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime); -- for Object_Dir use Obj_Dir; -+ for Library_Dir use "../aunit/" -+ & Aunit_Shared.Target & "-" -+ & Aunit_Shared.Runtime & "-" -+ & Aunit_Shared.Library_Kind; -+ -+ for Object_Dir use "../aunit-obj/" -+ & AUnit_Shared.Target & "-" -+ & AUnit_Shared.Runtime & "-" -+ & Aunit_Shared.Library_Kind; - - for Library_Name use "aunit"; -- for Library_Kind use "static"; -+ for Library_Kind use AUnit_Shared.Library_Kind; -+ case AUnit_Shared.Library_Kind is -+ when "dynamic" => -+ for Library_Version use "lib" & Project'Library_Name & ".so." -+ & Aunit_Shared.Soversion; -+ -- Put options like --as-needed before the libraries. -+ for Leading_Library_Options use Aunit_Shared.Ldflags; -+ when "static" => -+ null; -+ end case; - - -------------- - -- Compiler -- -@@ -39,6 +52,9 @@ - for Default_Switches ("ada") use - ("-O2", "-gnatp", "-gnatn", "-gnatwa.X"); - end case; -+ -- Allow user flags to override default flags. -+ for Default_Switches ("ada") use Compiler'Default_Switches ("ada") -+ & Aunit_Shared.Adaflags; - - for Switches ("aunit.adb") use - Compiler'Default_Switches ("ada") & ("-fno-strict-aliasing"); ---- a/lib/gnat/aunit_shared.gpr -+++ b/lib/gnat/aunit_shared.gpr -@@ -14,7 +14,20 @@ - - Runtime : Runtime_Type := external ("AUNIT_RUNTIME", "full"); - -- Library_Dir := external ("AUNIT_LIBDIR", "../aunit/" & Target & "-" & Runtime); -+ -- The default is empty, and requires a static build. -+ -- A non-empty soversion requires a shared library. -+ Soversion := External ("SOVERSION", ""); -+ type A_Library_Kind is ("dynamic", "static"); -+ Library_Kind : A_Library_Kind := "static"; -+ case Soversion is -+ when "" => -+ null; -+ when others => -+ Library_Kind := "dynamic"; -+ end case; -+ -+ Adaflags := External_As_List ("ADAFLAGS", " "); -+ Ldflags := External_As_List ("LDFLAGS", " "); - - for Source_Dirs use (); - diff -Nru libaunit-23.0.0/debian/patches/build-flags.diff libaunit-24.0.0/debian/patches/build-flags.diff --- libaunit-23.0.0/debian/patches/build-flags.diff 1970-01-01 00:00:00.000000000 +0000 +++ libaunit-24.0.0/debian/patches/build-flags.diff 2024-03-17 17:24:42.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Allow the user to set build flags +Forwarded: https://github.com/AdaCore/aunit/pull/4 +Author: Nicolas Boulenguez + +--- a/lib/gnat/aunit.gpr ++++ b/lib/gnat/aunit.gpr +@@ -27,6 +27,13 @@ + for Library_Version use + external ("AUNIT_LIBRARY_VERSION", "libaunit.so.0.0"); + ++ case AUnit_Shared.Library_Kind is ++ when "dynamic" | "relocatable" => ++ -- Put options like --as-needed before the libraries. ++ for Leading_Library_Options use external_As_List ("LDFLAGS", " "); ++ when others => ++ end case; ++ + -------------- + -- Compiler -- + -------------- +@@ -43,6 +50,10 @@ + ("-O2", "-gnatp", "-gnatn", "-gnatwa.X"); + end case; + ++ -- Allow user flags to override default flags. ++ for Default_Switches ("ada") use ++ Compiler'Default_Switches ("ada") & external_As_List ("ADAFLAGS", " "); ++ + for Switches ("aunit.adb") use + Compiler'Default_Switches ("ada") & ("-fno-strict-aliasing"); + end Compiler; diff -Nru libaunit-23.0.0/debian/patches/series libaunit-24.0.0/debian/patches/series --- libaunit-23.0.0/debian/patches/series 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/patches/series 2024-03-17 17:24:42.000000000 +0000 @@ -1,3 +1,4 @@ gprinstall-no-artifacts.diff -adapt_projects.diff +shared-library.diff +build-flags.diff doc-conf-sphinx4.diff diff -Nru libaunit-23.0.0/debian/patches/shared-library.diff libaunit-24.0.0/debian/patches/shared-library.diff --- libaunit-23.0.0/debian/patches/shared-library.diff 1970-01-01 00:00:00.000000000 +0000 +++ libaunit-24.0.0/debian/patches/shared-library.diff 2024-03-17 17:24:42.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Allow the user to set build flags +Forwarded: https://github.com/AdaCore/aunit/pull/4 +Author: Nicolas Boulenguez + +--- a/lib/gnat/aunit.gpr ++++ b/lib/gnat/aunit.gpr +@@ -18,11 +18,14 @@ + for Library_Dir use AUnit_Shared.Library_Dir; + + Obj_Dir := external ("AUNIT_OBJDIR", "../aunit-obj/" +- & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime); ++ & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime ++ & "-" & AUnit_Shared.Library_Kind); + for Object_Dir use Obj_Dir; + + for Library_Name use "aunit"; +- for Library_Kind use "static"; ++ for Library_Kind use AUnit_Shared.Library_Kind; ++ for Library_Version use ++ external ("AUNIT_LIBRARY_VERSION", "libaunit.so.0.0"); + + -------------- + -- Compiler -- +--- a/lib/gnat/aunit_shared.gpr ++++ b/lib/gnat/aunit_shared.gpr +@@ -14,7 +14,9 @@ + + Runtime : Runtime_Type := external ("AUNIT_RUNTIME", "full"); + +- Library_Dir := external ("AUNIT_LIBDIR", "../aunit/" & Target & "-" & Runtime); ++ Library_Kind := external ("AUNIT_LIBRARY_KIND", "static"); ++ Library_Dir := external ("AUNIT_LIBDIR", "../aunit/" & Target & "-" & Runtime ++ & "-" & Library_Kind); + + for Source_Dirs use (); + diff -Nru libaunit-23.0.0/debian/rules libaunit-24.0.0/debian/rules --- libaunit-23.0.0/debian/rules 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/rules 2024-03-17 17:24:42.000000000 +0000 @@ -18,20 +18,22 @@ ###################################################################### # clean target is OK. +project := -Plib/gnat/aunit.gpr +static := -XAUNIT_LIBRARY_KIND=static +shared := -XAUNIT_LIBRARY_KIND=relocatable \ + -XAUNIT_LIBRARY_VERSION=libaunit.so.$(aunit_SO_VERSION) + override_dh_auto_build-arch: -# static library - gprbuild lib/gnat/aunit.gpr $(GPRBUILDFLAGS) -XSOVERSION= -# shared library - gprbuild lib/gnat/aunit.gpr $(GPRBUILDFLAGS) \ - -XSOVERSION=$(aunit_SO_VERSION) + gprbuild $(project) $(static) $(GPRBUILDFLAGS) + gprbuild $(project) $(shared) $(GPRBUILDFLAGS) override_dh_auto_install-arch: - gprinstall lib/gnat/aunit.gpr $(static_GPRINSTALLFLAGS) -XSOVERSION= - gprinstall lib/gnat/aunit.gpr $(call shared_GPRINSTALLFLAGS,aunit) \ - -XSOVERSION=$(aunit_SO_VERSION) + gprinstall $(project) $(static) $(static_GPRINSTALLFLAGS) + gprinstall $(project) $(shared) $(call shared_GPRINSTALLFLAGS,aunit) + ###################################################################### INSTALLED_EXAMPLES := \ - debian/libaunit-doc/usr/share/doc/libaunit-doc/examples/*/ + debian/libaunit-doc/usr/share/doc/libaunit-dev/examples/*/ .PHONY: execute_after_dh_installexamples-indep execute_after_dh_installexamples-indep: diff -Nru libaunit-23.0.0/debian/tests/control libaunit-24.0.0/debian/tests/control --- libaunit-23.0.0/debian/tests/control 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/tests/control 2024-03-17 17:24:42.000000000 +0000 @@ -1,2 +1,5 @@ -Tests: link-with-shared examples -Depends: @, gprbuild +Tests: examples +Depends: gprbuild, libaunit-dev, libaunit-doc + +Tests: link-with-shared +Depends: gprbuild, libaunit-dev diff -Nru libaunit-23.0.0/debian/tests/examples libaunit-24.0.0/debian/tests/examples --- libaunit-23.0.0/debian/tests/examples 2023-05-10 20:29:23.000000000 +0000 +++ libaunit-24.0.0/debian/tests/examples 2024-03-17 17:24:42.000000000 +0000 @@ -3,7 +3,7 @@ cd "$AUTOPKGTEST_TMP" # Better copy all examples, as some files are symlinked. -cp -r /usr/share/doc/libaunit-doc/examples/* . +cp -r /usr/share/doc/libaunit-dev/examples/* . ###################################################################### cat > st < Except := "certexception"; - Calend := "nocalendar"; + Calend := "calendar"; Memory := "staticmemory"; FileIO := "nofileio"; when "cert" => - Except := "zfpexception"; - Calend := "nocalendar"; + Except := "certexception"; + Calend := "calendar"; Memory := "staticmemory"; FileIO := "nofileio"; when others =>