From 90245b97e3571d7af5bfb819574a7124b00c4eb3 Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Sat, 26 Feb 2022 18:50:25 +0100 Subject: [PATCH 1/2] Add curl to [netutils] (#6274) --- install/dist/tpl/gentoo/jk_init.ini.master | 4 ++-- install/tpl/jk_init.ini.master | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/dist/tpl/gentoo/jk_init.ini.master b/install/dist/tpl/gentoo/jk_init.ini.master index 6e11d05fd5..267210535b 100644 --- a/install/dist/tpl/gentoo/jk_init.ini.master +++ b/install/dist/tpl/gentoo/jk_init.ini.master @@ -96,8 +96,8 @@ regularfiles = /etc/vimrc directories = /etc/joe, /etc/terminfo, /usr/share/vim, /usr/share/terminfo, /usr/lib/terminfo [netutils] -comment = several internet utilities like wget, ftp, rsync, scp, ssh -executables = /usr/bin/wget, /usr/bin/lynx, /usr/bin/ftp, /usr/bin/host, /usr/bin/rsync, /usr/bin/smbclient +comment = several internet utilities like curl, wget, ftp, rsync, scp, ssh +executables = /usr/bin/curl /usr/bin/wget, /usr/bin/lynx, /usr/bin/ftp, /usr/bin/host, /usr/bin/rsync, /usr/bin/smbclient includesections = netbasics, ssh, sftp, scp directories = /etc/ssl/certs/ regularfiles = /usr/lib/ssl/certs diff --git a/install/tpl/jk_init.ini.master b/install/tpl/jk_init.ini.master index 0dfcdccb68..3cbb818097 100644 --- a/install/tpl/jk_init.ini.master +++ b/install/tpl/jk_init.ini.master @@ -87,7 +87,7 @@ paths = awk, bzip2, bunzip2, ldd, less, clear, cut, du, find, head, less, md5sum includesections = basicshell, midnightcommander, editors [terminfo] -comment = terminfo databases, required for example for ncurses or vim +comment = terminfo databases, required for example for ncurses or vim paths = /etc/terminfo, /usr/share/terminfo, /lib/terminfo [editors] @@ -96,8 +96,8 @@ includesections = terminfo paths = joe, nano, vi, vim, /etc/vimrc, /etc/joe, /usr/share/vim [netutils] -comment = several internet utilities like wget, ftp, rsync, scp, ssh -paths = wget, lynx, ftp, host, rsync, smbclient +comment = several internet utilities like curl, wget, ftp, rsync, scp, ssh +paths = curl, wget, lynx, ftp, host, rsync, smbclient includesections = netbasics, ssh, sftp, scp [apacheutils] -- GitLab From da73d6a0bec252dde85fbc4e98ff7461c9c52f62 Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Sat, 26 Feb 2022 18:52:39 +0100 Subject: [PATCH 2/2] Add php8.2 to jailkit (#6275) --- install/tpl/jk_init.ini.master | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/install/tpl/jk_init.ini.master b/install/tpl/jk_init.ini.master index 3cbb818097..b6e731b536 100644 --- a/install/tpl/jk_init.ini.master +++ b/install/tpl/jk_init.ini.master @@ -238,6 +238,11 @@ comment = php version 8.1 paths = /usr/bin/php8.1, /usr/lib/php/8.1/, /usr/lib/php/20210902/, /usr/share/php/8.1/, /etc/php/8.1/cli/, /etc/php/8.1/mods-available/ includesections = php_common +[php8_2] +comment = php version 8.2 +paths = /usr/bin/php8.2, /usr/lib/php/8.2/, /usr/lib/php/20210902/, /usr/share/php/8.2/, /etc/php/8.2/cli/, /etc/php/8.2/mods-available/ +includesections = php_common + [imagemagick] comment = ImageMagick needed for php-imagemagick extension paths = /usr/share/ImageMagick-*, /etc/ImageMagick-*, /usr/lib/*/ImageMagick-* -- GitLab