From df11b05a1e9118281883d178868c94d961456cd7 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sun, 19 Jan 2025 12:21:51 +0900 Subject: [PATCH] Replaced deprecated libidn11-dev with libidn-dev across the project. This update improves compatibility with newer distributions by modifying dependency declarations in control files, Dockerfiles, and documentation. --- debian/control | 2 +- docker/debian/latest/base/Dockerfile | 8 ++++++-- docker/ubuntu/latest/base/Dockerfile | 8 ++++++-- docs/_docs/guide/02-building-open5gs-from-sources.md | 2 +- docs/_docs/troubleshoot/02-now-in-github-issues.md | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 8cb84efbd..d8c28b9ea 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11), libgnutls28-dev, libgcrypt-dev, libssl-dev, - libidn11-dev, + libidn-dev | libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, diff --git a/docker/debian/latest/base/Dockerfile b/docker/debian/latest/base/Dockerfile index 072628d16..bac24f0b5 100644 --- a/docker/debian/latest/base/Dockerfile +++ b/docker/debian/latest/base/Dockerfile @@ -22,7 +22,6 @@ RUN apt-get update && \ libgnutls28-dev \ libgcrypt-dev \ libssl-dev \ - libidn11-dev \ libmongoc-dev \ libbson-dev \ libyaml-dev \ @@ -35,4 +34,9 @@ RUN apt-get update && \ ca-certificates \ netbase \ pkg-config && \ - apt-get clean + if apt-cache show libidn-dev > /dev/null 2>&1; then \ + apt-get install -y --no-install-recommends libidn-dev; \ + else \ + apt-get install -y --no-install-recommends libidn11-dev; \ + fi && \ + apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/docker/ubuntu/latest/base/Dockerfile b/docker/ubuntu/latest/base/Dockerfile index 072628d16..bac24f0b5 100644 --- a/docker/ubuntu/latest/base/Dockerfile +++ b/docker/ubuntu/latest/base/Dockerfile @@ -22,7 +22,6 @@ RUN apt-get update && \ libgnutls28-dev \ libgcrypt-dev \ libssl-dev \ - libidn11-dev \ libmongoc-dev \ libbson-dev \ libyaml-dev \ @@ -35,4 +34,9 @@ RUN apt-get update && \ ca-certificates \ netbase \ pkg-config && \ - apt-get clean + if apt-cache show libidn-dev > /dev/null 2>&1; then \ + apt-get install -y --no-install-recommends libidn-dev; \ + else \ + apt-get install -y --no-install-recommends libidn11-dev; \ + fi && \ + apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/docs/_docs/guide/02-building-open5gs-from-sources.md b/docs/_docs/guide/02-building-open5gs-from-sources.md index c7b4fbe4c..01e572f6e 100644 --- a/docs/_docs/guide/02-building-open5gs-from-sources.md +++ b/docs/_docs/guide/02-building-open5gs-from-sources.md @@ -61,7 +61,7 @@ $ sudo ip link set ogstun up Install the dependencies for building the source code. ```bash -$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson +$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson ``` Git clone. diff --git a/docs/_docs/troubleshoot/02-now-in-github-issues.md b/docs/_docs/troubleshoot/02-now-in-github-issues.md index 06b26c352..11b1b84fc 100644 --- a/docs/_docs/troubleshoot/02-now-in-github-issues.md +++ b/docs/_docs/troubleshoot/02-now-in-github-issues.md @@ -1356,7 +1356,7 @@ $ DIST=debian TAG=stretch docker-compose run dev ```bash $ sudo dpkg --add-architecture armel $ sudo apt update -$ sudo apt install libsctp-dev:armel libyaml-dev:armel libgnutls28-dev:armel libgcrypt-dev:armel libidn11-dev:armel libssl-dev:armel libmongoc-dev:armel libbson-dev:armel +$ sudo apt install libsctp-dev:armel libyaml-dev:armel libgnutls28-dev:armel libgcrypt-dev:armel libidn-dev:armel libssl-dev:armel libmongoc-dev:armel libbson-dev:armel $ sudo apt install crossbuild-essential-armel $ sudo apt install qemu $ git clone https://github.com/{{ site.github_username }}/open5gs