Skip to content

Commit cbdb132

Browse files
authored
Fix/libzip4 fix upgrade (hestiacp#3244)
* Update version * Fix dependencies Ubuntu 20.04 to 22.04
1 parent d750c4b commit cbdb132

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
5252
php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline php$fpm_v-xml
5353
postgresql postgresql-contrib proftpd-basic quota rrdtool spamassassin sudo hestia=${HESTIA_INSTALL_VER}
5454
hestia-nginx hestia-php vim-common vsftpd whois unzip zip acl sysstat setpriv rsyslog
55-
ipset libonig5 libzip5 openssh-server lsb-release zstd jq"
55+
ipset libonig5 libzip4 openssh-server lsb-release zstd jq"
5656

5757
installer_dependencies="apt-transport-https curl dirmngr gnupg wget software-properties-common ca-certificates"
5858

@@ -934,14 +934,13 @@ if [ -d "$withdebs" ]; then
934934
fi
935935
if [ "$release" = '18.04' ]; then
936936
software=$(echo "$software" | sed -e "s/libonig5/libonig4/")
937-
software=$(echo "$software" | sed -e "s/libzip5/libzip4/")
938937
fi
939938
if [ "$release" = '20.04' ]; then
940939
software=$(echo "$software" | sed -e "s/setpriv/util-linux/")
940+
software=$(echo "$software" | sed -e "s/libzip4/libzip5/")
941941
fi
942942
if [ "$release" = '22.04' ]; then
943943
software=$(echo "$software" | sed -e "s/setpriv/util-linux/")
944-
software=$(echo "$software" | sed -e "s/libzip5/libzip4/")
945944
fi
946945

947946
#----------------------------------------------------------#

src/deb/hestia/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upstream-Name: hestia
33
Source: https://www.hestiacp.com
44

55
Files: *
6-
Copyright: 2018-2022, Hestia Control Panel <info@hestiacp.com>
6+
Copyright: 2018-2023, Hestia Control Panel <info@hestiacp.com>
77
License: GPL-3.0+
88
Remarks: Hestia Control Panel is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin
99

src/deb/nginx/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upstream-Name: hestia
33
Source: https://www.hestiacp.com
44

55
Files: *
6-
Copyright: 2018-2022, Hestia Control Panel <info@hestiacp.com>
6+
Copyright: 2018-2023, Hestia Control Panel <info@hestiacp.com>
77
License: GPL-3.0+
88
Remarks: Hestia is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin
99

src/deb/php/control

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
Source: hestia-php
22
Package: hestia-php
33
Priority: optional
4-
Version: 8.2.0
4+
Version: 8.2.1
55
Section: admin
66
Maintainer: HestaCP <info@hestiacp.com>
77
Homepage: https://www.hestiacp.com
88
Architecture: amd64
9-
Depends: hestia, libzip5 | libzip4, unzip, libonig5 | libonig4 | libonig2
9+
Depends: hestia, libzip4, unzip, libonig5 | libonig4 | libonig2
10+
Conflct: libzip5
1011
Description: hestia php-fpm
1112
hestia is an open source hosting control panel.
1213
hestia has a clean and focused interface without the clutter.

src/deb/php/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upstream-Name: hestia
33
Source: https://www.hestiacp.com
44

55
Files: *
6-
Copyright: 2018-2022, Hestia Control Panel <info@hestiacp.com>
6+
Copyright: 2018-2023, Hestia Control Panel <info@hestiacp.com>
77
License: GPL-3.0+
88
Remarks: Hestia is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin
99

src/hst_autocompile.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ if [ "$dontinstalldeps" != 'true' ]; then
258258
dnf install -y -q $SOFTWARE
259259
else
260260
# Set package dependencies for compiling
261-
SOFTWARE='build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config libsqlite3-dev libonig-dev rpm'
261+
SOFTWARE='build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config libsqlite3-dev libonig-dev rpm lsb-release'
262262

263263
echo "Updating system APT repositories..."
264264
apt-get -qq update > /dev/null 2>&1
@@ -555,6 +555,14 @@ if [ "$PHP_B" = true ]; then
555555
if [ "$BUILD_ARCH" != "amd64" ]; then
556556
sed -i "s/amd64/${BUILD_ARCH}/g" "$BUILD_DIR_HESTIAPHP/DEBIAN/control"
557557
fi
558+
559+
os=$(lsb_release -is)
560+
release=$(lsb_release -rs)
561+
if [[ "$os" = "Ubuntu" ]] && [[ "$release" = "20.04" ]]; then
562+
sed -i "/Conflicts: libzip5/d" "$BUILD_DIR_HESTIAPHP/DEBIAN/control"
563+
sed -i "s/libzip4/libzip5/g" "$BUILD_DIR_HESTIAPHP/DEBIAN/control"
564+
fi
565+
558566
get_branch_file 'src/deb/php/copyright' "$BUILD_DIR_HESTIAPHP/DEBIAN/copyright"
559567
get_branch_file 'src/deb/php/postinst' "$BUILD_DIR_HESTIAPHP/DEBIAN/postinst"
560568
chmod +x $BUILD_DIR_HESTIAPHP/DEBIAN/postinst

0 commit comments

Comments
 (0)