From d96b0b0ddc6ef8e28b7b263b1a094485c79aa1c8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 30 May 2023 13:14:58 +0200 Subject: [PATCH] build: Remove obsolete references to libgdbm This library is licensed under the GPL, and was previously used by APR, but due to the license it is not used anymore. Remove the last reference traces of this library to avoid confusion when performing license audits. --- build/Makefile.centos6 | 2 +- debian/bootstrap.sh | 2 +- debian/control-modules | 12 ++++++------ docker/examples/Debian11/Dockerfile | 2 +- scripts/FreeSWITCH-debian-raspbian-installer.sh | 2 +- scripts/debian_min_build.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/Makefile.centos6 b/build/Makefile.centos6 index 327c2e6454..0784515b88 100644 --- a/build/Makefile.centos6 +++ b/build/Makefile.centos6 @@ -7,7 +7,7 @@ # # RPMS=git gcc-c++ autoconf automake libtool wget python ncurses-devel zlib-devel libjpeg-devel openssl-devel e2fsprogs-devel sqlite-devel libcurl-devel pcre-devel speex-devel ldns-devel libedit-devel -DEBS=git build-essential automake autoconf 'libtool-bin|libtool' wget python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev pkg-config +DEBS=git build-essential automake autoconf 'libtool-bin|libtool' wget python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libspeexdsp-dev libsqlite3-dev perl libdb-dev bison libvlc-dev pkg-config freeswitch: deps has-git freeswitch.git/Makefile cd freeswitch.git && make diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index aba9e38bf7..fda51a722d 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -332,7 +332,7 @@ Build-Depends: # documentation doxygen, # for APR (not essential for build) - uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev, + uuid-dev, libexpat1-dev, libdb-dev, # used by many modules libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.17), diff --git a/debian/control-modules b/debian/control-modules index 0f0784d3f5..ee81dded38 100644 --- a/debian/control-modules +++ b/debian/control-modules @@ -484,9 +484,9 @@ Module: endpoints/mod_verto Description: Adds mod_verto. 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 +Build-Depends-Buster: libperl-dev +Build-Depends-Bullseye: libperl-dev +Build-Depends-Bookworm: libperl-dev ## mod/event_handlers @@ -654,9 +654,9 @@ Module: languages/mod_perl Description: mod_perl Adds 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 +Build-Depends-Buster: libperl-dev +Build-Depends-Bullseye: libperl-dev +Build-Depends-Bookworm: libperl-dev Module: languages/mod_python Description: mod_python diff --git a/docker/examples/Debian11/Dockerfile b/docker/examples/Debian11/Dockerfile index 10d9302be1..28d71579aa 100644 --- a/docker/examples/Debian11/Dockerfile +++ b/docker/examples/Debian11/Dockerfile @@ -13,7 +13,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -yq install \ # build build-essential cmake automake autoconf 'libtool-bin|libtool' pkg-config \ # general - libssl-dev zlib1g-dev libdb-dev unixodbc-dev libncurses5-dev libexpat1-dev libgdbm-dev bison erlang-dev libtpl-dev libtiff5-dev uuid-dev \ + libssl-dev zlib1g-dev libdb-dev unixodbc-dev libncurses5-dev libexpat1-dev bison erlang-dev libtpl-dev libtiff5-dev uuid-dev \ # core libpcre3-dev libedit-dev libsqlite3-dev libcurl4-openssl-dev nasm \ # core codecs diff --git a/scripts/FreeSWITCH-debian-raspbian-installer.sh b/scripts/FreeSWITCH-debian-raspbian-installer.sh index e40983783b..6b784cc10e 100755 --- a/scripts/FreeSWITCH-debian-raspbian-installer.sh +++ b/scripts/FreeSWITCH-debian-raspbian-installer.sh @@ -248,7 +248,7 @@ freeswitch_debian_source() { freeswitch_raspbian_source() { apt-get install -o Dpkg::Progress=1 -y autoconf automake devscripts gawk libjpeg-dev libncurses5-dev libtool-bin python-dev \ - libtiff5-dev libperl-dev libgdbm-dev libdb-dev gettext libssl-dev libcurl4-openssl-dev libpcre3-dev libspeex-dev \ + libtiff5-dev libperl-dev libdb-dev gettext libssl-dev libcurl4-openssl-dev libpcre3-dev libspeex-dev \ libspeexdsp-dev libsqlite3-dev libedit-dev libldns-dev libpq-dev libsndfile-dev libopus-dev liblua5.1-0-dev 2>&1 | \ awk -W interactive '/Progress/ { print }'| sed -u 's/[^0-9]//g' | dialog --gauge "Please wait.\n Installing Build Requirements..." 10 70 0 build_fs diff --git a/scripts/debian_min_build.sh b/scripts/debian_min_build.sh index a07ad7165a..628163967d 100755 --- a/scripts/debian_min_build.sh +++ b/scripts/debian_min_build.sh @@ -8,7 +8,7 @@ wget -O - https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list -apt-get update && apt-get install -y libtool libjpeg62-turbo-dev ntpdate libfreetype6-dev git-buildpackage doxygen yasm gdb git build-essential automake autoconf wget uuid-dev zlib1g-dev libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison pkg-config ccache libpng16-dev libpng12-dev libopenal-dev libbroadvoice-dev libcodec2-dev libflite-dev libg7221-dev libilbc-dev libsilk-dev liblua5.2-dev libopus-dev libsndfile-dev libavformat-dev libavcodec-extra libswscale-dev libx264-dev libperl-dev unixodbc-dev libpq-dev libsctp-dev +apt-get update && apt-get install -y libtool libjpeg62-turbo-dev ntpdate libfreetype6-dev git-buildpackage doxygen yasm gdb git build-essential automake autoconf wget uuid-dev zlib1g-dev libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libsqlite3-dev perl libdb-dev bison pkg-config ccache libpng16-dev libpng12-dev libopenal-dev libbroadvoice-dev libcodec2-dev libflite-dev libg7221-dev libilbc-dev libsilk-dev liblua5.2-dev libopus-dev libsndfile-dev libavformat-dev libavcodec-extra libswscale-dev libx264-dev libperl-dev unixodbc-dev libpq-dev libsctp-dev cd /usr/src