From c27edc56a8d562501034bef0f690fb6ea270b77c Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 20 May 2025 07:52:19 +0200 Subject: [PATCH] 9.2 --- lam-packaging/debian/control | 2 +- lam-packaging/debian/postinst | 3 --- lam-packaging/debian/rules | 1 - lam-packaging/docker/Dockerfile | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index b20609c9e..847a69413 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -17,7 +17,7 @@ Depends: php (>= 8.1), php-ldap, apache2 (>= 2.4.0) | httpd, gettext, fonts-dejavu, php-phpseclib3, php-monolog, - php-voku-portable-ascii (<< 3.0), libphp-phpmailer (<< 7.0), + libphp-phpmailer (<< 7.0), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} Recommends: php-opcache Suggests: ldap-server, php-mcrypt, ldap-account-manager-lamdaemon, perl diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index 42c40455b..0764c1477 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -16,9 +16,6 @@ fi if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog ] ; then ln -s /usr/share/php/Monolog /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog fi -if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then - ln -s /usr/share/php/voku /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku -fi if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer ] ; then ln -s /usr/share/php/libphp-phpmailer /usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer fi diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index f386357a4..16c77a48c 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -51,7 +51,6 @@ install: cp -r lib/3rdParty/composer debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/ rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog - rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer cp -r lib/3rdParty/yubico debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/ cp -r lib/3rdParty/tcpdf debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/ diff --git a/lam-packaging/docker/Dockerfile b/lam-packaging/docker/Dockerfile index b265b9876..a9ed85d2d 100644 --- a/lam-packaging/docker/Dockerfile +++ b/lam-packaging/docker/Dockerfile @@ -86,7 +86,6 @@ RUN apt-get install --no-install-recommends -y \ libldap-common \ gettext \ php-phpseclib3 \ - php-voku-portable-ascii \ libphp-phpmailer \ cron \ && \