From 8a3333ce3dd18614ed209c4d96afffb81d141651 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sat, 13 Jan 2024 00:45:51 +0100
Subject: [PATCH] CT ddns ,gitea and mailbackup Updated dependencies/packages

*DDNS: switched ddclient from Edge repo to release repo

*gitea: added force install (PEP 668 skip)  for gitea-auto-update

*mailbackup: switched OfflineImap from PIP package to the apk one from the edge repo due to PEP 68 braking the install
---
 CT-Build/Alpine.yaml                        | 9 +++++----
 CT-Files/gitea/Scripts/Init.sh              | 2 +-
 CT-Files/mailbackup/Scripts/Init.sh         | 1 -
 CT-Files/mailbackup/Scripts/PTKAppUpdate.sh | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index 18a81cf..808c696 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -418,7 +418,7 @@ packages:
   
   #PKGS for Ddns
   - packages:
-    - ddclient@CommunityEdge
+    - ddclient
     #- perl-data-validate-ip@TestingEdge
     action: install
     variants:
@@ -547,8 +547,9 @@ packages:
     - php83-dom
     - php83-zip
     - php83-mbstring
-    - php-openssl
-    - py3-pip
+    - php83-openssl
+    - php83-ctype
+    - offlineimap@CommunityEdge
     - sudo
     - git
     action: install
@@ -649,7 +650,7 @@ packages:
       http://dl-4.alpinelinux.org/alpine/v{{ image.release }}/community
       #EndREPOS
       {% if image.variant == "NoExist" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %}
-      {% if image.variant == "ddns" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %}
+      {% if image.variant == "mailbackup" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %}
       {% if image.variant == "elkarbackupALP" %}@CommunityOldStable http://dl-4.alpinelinux.org/alpine/v3.15/community{% endif %}
 
 actions:
diff --git a/CT-Files/gitea/Scripts/Init.sh b/CT-Files/gitea/Scripts/Init.sh
index c763b46..b0e8344 100644
--- a/CT-Files/gitea/Scripts/Init.sh
+++ b/CT-Files/gitea/Scripts/Init.sh
@@ -3,7 +3,7 @@
 apiUrl=https://api.github.com/repos/go-gitea/gitea/releases/latest
 
 #install Update tool
-pip install install gitea-auto-update
+pip install --break-system-packages gitea-auto-update
 
 #Get latest gitea version info
 giteaver=$(python3 -c "import requests; print (requests.get('$apiUrl').json()['tag_name'])")
diff --git a/CT-Files/mailbackup/Scripts/Init.sh b/CT-Files/mailbackup/Scripts/Init.sh
index ef0ce0d..43a88a2 100644
--- a/CT-Files/mailbackup/Scripts/Init.sh
+++ b/CT-Files/mailbackup/Scripts/Init.sh
@@ -7,5 +7,4 @@ DistoBuilderINT=true ash /opt/Setup/MailBackup-sys/install.sh
 
 #cleanup
 rm -rf /opt/Setup/MailBackup-sys
-rm -f /opt/Setup/olim3.tar.gz
 rm -f /opt/Setup/rlcl.zip
\ No newline at end of file
diff --git a/CT-Files/mailbackup/Scripts/PTKAppUpdate.sh b/CT-Files/mailbackup/Scripts/PTKAppUpdate.sh
index 32a7660..a2d054c 100644
--- a/CT-Files/mailbackup/Scripts/PTKAppUpdate.sh
+++ b/CT-Files/mailbackup/Scripts/PTKAppUpdate.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 # Update script for updating apps with ProxmoxHelper/ProxMoxToolKit
-ash /opt/UpdateOfflineImap3.sh
 ash /opt/UpdateSnappyMail.sh
\ No newline at end of file