From 207320bfcdb7122e0b02cd763faec5e1e25ae61b Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 13 Feb 2025 20:34:09 +0100
Subject: [PATCH] #268 added wunderbaum 0.12.0

---
 lam-packaging/debian/control    |  1 -
 lam-packaging/debian/postinst   |  6 -----
 lam-packaging/debian/rules      |  1 -
 lam-packaging/docker/Dockerfile |  1 -
 lam/sbom-libs.json              | 42 ++++++++++++++++-----------------
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control
index 69cbfc5fd..bf1077c1e 100644
--- a/lam-packaging/debian/control
+++ b/lam-packaging/debian/control
@@ -16,7 +16,6 @@ Depends: php (>= 8.1), php-ldap,
  libapache2-mod-php | libapache2-mod-fcgid | php-fpm,
  apache2 (>= 2.4.0) | httpd,
  gettext, fonts-dejavu,
- libjs-jquery-jstree (>= 3.3.0),
  php-phpseclib3, php-monolog,
  php-voku-portable-ascii (<< 3.0), libphp-phpmailer (<< 7.0),
  debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
index b9dde9f97..42c40455b 100755
--- a/lam-packaging/debian/postinst
+++ b/lam-packaging/debian/postinst
@@ -10,12 +10,6 @@ fi
 db_version 2.0 || [ $? -lt 30 ]
 
 # 3rd party libs
-jsThirdPartyLibs='jstree'
-for jsThirdPartyLib in $jsThirdPartyLibs; do
-	if [ ! -L /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} ] ; then
-		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
diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules
index b71120b4d..f386357a4 100755
--- a/lam-packaging/debian/rules
+++ b/lam-packaging/debian/rules
@@ -60,7 +60,6 @@ install:
 	install -D --mode=644 sess/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/sess/.htaccess
 	cp -r style debian/ldap-account-manager/usr/share/ldap-account-manager/
 	cp -r templates debian/ldap-account-manager/usr/share/ldap-account-manager/
-	rm -r debian/ldap-account-manager/usr/share/ldap-account-manager/templates/lib/extra/jstree
 
 	install -D --mode=755 lib/lamdaemon.pl debian/ldap-account-manager-lamdaemon/usr/share/ldap-account-manager/lib/lamdaemon.pl
 	install -D --mode=755 debian/README-lamdaemon.Debian debian/ldap-account-manager-lamdaemon/usr/share/doc/ldap-account-manager-lamdaemon/README.Debian
diff --git a/lam-packaging/docker/Dockerfile b/lam-packaging/docker/Dockerfile
index caffe4d6d..9f3ea5c8a 100644
--- a/lam-packaging/docker/Dockerfile
+++ b/lam-packaging/docker/Dockerfile
@@ -85,7 +85,6 @@ RUN apt-get install --no-install-recommends -y \
         wget \
         libldap-common \
         gettext \
-        libjs-jquery-jstree \
         php-phpseclib3 \
         php-voku-portable-ascii \
         libphp-phpmailer \
diff --git a/lam/sbom-libs.json b/lam/sbom-libs.json
index 72faec894..2ff3dec96 100644
--- a/lam/sbom-libs.json
+++ b/lam/sbom-libs.json
@@ -1,10 +1,10 @@
 {
   "bomFormat" : "CycloneDX",
   "specVersion" : "1.5",
-  "serialNumber" : "urn:uuid:1fe94969-44ff-4623-a3df-6fa83e6d6d7d",
+  "serialNumber" : "urn:uuid:556522a0-9eee-458f-823b-6192d17d1046",
   "version" : 1,
   "metadata" : {
-    "timestamp" : "2024-12-04T18:53:46Z",
+    "timestamp" : "2025-02-13T19:33:18Z",
     "tools" : [
       {
         "vendor" : "OWASP",
@@ -111,21 +111,6 @@
       "type" : "library",
       "bom-ref" : "b5831dd1-9cc8-4af8-9c56-2511e92b9f7e"
     },
-    {
-      "group" : "cdx:npm:package:bundled",
-      "name" : "jstree",
-      "version" : "3.3.16",
-      "licenses" : [
-        {
-          "license" : {
-            "id" : "MIT"
-          }
-        }
-      ],
-      "purl" : "pkg:npm/jstree@3.3.16",
-      "type" : "library",
-      "bom-ref" : "71b9c8ed-21a8-418b-a0a5-7fc886f4d7e7"
-    },
     {
       "group" : "cdx:npm:package:bundled",
       "name" : "sortablejs",
@@ -193,6 +178,21 @@
       "purl" : "pkg:npm/tippy.js@6.3.7",
       "type" : "library",
       "bom-ref" : "34edec4c-ebfc-48c9-92e0-917d8004e6b0"
+    },
+    {
+      "group" : "cdx:npm:package:bundled",
+      "name" : "wunderbaum",
+      "version" : "0.12.0",
+      "licenses" : [
+        {
+          "license" : {
+            "id" : "MIT"
+          }
+        }
+      ],
+      "purl" : "pkg:npm/wunderbaum@0.12.0",
+      "type" : "library",
+      "bom-ref" : "71b9c8ed-21a8-418b-a0a5-7fc886f4d7e7"
     }
   ],
   "dependencies" : [
@@ -224,10 +224,6 @@
       "ref" : "b5831dd1-9cc8-4af8-9c56-2511e92b9f7e",
       "dependsOn" : [ ]
     },
-    {
-      "ref" : "71b9c8ed-21a8-418b-a0a5-7fc886f4d7e7",
-      "dependsOn" : [ ]
-    },
     {
       "ref" : "394fe3c8-0e03-407a-96e2-2d3608e97265",
       "dependsOn" : [ ]
@@ -247,6 +243,10 @@
     {
       "ref" : "34edec4c-ebfc-48c9-92e0-917d8004e6b0",
       "dependsOn" : [ ]
+    },
+    {
+      "ref" : "71b9c8ed-21a8-418b-a0a5-7fc886f4d7e7",
+      "dependsOn" : [ ]
     }
   ]
 }
\ No newline at end of file