From 1c7203e115ae723d56518a7d114b2a782d76c63a Mon Sep 17 00:00:00 2001
From: Dan Lorenc <dlorenc@chainguard.dev>
Date: Thu, 29 Jun 2023 21:15:50 -0400
Subject: [PATCH] Fix guacd telnet and vnc plugins.

Signed-off-by: Dan Lorenc <dlorenc@chainguard.dev>
---
 guacamole-server.yaml | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/guacamole-server.yaml b/guacamole-server.yaml
index 8dbdcefe091..89b74dedb96 100644
--- a/guacamole-server.yaml
+++ b/guacamole-server.yaml
@@ -1,7 +1,7 @@
 package:
   name: guacamole-server
   version: 1.5.2
-  epoch: 1
+  epoch: 2
   description: clientless remote desktop gateway server
   copyright:
     - license: Apache-2.0
@@ -30,6 +30,15 @@ environment:
       - expat-dev
       - libxft-dev
       - fribidi-dev
+      - libssh2
+      - libssh2-dev
+
+data:
+  - name: libs
+    items:
+      vnc: vnc
+      telnet: telnet
+      ssh: ssh
 
 pipeline:
   - uses: fetch
@@ -62,24 +71,21 @@ subpackages:
     pipeline:
       - uses: split/manpages
 
-  - name: guacamole-server-dev
-    description: guacamole-server development files
-    pipeline:
-      - uses: split/dev
-
-  - name: libguac-client-vnc
-    description: guacamole-server VNC client plugin
+  - range: libs
+    name: libguac-client-${{range.key}}
+    description: guacamole-server ${{range.key}} client plugin
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/lib
-          mv ${{targets.destdir}}/usr/lib/libguac-client-vnc.so.* ${{targets.subpkgdir}}/usr/lib/
+          # grab the plugin itself, renaming it to libguac-client-foo.so
+          mv ${{targets.destdir}}/usr/lib/libguac-client-${{range.key}}.so.0.0.0 ${{targets.subpkgdir}}/usr/lib/libguac-client-${{range.key}}.so
+          # remove the unnecessary symlinks generated by libtool
+          rm -f ${{targets.destdir}}/usr/lib/libguac-client-${{range.key}}.*
 
-  - name: libguac-client-telnet
-    description: guacamole-server Telnet client plugin
+  - name: guacamole-server-dev
+    description: guacamole-server development files
     pipeline:
-      - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib
-          mv ${{targets.destdir}}/usr/lib/libguac-client-telnet.so.* ${{targets.subpkgdir}}/usr/lib/
+      - uses: split/dev
 
 update:
   enabled: true