From 6cae3a7437fc3ceb17c5b543294af27f52b60388 Mon Sep 17 00:00:00 2001 From: Joey Dumont Date: Wed, 10 Jul 2024 21:10:42 -0400 Subject: [PATCH] upgpkg: duplicati-canary-bin 2.0.9.101-1 upstream release --- .SRCINFO | 19 +++++++-------- PKGBUILD | 53 ++++++++++++++++++++++++++++++------------ duplicati-user.service | 2 +- duplicati.install | 10 ++++++++ duplicati.service | 2 +- 5 files changed, 58 insertions(+), 28 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index db722e1be366b..b40c5a317c37a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,39 +1,36 @@ pkgbase = duplicati-canary-bin pkgdesc = A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers - pkgver = 2.0.7.103 + pkgver = 2.0.9.101 pkgrel = 1 url = http://duplicati.com install = duplicati.install - arch = i686 arch = x86_64 arch = aarch64 - arch = armv7h license = MIT makedepends = unzip depends = openssl-1.1 depends = gtk-sharp-2 - depends = mono depends = libappindicator-gtk2 optdepends = notify-sharp: for tray notifications provides = duplicati conflicts = duplicati-latest conflicts = duplicati replaces = duplicati-latest - noextract = duplicati-2.0.7.103_canary_2024-04-19.zip + noextract = duplicati-canary-bin-2.0.9.101.zip backup = etc/default/duplicati - source = https://github.com/duplicati/duplicati/releases/download/v2.0.7.103-2.0.7.103_canary_2024-04-19/duplicati-2.0.7.103_canary_2024-04-19.zip source = duplicati-user.service source = duplicati.service source = duplicati.sysusers source = duplicati.tmpfiles.conf - source = duplicati-cli source = duplicati.env - sha256sums = 3305708527a7bce7228adcaf642a7c3b525479ea7a4674bc4dd833fe40996cb8 - sha256sums = 5e47acfb251e0fbe4c01bd75ba88a78c497208bf767addb59010baea049dd19f - sha256sums = 0722036feafb16a229f905744722619921050b9b148046aafd8f3c1b16241b3b + sha256sums = 388c20c8739bcbdb9109cdcc9387055392db74a3a095fbef79336a7c1edd150f + sha256sums = 61429ead4171924b8ed293ebd8634cc858adfea7648d714241196b7fa80a38c3 sha256sums = b9389b399467f3e02aa8e76bb98f6efbca1166fbc4d0bdf939493f8403462959 sha256sums = b6ca3d280feb753ded94bb44eef821a0dac0c0c7ed7f37dea76d445a64386c86 - sha256sums = 4a4118c73249278d78bec9b46ca9562194c3fe97fa4aa653649c29988cb7e187 sha256sums = 99591e96c340b49b47341315cb42f8ac12ca66dc4d22550e4acd37cce84e8b36 + source_x86_64 = duplicati-canary-bin-2.0.9.101.zip::https://github.com/duplicati/duplicati/releases/download/v2.0.9.101_canary_2024-06-27/duplicati-2.0.9.101_canary_2024-06-27-linux-x64-gui.zip + sha256sums_x86_64 = f269fd5e578577e46818034e426d0b7580c8490500cb8f1a72889b22f9aa8e4b + source_aarch64 = duplicati-canary-bin-2.0.9.101.zip::https://github.com/duplicati/duplicati/releases/download/v2.0.9.101_canary_2024-06-27/duplicati-2.0.9.101_canary_2024-06-27-linux-arm64-gui.zip + sha256sums_aarch64 = f269fd5e578577e46818034e426d0b7580c8490500cb8f1a72889b22f9aa8e4b pkgname = duplicati-canary-bin diff --git a/PKGBUILD b/PKGBUILD index d7bdd8852481b..f17fdccb4b5de 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,39 +4,52 @@ # aarch64 tester: Irissman # armv7h tester: kauron pkgname=duplicati-canary-bin -pkgver=2.0.7.103 +pkgver=2.0.9.101 pkgrel=1 -_date=2024-04-19 +_date=2024-06-27 _branch=canary pkgdesc="A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers" url="http://duplicati.com" license=('MIT') install=duplicati.install source=( - # https://updates.duplicati.com/${_branch}/duplicati-${pkgver}_${_branch}_${_date}.zip # duplicati.com seems to be blocked in Russia, see https://aur.archlinux.org/packages/duplicati-latest/#comment-746652 - "https://github.com/duplicati/duplicati/releases/download/v${pkgver}-${pkgver}_${_branch}_${_date}/duplicati-${pkgver}_${_branch}_${_date}.zip" +# "https://updates.duplicati.com/${_branch}/${pkgver}_${_branch}_${_date}.zip" # duplicati.com seems to be blocked in Russia, see https://aur.archlinux.org/packages/duplicati-latest/#comment-746652 + #"https://github.com/duplicati/duplicati/releases/download/v${pkgver}-${pkgver}_${_branch}_${_date}/duplicati-${pkgver}_${_branch}_${_date}.zip" duplicati-user.service duplicati.service duplicati.sysusers duplicati.tmpfiles.conf - duplicati-cli duplicati.env ) + +source_x86_64=( + "${pkgname}-${pkgver}.zip::https://github.com/duplicati/duplicati/releases/download/v${pkgver}_${_branch}_${_date}/duplicati-${pkgver}_${_branch}_${_date}-linux-x64-gui.zip" +) + +source_aarch64=( + "${pkgname}-${pkgver}.zip::https://github.com/duplicati/duplicati/releases/download/v${pkgver}_${_branch}_${_date}/duplicati-${pkgver}_${_branch}_${_date}-linux-arm64-gui.zip" +) + noextract=( - "duplicati-${pkgver}_${_branch}_${_date}.zip" - ) + "${pkgname}-${pkgver}.zip" +) + backup=( etc/default/duplicati ) -sha256sums=('3305708527a7bce7228adcaf642a7c3b525479ea7a4674bc4dd833fe40996cb8' - '5e47acfb251e0fbe4c01bd75ba88a78c497208bf767addb59010baea049dd19f' - '0722036feafb16a229f905744722619921050b9b148046aafd8f3c1b16241b3b' + +sha256sums=('388c20c8739bcbdb9109cdcc9387055392db74a3a095fbef79336a7c1edd150f' + '61429ead4171924b8ed293ebd8634cc858adfea7648d714241196b7fa80a38c3' 'b9389b399467f3e02aa8e76bb98f6efbca1166fbc4d0bdf939493f8403462959' 'b6ca3d280feb753ded94bb44eef821a0dac0c0c7ed7f37dea76d445a64386c86' - '4a4118c73249278d78bec9b46ca9562194c3fe97fa4aa653649c29988cb7e187' '99591e96c340b49b47341315cb42f8ac12ca66dc4d22550e4acd37cce84e8b36') -arch=('i686' 'x86_64' 'aarch64' 'armv7h') -depends=(openssl-1.1 gtk-sharp-2 mono libappindicator-gtk2) +sha256sums_x86_64=('f269fd5e578577e46818034e426d0b7580c8490500cb8f1a72889b22f9aa8e4b') +sha256sums_aarch64=('f269fd5e578577e46818034e426d0b7580c8490500cb8f1a72889b22f9aa8e4b') + + + +arch=('x86_64' 'aarch64') +depends=(openssl-1.1 gtk-sharp-2 libappindicator-gtk2) makedepends=(unzip) optdepends=('notify-sharp: for tray notifications') replaces=(duplicati-latest) @@ -54,9 +67,19 @@ package() { # Install the CLI wrapper. mkdir -p "${pkgdir}/usr/bin" - install -D -m755 duplicati-cli "${pkgdir}/usr/bin" + # Install the program. mkdir -p "${pkgdir}"/opt/duplicati - unzip -a "duplicati-${pkgver}_${_branch}_${_date}.zip" -d "${pkgdir}"/opt/duplicati + + # Unzip doesn't have --strip-components=1, see + # https://superuser.com/questions/518347/equivalent-to-tars-strip-components-1-in-unzip + local DEST="${pkgdir}/opt/duplicati" + unzip -d "${DEST}" "${pkgname}-${pkgver}.zip" && f=("$DEST"/*) && mv "$DEST"/*/* "$DEST" && rmdir "${f[@]}" + + # Symlink the CLI + mkdir -p "${pkgdir}/usr/bin" + ln -s /opt/duplicati/duplicati-cli "${pkgdir}/usr/bin/duplicati-cli" + } + diff --git a/duplicati-user.service b/duplicati-user.service index 7e716d060a87e..4eee14f6663db 100644 --- a/duplicati-user.service +++ b/duplicati-user.service @@ -3,7 +3,7 @@ Description=Duplicati [Service] ExecStartPre=/usr/bin/sleep 5 -ExecStart=/usr/bin/mono /opt/duplicati/Duplicati.GUI.TrayIcon.exe --webservice-port=8200 +ExecStart=/opt/duplicati/duplicati --webservice-port=8200 Restart=on-abort Environment=AUTOUPDATER_Duplicati_SKIP_UPDATE=1 diff --git a/duplicati.install b/duplicati.install index 27f982c50efbd..daf40695061eb 100644 --- a/duplicati.install +++ b/duplicati.install @@ -51,6 +51,16 @@ EOF * /opt/duplicati, so please update any scripts that referred to the installation * directory directly. +EOF + fi + + if [ $(vercmp $2 2.0.9.101-1) -lt 0 ]; then + cat <