Merge branch 'debian-bullseye' into 'master'v3.25.5

Upgrade packages

See merge request gitlab-org/security-products/license-management!218

3 files changed, 42 insertions, 82 deletions

diff --git a/config/01_nodoc b/config/01_nodoc
index 0f305c3..2175ebd 100644
--- a/config/01_nodoc
+++ b/config/01_nodoc
@@ -1,29 +1,52 @@
 # /etc/dpkg/dpkg.cfg.d/01_nodoc
 
-# Delete locales
-path-exclude=/usr/share/locale/*
-
-# Delete man pages
-path-exclude=/usr/share/man/*
-
-# Delete docs
-path-exclude=/usr/share/doc/*
-path-include=/usr/share/doc/*/copyright
-
-path-exclude=/etc/dbus-1/system.d/*
+path-exclude=/etc/X11/*/*
+path-exclude=/etc/bash_completion.d/*
+path-exclude=/etc/calendar/*
 path-exclude=/etc/cron.daily/*
+path-exclude=/etc/dbus-1/system.d/*
+path-exclude=/etc/emacs/*/*
+path-exclude=/etc/fonts/*/*
 path-exclude=/etc/init.d/*
 path-exclude=/etc/logcheck/*
 path-exclude=/etc/logrotate.d/*
 path-exclude=/etc/sysctl.d/*
 path-exclude=/etc/systemd/*
-
-path-exclude=/lib/systemd/*
-path-exclude=/usr/lib/emacsen-common/*
-path-exclude=/usr/lib/mime/*
-path-exclude=/usr/lib/monodoc/*
-path-exclude=/usr/lib/software-properties/*
-
+path-exclude=/etc/systemd/*/*
+path-exclude=/etc/systemd/*/*/*
+path-exclude=/usr/lib/emacsen-common/*/*
+path-exclude=/usr/lib/emacsen-common/*/*/*
+path-exclude=/usr/lib/systemd/*/*
+path-exclude=/usr/lib/systemd/*/*/*
+path-exclude=/usr/share/bash-completion/*/*
+path-exclude=/usr/share/bug/*
+path-exclude=/usr/share/bug/*/*
+path-exclude=/usr/share/calendar/*
+path-exclude=/usr/share/*/Help/*/*
+path-exclude=/usr/share/*/completions/*/*
+path-exclude=/usr/share/*/editors/*/*
+path-exclude=/usr/share/doc/*
+path-exclude=/usr/share/emacs/*
+path-exclude=/usr/share/emacs/*/*
+path-exclude=/usr/share/emacs/*/*/*
+path-exclude=/usr/share/fonts/*
+path-exclude=/usr/share/fonts/*/*
+path-exclude=/usr/share/fonts/*/*/*
+path-exclude=/usr/share/git-core/*
+path-exclude=/usr/share/git-core/*/*
+path-exclude=/usr/share/git-core/*/*/*
+path-exclude=/usr/share/gitweb/*
+path-exclude=/usr/share/gitweb/*/*
+path-exclude=/usr/share/gnupg/*.txt
+path-exclude=/usr/share/locale/*
+path-exclude=/usr/share/man/*
+path-exclude=/usr/share/mime/*/*
+path-exclude=/usr/share/zsh/*
+path-exclude=/usr/share/zsh/*/*
 path-exclude=/var/cache/*
 path-exclude=/var/lib/systemd/*
+path-exclude=/var/lib/systemd/*/*
 path-exclude=/var/log/*
+path-exclude=/var/log/*/*
+path-exclude=/var/log/*/*/*
+path-include=/usr/share/doc/*/copyright
diff --git a/config/files/.bashrc b/config/files/.bashrc
index 61d4ecf..8349f0b 100644
--- a/config/files/.bashrc
+++ b/config/files/.bashrc
@@ -64,10 +64,7 @@ fi
 inflate /opt/gitlab/.config.tar.zst /opt/gitlab
 inflate /opt/gitlab/.m2.tar.zst /opt/gitlab
 inflate /opt/gitlab/embedded.tar.zst /opt/gitlab
-inflate /usr/include.tar.zst /usr
-inflate /usr/lib/gcc.tar.zst /usr/lib
 inflate /usr/lib/git-core.tar.zst /usr/lib
-inflate /usr/lib/llvm-7.tar.zst /usr/lib
 
 # shellcheck source=/dev/null
 . "$ASDF_DATA_DIR/asdf.sh"
diff --git a/config/install.sh b/config/install.sh
index 98fcc84..2c7a45f 100644
--- a/config/install.sh
+++ b/config/install.sh
@@ -10,53 +10,20 @@ apt-get install -y --no-install-recommends \
   apt-transport-https \
   autoconf \
   automake \
-  bison \
   bsdmainutils \
-  build-essential \
   bzip2 \
   ca-certificates \
   cmake \
   curl \
-  default-libmysqlclient-dev \
   git \
   gnupg2 \
   jq \
-  libbz2-dev \
-  libcurl4 \
-  libcurl4-openssl-dev \
-  libedit-dev \
-  libffi-dev \
-  libicu-dev \
-  libjpeg-dev \
-  libkrb5-dev \
-  liblttng-ctl-dev \
-  liblttng-ctl0 \
-  liblzma-dev \
-  libncurses-dev \
-  libncurses5-dev \
-  libncursesw5-dev \
-  libonig-dev \
-  libpng-dev \
-  libpq-dev \
-  libre2-dev \
-  libreadline-dev \
-  libsqlite3-dev \
-  libssl-dev \
-  libtool \
-  libxml2-dev \
-  libxmlsec1-dev \
-  libxslt-dev \
-  libyaml-dev \
-  libzip-dev \
   make \
   pkg-config \
   re2c \
   rebar \
-  software-properties-common \
   sudo \
   unzip \
-  zlib1g \
-  zlib1g-dev \
   zstd
 
 dpkg --install /opt/toolcache/license*.deb
@@ -65,45 +32,25 @@ ln -s /opt/gitlab /root
 echo -e "section_end:$(date +%s):install_packages\r\e[0K"
 
 echo -e "section_start:$(date +%s):cleanup\r\e[0K==> Beginning cleanup…"
-apt purge -y libx11-6 libwayland-client0
+apt purge -y x11-common libx11-6 libgtk2.0-common libsensors-config ucf
 apt autoremove -y
 
-rm -fr /tmp
-mkdir -p /tmp
-chmod 777 /tmp
-chmod +t /tmp
-
 rm -fr /opt/gitlab/.config/configstore/update-notifier-npm.json \
   /opt/gitlab/.config/pip/selfcheck.json \
   /opt/gitlab/.gem \
   /opt/gitlab/.npm \
   /opt/gitlab/.wget-hsts \
-  /etc/apache2/* \
-  /etc/bash_completion.d/* \
-  /etc/calendar/* \
-  /etc/cron.d/* \
-  /etc/cron.daily/* \
   /etc/emacs/* \
   /etc/fonts/* \
   /etc/ldap/* \
-  /etc/mysql/* \
-  /etc/php/*/apache2/* \
-  /etc/profile.d/* \
   /etc/systemd/* \
   /etc/X11/* \
   /lib/systemd/* \
-  /usr/lib/apache2/* \
   /usr/lib/systemd/* \
-  /usr/lib/valgrid/* \
-  /usr/share/applications/* \
-  /usr/share/apps/* \
-  /usr/share/bash-completion/* \
   /usr/share/calendar/* \
   /usr/share/doc-base/* \
   /usr/share/emacs/* \
-  /usr/share/fontconfig/* \
   /usr/share/fonts/* \
-  /usr/share/gtk-doc/* \
   /usr/share/icons/* \
   /usr/share/menu/* \
   /usr/share/pixmaps/* \
@@ -125,22 +72,15 @@ tar --use-compress-program "$zstd_command" -cf /opt/gitlab/.config.tar.zst .conf
 tar --use-compress-program "$zstd_command" -cf /opt/gitlab/.m2.tar.zst .m2 &
 tar --use-compress-program "$zstd_command" -cf /opt/gitlab/embedded.tar.zst embedded &
 
-cd /usr
-tar --use-compress-program "$zstd_command" -cf /usr/include.tar.zst include &
-
 cd /usr/lib
-tar --use-compress-program "$zstd_command" -cf /usr/lib/gcc.tar.zst gcc &
 tar --use-compress-program "$zstd_command" -cf /usr/lib/git-core.tar.zst git-core &
 
 wait
 # shellcheck disable=SC2114
 rm -fr \
-  "$ASDF_DATA_DIR" \
   /opt/gitlab/.m2 \
   /opt/gitlab/.cache \
   /opt/gitlab/.config \
   /opt/gitlab/embedded \
-  /usr/include \
-  /usr/lib/gcc \
   /usr/lib/git-core
 echo -e "section_end:$(date +%s):compress_files\r\e[0K"