Merge pull request #5 from theseus-rs/remove-ldap-perl-tcl-support

chore: remove ldap, perl and tcl support
theseus-rs · Feb 20, 2024 · 1959598 · 1959598
2 parents 1a8d618 + e8bf7c7
commit 1959598
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -297,17 +297,15 @@ jobs:
             --enable-option-checking=fatal \
             --enable-thread-safety \
             --without-icu \
-            $([ $major_version -ge 14 ] && echo "--with-ldap") \
+            --without-ldap \
             --with-libxml \
             --with-libxslt \
             $([ $major_version -ge 16 ] && echo "--with-llvm") \
             $([ $major_version -ge 14 ] && echo "--with-lz4") \
-            --with-perl \
             --with-pgport=5432 \
             $([ $major_version -ge 15 ] && echo "--with-python") \
             --with-readline \
             --with-system-tzdata=/usr/share/zoneinfo \
-            --with-tcl \
             --with-uuid=e2fs \
             $([ $major_version -ge 16 ] && echo "--with-zstd")
           make $([ $major_version -ge 15 ] && echo "world-bin")

diff --git a/dockerfiles/Dockerfile.linux-gnu b/dockerfiles/Dockerfile.linux-gnu
@@ -13,7 +13,6 @@ RUN apt-get update && \
         git \
         libicu-dev \
         libkrb5-dev \
-        libldap-dev \
         liblz4-dev \
         libossp-uuid-dev \
         libperl-dev \
@@ -33,8 +32,6 @@ RUN apt-get update && \
         pkg-config \
         python3 \
         python3-dev \
-        tcl \
-        tcl-dev \
         wget \
         xsltproc \
         zstd
@@ -61,17 +58,15 @@ RUN major_version=$(echo "$POSTGRESQL_VERSION" | awk -F. '{print $1}') && \
       --enable-thread-safety \
       --with-gssapi \
       --without-icu \
-      $([ $major_version -ge 11 ] && echo "--with-ldap") \
+      --without-ldap \
       --with-libxml \
       --with-libxslt \
       $([ $major_version -ge 14 ] && echo "--with-lz4") \
       --with-openssl \
-      --with-perl \
       --with-pgport=5432 \
       $([ $major_version -ge 15 ] && echo "--with-python") \
       --with-readline \
       --with-system-tzdata=/usr/share/zoneinfo \
-      --with-tcl \
       --with-uuid=ossp \
       $([ $major_version -ge 16 ] && echo "--with-zstd") && \
     make $([ $major_version -ge 15 ] && echo "world-bin") && \

diff --git a/dockerfiles/Dockerfile.linux-musl b/dockerfiles/Dockerfile.linux-musl
@@ -27,7 +27,6 @@ RUN apk add --no-cache \
       lz4-dev \
       make \
       musl-dev \
-      openldap-dev \
       openssl-dev \
       ossp-uuid-dev \
       patchelf \
@@ -38,8 +37,6 @@ RUN apk add --no-cache \
       python3 \
       python3-dev \
       readline-dev \
-      tcl \
-      tcl-dev \
       util-linux-dev \
       zlib-dev \
       zstd-dev
@@ -67,18 +64,16 @@ RUN major_version=$(echo "$POSTGRESQL_VERSION" | awk -F. '{print $1}') && \
       --enable-thread-safety \
       --with-gssapi \
       $([ $major_version -ge 14 ] && echo "--with-icu" || echo "--without-icu") \
-      $([ $major_version -ge 14 ] && echo "--with-ldap") \
+      --without-ldap \
       --with-libxml \
       --with-libxslt \
       $([ $major_version -ge 16 ] && echo "--with-llvm") \
       $([ $major_version -ge 14 ] && echo "--with-lz4") \
       --with-openssl \
-      --with-perl \
       --with-pgport=5432 \
       $([ $major_version -ge 15 ] && echo "--with-python") \
       --with-readline \
       --with-system-tzdata=/usr/share/zoneinfo \
-      --with-tcl \
       --with-uuid=ossp \
       $([ $major_version -ge 16 ] && echo "--with-zstd") && \
     make $([ $major_version -ge 15 ] && echo "world-bin") && \

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-release="2"
+release="3"
 all_versions=( \
   "16.2" "16.1" "16.0" \
   "15.6" "15.5" "15.4" "15.3" "15.2" "15.1" "15.0" \