Jonas Smedegaard pushed to branch debian/latest at Debian VoIP Packaging Team / asterisk
Commits: b57e50a3 by Jonas Smedegaard at 2025-02-22T08:52:11+01:00 add patch cherry-picked upstream to fix res_config_pgsql regression that removed dbname config; closes: bug#1098486, thanks to Andrey N. Abelev - - - - - d7174cfa by Jonas Smedegaard at 2025-02-22T08:53:42+01:00 declare compliance with Debian Policy 4.7.1 - - - - - 3b59c3b0 by Jonas Smedegaard at 2025-02-22T08:55:20+01:00 update changelog and copyright hints - - - - - 5 changed files: - debian/changelog - debian/control - debian/copyright_hints - + debian/patches/020250211~8f0613f.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +asterisk (1:22.2.0~dfsg+~cs6.15.60671435-2) unstable; urgency=medium + + * add patch cherry-picked upstream + to fix res_config_pgsql regression that removed dbname config; + closes: bug#1098486, thanks to Andrey N. Abelev + * declare compliance with Debian Policy 4.7.1 + + -- Jonas Smedegaard <[email protected]> Sat, 22 Feb 2025 08:54:51 +0100 + asterisk (1:22.2.0~dfsg+~cs6.15.60671435-1) unstable; urgency=medium [ upstream ] ===================================== debian/control ===================================== @@ -76,7 +76,7 @@ Build-Depends: unixodbc-dev, uuid-dev, zlib1g-dev, -Standards-Version: 4.7.0 +Standards-Version: 4.7.1 Homepage: https://www.asterisk.org/ Vcs-Git: https://salsa.debian.org/pkg-voip-team/asterisk.git Vcs-Browser: https://salsa.debian.org/pkg-voip-team/asterisk ===================================== debian/copyright_hints ===================================== @@ -1448,6 +1448,7 @@ Files: BSDmakefile debian/dummyprogs/fetch debian/gbp.conf debian/not-installed + debian/patches/020250211~8f0613f.patch debian/patches/1004_astgenkey-security.patch debian/patches/1006_systemd.patch debian/patches/1007_ffmpeg_detect.patch ===================================== debian/patches/020250211~8f0613f.patch ===================================== @@ -0,0 +1,27 @@ +Description: fix res_config_pgsql regression that removed dbname config + A recent commit accidentally removed the code that sets dbname. + This commit adds it back in. +Author: George Joseph <[email protected]> +Source: upstream, https://github.com/asterisk/asterisk/commits/8f0613f +Bug: https://github.com/asterisk/asterisk/issues/1119 +Bug-Debian: https://bugs.debian.org/1098486 +Last-Update: 2025-02-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/res/res_config_pgsql.c ++++ b/res/res_config_pgsql.c +@@ -1495,6 +1495,14 @@ + ast_copy_string(dbhost, s, sizeof(dbhost)); + } + ++ if (!(s = ast_variable_retrieve(config, "general", "dbname"))) { ++ ast_log(LOG_WARNING, ++ "PostgreSQL RealTime: No database name found, using 'asterisk' as default.\n"); ++ strcpy(dbname, "asterisk"); ++ } else { ++ ast_copy_string(dbname, s, sizeof(dbname)); ++ } ++ + /* Check new 'port' option first, then fall back to legacy 'dbport' */ + s = ast_variable_retrieve(config, "general", "port"); + if (!s) { ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ +020250211~8f0613f.patch 1004_astgenkey-security.patch 1006_systemd.patch 1007_ffmpeg_detect.patch View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/-/compare/3337305f4af4973076528d03ce4889c66ced3d99...3b59c3b0930f136626b69b0ef1eccf27f1988b3e -- View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/-/compare/3337305f4af4973076528d03ce4889c66ced3d99...3b59c3b0930f136626b69b0ef1eccf27f1988b3e You're receiving this email because of your account on salsa.debian.org.
