Upgrade to version 5.13.22

2 files changed, 60 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index beec127fa8ba..065a1902e02e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = omada-controller
 	pkgdesc = Omada SDN Controller
-	pkgver = 5.12.7
-	pkgrel = 2
+	pkgver = 5.13.22
+	pkgrel = 1
 	url = https://www.tp-link.com/us/support/download/omada-software-controller/#Controller_Software
 	arch = x86_64
 	license = custom
@@ -12,10 +12,9 @@ pkgbase = omada-controller
 	depends = mongodb>=3
 	depends = mongodb<5
 	conflicts = omada-sdn-controller
-	noextract = Omada_SDN_Controller_v5.12.7_Linux_x64.deb
-	source = https://static.tp-link.com/upload/software/2023/202309/20230920/Omada_SDN_Controller_v5.12.7_Linux_x64.deb
+	source = https://static.tp-link.com/upload/software/2023/202312/20231201/Omada_SDN_Controller_v5.13.22_Linux_x64.tar.gz
 	source = git+http://github.com/murtuzaakhtari/omada-controller-scripts.git
-	sha256sums = 28a004ae360d68de463265b65b7335124fcf6be99f02e69047c2644f4c678aa0
+	sha256sums = 2d9539089e42648d5fdc29e55c0790f889462b131f6f64731ca416b93552328c
 	sha256sums = SKIP
 
 pkgname = omada-controller
diff --git a/PKGBUILD b/PKGBUILD
index ff25585ae103..a8d68cdb1a0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Richard Neumann aka. schard <mail at richard dash neumann period de>
 
 pkgname='omada-controller'
-pkgver=5.12.7
-pkgrel=2
+pkgver=5.13.22
+pkgrel=1
 pkgdesc='Omada SDN Controller'
 _basepkgname='Omada_SDN_Controller'
-_basepkgpath='upload/software/2023/202309/20230920'
+_basepkgpath='upload/software/2023/202312/20231201'
 _baseos='Linux_x64'
 arch=('x86_64')
 url='https://www.tp-link.com/us/support/download/omada-software-controller/#Controller_Software'
@@ -16,34 +16,64 @@ makedepends=('git')
 #provides=('sdn-controller')
 conflicts=('omada-sdn-controller')
 source=(
-    "https://static.tp-link.com/${_basepkgpath}/${_basepkgname}_v${pkgver}_${_baseos}.deb"
+    "https://static.tp-link.com/${_basepkgpath}/${_basepkgname}_v${pkgver}_${_baseos}.tar.gz"
     "git+http://github.com/murtuzaakhtari/omada-controller-scripts.git"
 )
-noextract=(${_basepkgname}_v${pkgver}_${_baseos}.deb)
-sha256sums=('28a004ae360d68de463265b65b7335124fcf6be99f02e69047c2644f4c678aa0'
+sha256sums=('2d9539089e42648d5fdc29e55c0790f889462b131f6f64731ca416b93552328c'
             'SKIP')
 
-prepare(){
-    mkdir -p tp_source
-    bsdtar -O -xf ${_basepkgname}_v${pkgver}_${_baseos}.deb data.tar.xz | bsdtar -C tp_source -xJf -
-}
 package() {
+    #cd ${pkgname}
+    cd ${_basepkgname}_v${pkgver}_linux_x64 
 
     # Install required source files.
-    local TP_SRC="tp_source/opt/tplink/EAPController"
-    local DEST="$pkgdir/opt/omada-controller"
-    install -dm 755 $DEST
-    install -Dm644 $TP_SRC/lib/* -t $DEST/lib
-    install -Dm755 $TP_SRC/bin/* -t $DEST/bin
-    install -Dm644 $TP_SRC/properties/* -t $DEST/properties
-
-    ln -sf /usr/bin/mongod "$DEST/bin/mongod"
-
-
-    # Install omada-controller-scripts.
-    local SCRIPT_SRC="$srcdir/omada-controller-scripts"
-    install -Dm644 $SCRIPT_SRC/omada-controller.service "$pkgdir/usr/lib/systemd/system/omada-controller.service"
-    install -Dm644 $SCRIPT_SRC/omada-controller.conf "$pkgdir/usr/lib/sysusers.d/omada-controller.conf"
-    install -Dm644 $SCRIPT_SRC/omada-init-user-dirs.hook "$pkgdir/usr/share/libalpm/hooks/omada-init-user-dirs.hook"
-    install -Dm755 $SCRIPT_SRC/omada-init-user-dirs.sh "$pkgdir/usr/share/libalpm/scripts/omada-init-user-dirs"
+    local BASEDIR="${pkgdir}/opt/omada-controller"
+    install -dm 755 "${BASEDIR}"
+
+    # Install JAR libraries.
+    install -dm 755 "${BASEDIR}/lib"
+
+    for file in lib/*; do
+        install -m 644 "${file}" "${BASEDIR}/lib/"
+    done
+
+    # Install binaries.
+    install -dm 755 "${BASEDIR}/bin"
+
+    for file in bin/*; do
+        install -m 755 "${file}" "${BASEDIR}/bin/"
+    done
+
+    # Install keystore. - keystore no longer available since version 5.3.1
+    #install -dm 755 "${BASEDIR}/keystore"
+
+    #for file in keystore/*; do
+    #    install -m 644 "${file}" "${BASEDIR}/keystore/"
+    #done
+
+    # Install *.properties config files.
+    install -dm 755 "${BASEDIR}/properties"
+
+    for file in properties/*; do
+        install -m 644 "${file}" "${BASEDIR}/properties/"
+    done
+
+    ln -sf /usr/bin/mongod "${BASEDIR}/bin/mongod"
+
+    ### Install scripts ####
+
+    # Install systemd units.
+    cd "${srcdir}/omada-controller-scripts"
+    install -dm 755 "${pkgdir}/usr/lib/systemd/system"
+    install -m 644 "omada-controller.service" "${pkgdir}/usr/lib/systemd/system/"
+
+    # Install sysusers configuration.
+    install -dm 755 "${pkgdir}/usr/lib/sysusers.d"
+    install -m 644 "omada-controller.conf" "${pkgdir}/usr/lib/sysusers.d/"
+
+    # Install ALPM hook and script.
+    install -dm 755 "${pkgdir}/usr/share/libalpm/hooks"
+    install -m 644 omada-init-user-dirs.hook "${pkgdir}/usr/share/libalpm/hooks/"
+    install -dm 755 "${pkgdir}/usr/share/libalpm/scripts"
+    install -m 755 omada-init-user-dirs.sh "${pkgdir}/usr/share/libalpm/scripts/omada-init-user-dirs"
 }