From 717423b33684a75f387ada1c823ae8cb5ae9e712 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 7 Dec 2023 17:45:00 +0100 Subject: [PATCH 01/10] 8.6 --- lam-packaging/debian/changelog | 2 ++ lam-packaging/debian/control | 1 + lam-packaging/debian/postinst | 3 +++ lam-packaging/debian/postrm | 3 +++ lam-packaging/debian/preinst | 3 +++ 5 files changed, 12 insertions(+) diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog index 6450b26e2..c3f6980db 100644 --- a/lam-packaging/debian/changelog +++ b/lam-packaging/debian/changelog @@ -1,6 +1,8 @@ ldap-account-manager (8.6.RC1-1) unstable; urgency=medium * new upstream release + * Fix "php-phpseclib3: CVE-2023-49316" by linking + directory (Closes: #1057037) -- Roland Gruber Tue, 05 Dec 2023 07:05:16 +0100 diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index b29efcb44..0ecc3adf5 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -17,6 +17,7 @@ Depends: php (>= 8.0.2), php-ldap, apache2 (>= 2.4.0) | httpd, gettext, fonts-dejavu, ckeditor (>= 4.0), libjs-jquery-jstree (>= 3.3.0), + php-phpseclib3, 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 bef570a05..c9c676f68 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -16,6 +16,9 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do ln -s /usr/share/javascript/${jsThirdPartyLib} /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done +if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then + ln -s /usr/share/php/phpseclib3 /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib +fi cd /usr/share/ldap-account-manager/config-samples/profiles files=`ls -a default.*` diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 563855d4b..9d89b19bc 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -57,6 +57,9 @@ if [ -f /usr/share/debconf/confmodule ]; then rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done + if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib + fi set -e diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index 5be5c0e25..aa8292b57 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -13,5 +13,8 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done +if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib +fi #DEBHELPER# From b829afa677a2b68450abc001cd39cce3b0ae3b19 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 7 Dec 2023 17:51:10 +0100 Subject: [PATCH 02/10] 8.6 --- lam-packaging/debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 98aa0d03c..897c74b1b 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -49,6 +49,7 @@ install: # 3rd party libs are linked install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty 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/phpseclib/phpseclib 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/ From 8b520bc0979d5991d93a9487c7cc02e71ff0958f Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 7 Dec 2023 17:53:27 +0100 Subject: [PATCH 03/10] 8.6 --- lam-packaging/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 897c74b1b..afedfcd27 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -49,7 +49,7 @@ install: # 3rd party libs are linked install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty 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/phpseclib/phpseclib + rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib 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/ From d5b94c8eae9571d880d7222ef0ad7b62cc52a28f Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 7 Dec 2023 18:15:44 +0100 Subject: [PATCH 04/10] 8.6 --- lam-packaging/debian/postinst | 2 +- lam-packaging/debian/postrm | 2 +- lam-packaging/debian/preinst | 2 +- lam-packaging/debian/rules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index c9c676f68..1f31900fb 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -17,7 +17,7 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do fi done if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then - ln -s /usr/share/php/phpseclib3 /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib + ln -s /usr/share/php/phpseclib3 /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi cd /usr/share/ldap-account-manager/config-samples/profiles diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 9d89b19bc..f996a95c8 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -58,7 +58,7 @@ if [ -f /usr/share/debconf/confmodule ]; then fi done if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then - rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index aa8292b57..fa33e18d3 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -14,7 +14,7 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do fi done if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then - rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi #DEBHELPER# diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index afedfcd27..aace35b04 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -49,7 +49,7 @@ install: # 3rd party libs are linked install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty 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 + rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib 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/ From a6309d560c78d76132075a75a80422a2410ab0e2 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 7 Dec 2023 18:25:31 +0100 Subject: [PATCH 05/10] 8.6 --- lam-packaging/debian/postinst | 2 +- lam-packaging/debian/postrm | 2 +- lam-packaging/debian/preinst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index 1f31900fb..c8e66164c 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -16,7 +16,7 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do ln -s /usr/share/javascript/${jsThirdPartyLib} /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done -if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then +if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then ln -s /usr/share/php/phpseclib3 /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index f996a95c8..3de5ddc4b 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -57,7 +57,7 @@ if [ -f /usr/share/debconf/confmodule ]; then rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done - if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then + if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index fa33e18d3..219da7958 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -13,7 +13,7 @@ for jsThirdPartyLib in $jsThirdPartyLibs; do rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} fi done -if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib ] ; then +if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi From 9a409af439f1aeb8e77f7339db7e8baa51a455b3 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 8 Dec 2023 20:26:26 +0100 Subject: [PATCH 06/10] 8.6 --- lam-packaging/debian/control | 2 +- lam-packaging/debian/postinst | 6 ++++++ lam-packaging/debian/postrm | 6 ++++++ lam-packaging/debian/preinst | 6 ++++++ lam-packaging/debian/rules | 2 ++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 0ecc3adf5..15c3f2510 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -17,7 +17,7 @@ Depends: php (>= 8.0.2), php-ldap, apache2 (>= 2.4.0) | httpd, gettext, fonts-dejavu, ckeditor (>= 4.0), libjs-jquery-jstree (>= 3.3.0), - php-phpseclib3, + php-phpseclib3, php-psr-log (< 2.0), php-monolog (< 3.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 c8e66164c..a0215c6f2 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -19,6 +19,12 @@ done if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then ln -s /usr/share/php/phpseclib3 /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib 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/psr/log/Psr ] ; then + ln -s /usr/share/php/Psr /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr +fi cd /usr/share/ldap-account-manager/config-samples/profiles files=`ls -a default.*` diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 3de5ddc4b..57025f75e 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -60,6 +60,12 @@ if [ -f /usr/share/debconf/confmodule ]; then if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi + if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog + fi + if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr + fi set -e diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index 219da7958..30ddb2367 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -16,5 +16,11 @@ done if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpseclib/phpseclib/phpseclib fi +if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/monolog/monolog/src/Monolog +fi +if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr +fi #DEBHELPER# diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index aace35b04..3722631d3 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -50,6 +50,8 @@ install: install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty 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/psr/log/Psr 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/ From eda8299c246e985714557b3c66577d3798b5b8ef Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 8 Dec 2023 21:04:40 +0100 Subject: [PATCH 07/10] 8.6 --- lam-packaging/debian/control | 3 ++- lam-packaging/debian/postinst | 3 +++ lam-packaging/debian/postrm | 3 +++ lam-packaging/debian/preinst | 3 +++ lam-packaging/debian/rules | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 15c3f2510..1becadec6 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -17,7 +17,8 @@ Depends: php (>= 8.0.2), php-ldap, apache2 (>= 2.4.0) | httpd, gettext, fonts-dejavu, ckeditor (>= 4.0), libjs-jquery-jstree (>= 3.3.0), - php-phpseclib3, php-psr-log (< 2.0), php-monolog (< 3.0), + php-phpseclib3, php-psr-log (<< 2.0), php-monolog (<< 3.0), + php-voku-portable-ascii (<< 3.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 a0215c6f2..614d29475 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -25,6 +25,9 @@ fi if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then ln -s /usr/share/php/Psr /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr 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 cd /usr/share/ldap-account-manager/config-samples/profiles files=`ls -a default.*` diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 57025f75e..3c2d14a17 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -66,6 +66,9 @@ if [ -f /usr/share/debconf/confmodule ]; then if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr fi + if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku + fi set -e diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index 30ddb2367..eaf008b8a 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -22,5 +22,8 @@ fi if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr ] ; then rm /usr/share/ldap-account-manager/lib/3rdParty/composer/psr/log/Psr fi +if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku +fi #DEBHELPER# diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 3722631d3..8fa647b7a 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -52,6 +52,7 @@ install: 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/psr/log/Psr + rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku 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/ From 733a4dae65ecc2d1252c5cd0e5b469dadf1f36cf Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 8 Dec 2023 21:08:57 +0100 Subject: [PATCH 08/10] 8.6 --- lam-packaging/debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog index c3f6980db..042af35d1 100644 --- a/lam-packaging/debian/changelog +++ b/lam-packaging/debian/changelog @@ -3,6 +3,8 @@ ldap-account-manager (8.6.RC1-1) unstable; urgency=medium * new upstream release * Fix "php-phpseclib3: CVE-2023-49316" by linking directory (Closes: #1057037) + * Fix "Lots of embedded copies, including many that are already packaged + in Debian" by linking directories (Closes: #1057036) -- Roland Gruber Tue, 05 Dec 2023 07:05:16 +0100 From 7a890fb7e62c4f6ccbbe0d502cd8708cadea0b90 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 10 Dec 2023 20:32:54 +0100 Subject: [PATCH 09/10] 8.6 --- lam-packaging/debian/control | 2 +- lam-packaging/debian/postinst | 3 +++ lam-packaging/debian/postrm | 3 +++ lam-packaging/debian/preinst | 3 +++ lam-packaging/debian/rules | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 1becadec6..0cd891635 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -18,7 +18,7 @@ Depends: php (>= 8.0.2), php-ldap, gettext, fonts-dejavu, ckeditor (>= 4.0), libjs-jquery-jstree (>= 3.3.0), php-phpseclib3, php-psr-log (<< 2.0), php-monolog (<< 3.0), - php-voku-portable-ascii (<< 3.0), + php-voku-portable-ascii (<< 3.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 614d29475..3428099ab 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -28,6 +28,9 @@ 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 cd /usr/share/ldap-account-manager/config-samples/profiles files=`ls -a default.*` diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 3c2d14a17..b341aa316 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -69,6 +69,9 @@ if [ -f /usr/share/debconf/confmodule ]; then if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then rm /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 + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer + fi set -e diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst index eaf008b8a..9ad4df751 100755 --- a/lam-packaging/debian/preinst +++ b/lam-packaging/debian/preinst @@ -25,5 +25,8 @@ fi if [ -L /usr/share/ldap-account-manager/lib/3rdParty/composer/voku/portable-ascii/src/voku ] ; then rm /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 + rm /usr/share/ldap-account-manager/lib/3rdParty/composer/phpmailer/phpmailer +fi #DEBHELPER# diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 8fa647b7a..1ad551b79 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -53,6 +53,7 @@ install: 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/psr/log/Psr 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/ From 1129aaa357512aaf44b54e5d16e66399a3b148b8 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 10 Dec 2023 20:52:10 +0100 Subject: [PATCH 10/10] 8.6 --- lam/composer.lock | 10 +++--- .../3rdParty/composer/composer/installed.json | 12 +++---- .../3rdParty/composer/composer/installed.php | 14 ++++---- .../3rdParty/composer/nesbot/carbon/readme.md | 36 ++++++++++--------- .../composer/nesbot/carbon/sponsors.php | 4 +-- .../carbon/src/Carbon/TranslatorImmutable.php | 2 +- 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/lam/composer.lock b/lam/composer.lock index facd7ffb4..d181c8eb5 100644 --- a/lam/composer.lock +++ b/lam/composer.lock @@ -1493,16 +1493,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.0", + "version": "2.72.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b" + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", "shasum": "" }, "require": { @@ -1596,7 +1596,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T10:13:25+00:00" + "time": "2023-12-08T23:47:49+00:00" }, { "name": "paragonie/constant_time_encoding", diff --git a/lam/lib/3rdParty/composer/composer/installed.json b/lam/lib/3rdParty/composer/composer/installed.json index f378dc2b2..0a9f32ea7 100644 --- a/lam/lib/3rdParty/composer/composer/installed.json +++ b/lam/lib/3rdParty/composer/composer/installed.json @@ -1534,17 +1534,17 @@ }, { "name": "nesbot/carbon", - "version": "2.72.0", - "version_normalized": "2.72.0.0", + "version": "2.72.1", + "version_normalized": "2.72.1.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b" + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", "shasum": "" }, "require": { @@ -1572,7 +1572,7 @@ "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", "squizlabs/php_codesniffer": "^3.4" }, - "time": "2023-11-28T10:13:25+00:00", + "time": "2023-12-08T23:47:49+00:00", "bin": [ "bin/carbon" ], diff --git a/lam/lib/3rdParty/composer/composer/installed.php b/lam/lib/3rdParty/composer/composer/installed.php index 63b9c3732..f9fb401d5 100644 --- a/lam/lib/3rdParty/composer/composer/installed.php +++ b/lam/lib/3rdParty/composer/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '92d08dd3e39fe7c213a5d24d3d6ffd2f6df542f4', + 'reference' => '7a890fb7e62c4f6ccbbe0d502cd8708cadea0b90', 'type' => 'library', 'install_path' => __DIR__ . '/../../../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '92d08dd3e39fe7c213a5d24d3d6ffd2f6df542f4', + 'reference' => '7a890fb7e62c4f6ccbbe0d502cd8708cadea0b90', 'type' => 'library', 'install_path' => __DIR__ . '/../../../../', 'aliases' => array(), @@ -209,9 +209,9 @@ 'dev_requirement' => false, ), 'nesbot/carbon' => array( - 'pretty_version' => '2.72.0', - 'version' => '2.72.0.0', - 'reference' => 'a6885fcbad2ec4360b0e200ee0da7d9b7c90786b', + 'pretty_version' => '2.72.1', + 'version' => '2.72.1.0', + 'reference' => '2b3b3db0a2d0556a177392ff1a3bf5608fa09f78', 'type' => 'library', 'install_path' => __DIR__ . '/../nesbot/carbon', 'aliases' => array(), @@ -310,8 +310,8 @@ 'psr/http-client-implementation' => array( 'dev_requirement' => false, 'provided' => array( - 0 => '1.0', - 1 => '*', + 0 => '*', + 1 => '1.0', ), ), 'psr/http-factory' => array( diff --git a/lam/lib/3rdParty/composer/nesbot/carbon/readme.md b/lam/lib/3rdParty/composer/nesbot/carbon/readme.md index 380d66fc2..0b379713a 100644 --- a/lam/lib/3rdParty/composer/nesbot/carbon/readme.md +++ b/lam/lib/3rdParty/composer/nesbot/carbon/readme.md @@ -120,22 +120,26 @@ This project exists thanks to all the people who contribute. Support this project by becoming a sponsor. Your logo will show up here with a link to your website. -CasinoHex Canada -Casino-portugal.pt -Slots City -Probukmacher -Игровые автоматы -Онлайн казино -inkedin -Онлайн казино України -Non-GamStop Bets UK -Chudovo -UK Casino Gap -NZ Casino Deps -AzuraCast -Triplebyte -GitHub Sponsors -Salesforce +CasinoHex Canada +Casino-portugal.pt +Slots City +Probukmacher +Игровые автоматы +Онлайн казино +inkedin +Онлайн казино України +OnlineCasinosSpelen +Non-GamStop Bets UK +Chudovo +UK Casino Gap +NZ Casino Deps +NonStopCasino.org +Migliori Siti Non AAMS +UK NonGamStopCasinos +AzuraCast +Triplebyte +GitHub Sponsors +Salesforce [[Become a sponsor via OpenCollective](https://opencollective.com/Carbon#sponsor)] diff --git a/lam/lib/3rdParty/composer/nesbot/carbon/sponsors.php b/lam/lib/3rdParty/composer/nesbot/carbon/sponsors.php index b98ce64c0..8d6075859 100644 --- a/lam/lib/3rdParty/composer/nesbot/carbon/sponsors.php +++ b/lam/lib/3rdParty/composer/nesbot/carbon/sponsors.php @@ -74,7 +74,7 @@ function getOpenCollectiveSponsors(): string if ($monthlyContribution > 29) { $status = 'sponsor'; - } elseif ($monthlyContribution > 3 || $yearlyContribution > 20) { + } elseif ($monthlyContribution > 4.5 || $yearlyContribution > 29) { $status = 'backer'; } elseif ($member['totalAmountDonated'] > 0) { $status = 'helper'; @@ -99,7 +99,7 @@ function getOpenCollectiveSponsors(): string [$x, $y] = @getimagesize($src) ?: [0, 0]; $validImage = ($x && $y); $src = $validImage ? htmlspecialchars($src) : 'https://opencollective.com/static/images/default-guest-logo.svg'; - $height = 64; + $height = $member['status'] === 'sponsor' ? 64 : 48; $width = min(128, $validImage ? round($x * $height / $y) : $height); $href .= (strpos($href, '?') === false ? '?' : '&').'utm_source=opencollective&utm_medium=github&utm_campaign=Carbon'; $title = htmlspecialchars(($member['description'] ?? null) ?: $member['name']); diff --git a/lam/lib/3rdParty/composer/nesbot/carbon/src/Carbon/TranslatorImmutable.php b/lam/lib/3rdParty/composer/nesbot/carbon/src/Carbon/TranslatorImmutable.php index ad36c6704..ce6b2f90a 100644 --- a/lam/lib/3rdParty/composer/nesbot/carbon/src/Carbon/TranslatorImmutable.php +++ b/lam/lib/3rdParty/composer/nesbot/carbon/src/Carbon/TranslatorImmutable.php @@ -66,7 +66,7 @@ public function setTranslations($messages) /** * @codeCoverageIgnore */ - public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) + public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory): void { $this->disallowMutation(__METHOD__);