Skip to content

Commit

Permalink
Merge pull request #262 from LDAPAccountManager/bugfix/debienDeps
Browse files Browse the repository at this point in the history 
Bugfix/debien deps
  • Loading branch information
@gruberroland
gruberroland authored Dec 10, 2023
2 parents 80f505d + 1129aaa commit e78dad4
Show file tree
Hide file tree
Showing 12 changed files with 97 additions and 37 deletions.
4 changes: 4 additions & 0 deletions lam-packaging/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
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 <[email protected]> Tue, 05 Dec 2023 07:05:16 +0100

Expand Down
2 changes: 2 additions & 0 deletions lam-packaging/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +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-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
Expand Down
15 changes: 15 additions & 0 deletions lam-packaging/debian/postinst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ 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/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
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.*`
Expand Down
15 changes: 15 additions & 0 deletions lam-packaging/debian/postrm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,21 @@ 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/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
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
Expand Down
15 changes: 15 additions & 0 deletions lam-packaging/debian/preinst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,20 @@ 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/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
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#
5 changes: 5 additions & 0 deletions lam-packaging/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ 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/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
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/

Expand Down
10 changes: 5 additions & 5 deletions lam/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions lam/lib/3rdParty/composer/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
],
Expand Down
14 changes: 7 additions & 7 deletions lam/lib/3rdParty/composer/composer/installed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '92d08dd3e39fe7c213a5d24d3d6ffd2f6df542f4',
'reference' => '7a890fb7e62c4f6ccbbe0d502cd8708cadea0b90',
'type' => 'library',
'install_path' => __DIR__ . '/../../../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '92d08dd3e39fe7c213a5d24d3d6ffd2f6df542f4',
'reference' => '7a890fb7e62c4f6ccbbe0d502cd8708cadea0b90',
'type' => 'library',
'install_path' => __DIR__ . '/../../../../',
'aliases' => array(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(
Expand Down
Loading

0 comments on commit e78dad4

Please sign in to comment.