From d91947f587e8d0dd8245857d81f0ffb7935d3af6 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Tue, 25 Jul 2023 20:47:11 +0300 Subject: [PATCH] [Build-System] Add Debian 12 Bookworm support --- configure.ac | 2 +- debian/bootstrap.sh | 7 +++++-- debian/control-modules | 5 +++++ debian/util.sh | 2 ++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c6f24f9252..c0d792d51e 100644 --- a/configure.ac +++ b/configure.ac @@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS) AC_SUBST(SYS_XMLRPC_LDFLAGS) AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"]) -for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do +for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no]) if test ${have_lua} = yes; then break diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index c207036757..a2f0261ab6 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -29,7 +29,7 @@ conf_dir="../conf" lang_dir="../conf/vanilla/lang" fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media." mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="." -supported_debian_distros="wheezy jessie stretch buster bullseye sid" +supported_debian_distros="wheezy jessie stretch buster bullseye bookworm sid" supported_ubuntu_distros="trusty utopic xenial" supported_distros="$supported_debian_distros $supported_ubuntu_distros" avoid_mods=( @@ -71,6 +71,9 @@ avoid_mods_sid=( avoid_mods_jessie=( directories/mod_ldap ) +avoid_mods_bookworm=( + languages/mod_python +) avoid_mods_wheezy=( event_handlers/mod_amqp languages/mod_java @@ -325,7 +328,7 @@ Build-Depends: # configure options libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev, libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev, - python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5), + python-dev | python-dev-is-python2 | python-dev-is-python3, python3-dev, python-all-dev | python3-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5), # documentation doxygen, # for APR (not essential for build) diff --git a/debian/control-modules b/debian/control-modules index a578ad3ff3..3179f8eeef 100644 --- a/debian/control-modules +++ b/debian/control-modules @@ -12,6 +12,7 @@ Module: applications/mod_av Description: mod_av Adds mod_av. Build-Depends: libavformat-dev, libswscale-dev, libavresample-dev +Build-Depends-Bookworm: libavformat-dev, libswscale-dev, libswresample-dev Module: applications/mod_avmd Description: Advanced voicemail detection @@ -485,6 +486,7 @@ Description: Adds mod_verto. Build-Depends: libperl-dev Build-Depends-Buster: libperl-dev, libgdbm-compat-dev Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev +Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev ## mod/event_handlers @@ -647,6 +649,7 @@ Module: languages/mod_lua Description: mod_lua Adds mod_lua. Build-Depends: liblua5.2-dev | liblua5.1-dev +Build-Depends-Bookworm: liblua5.3-dev | liblua5.2-dev | liblua5.1-dev Module: languages/mod_managed Description: mod_managed @@ -659,6 +662,7 @@ Description: mod_perl Build-Depends: libperl-dev Build-Depends-Buster: libperl-dev, libgdbm-compat-dev Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev +Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev Module: languages/mod_python Description: mod_python @@ -669,6 +673,7 @@ Module: languages/mod_python3 Description: mod_python3 Adds mod_python3. Build-Depends: python3-dev +Build-Depends-Bookworm: python3-dev, python3-setuptools Module: languages/mod_v8 Description: mod_v8 diff --git a/debian/util.sh b/debian/util.sh index 6a5d8f27da..110e6d8763 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -46,6 +46,7 @@ find_distro () { case "$1" in experimental) echo "sid";; unstable) echo "sid";; + experimental) echo "bookworm";; testing) echo "bullseye";; stable) echo "buster";; oldstable) echo "stretch";; @@ -56,6 +57,7 @@ find_distro () { find_suite () { case "$1" in sid) echo "unstable";; + bookworm) echo "experimental";; bullseye) echo "testing";; buster) echo "stable";; stretch) echo "oldstable";;