summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rawlinson2024-04-24 21:14:11 +0000
committerGeorge Rawlinson2024-04-24 21:14:11 +0000
commit9e1716de0089f805f114345e5b419cd1df49966f (patch)
tree024ec85ac6c424e69a1ebb6a89924720cb8763e6
parentb676a258ab38fecfa6a88b8ab6eb1c7250adbfd3 (diff)
downloadaur-9e1716de0089f805f114345e5b419cd1df49966f.tar.gz
upgpkg: 2.36.1-1
* New upstream release. * FTBFS (due to renamed file). * Switch to checksummed git tags. * Use SPDX license references. * Remove unnecessary patch. * Remove pkgver function.
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD19
-rw-r--r--update-package.json.patch11
3 files changed, 11 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a0d884d52006..1d9018d1be0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = snappymail
pkgdesc = A simple, modern & fast web-based email client
- pkgver = 2.32.0
+ pkgver = 2.36.1
pkgrel = 1
url = https://snappymail.eu
arch = any
- license = AGPL3
+ license = AGPL-3.0-or-later
makedepends = git
makedepends = nodejs
makedepends = yarn
@@ -16,13 +16,13 @@ pkgbase = snappymail
optdepends = mariadb: storage backend for contacts
optdepends = php-pgsql: storage backend for contacts
optdepends = php-sqlite: storage backend for contacts
- source = snappymail::git+https://github.com/the-djmaze/snappymail.git#commit=b2477f2ce3581fc8d03dc8494a5c8554bd05bc24
+ source = snappymail::git+https://github.com/the-djmaze/snappymail.git#tag=v2.36.1
source = sysusers.conf
source = tmpfiles.conf
- sha512sums = SKIP
+ sha512sums = 04ad79629233c07be51b3aafa1e76b5924de6ff2ef52efdc0d97d8c5c125ae7e078a946ed62c99c29405dc4b8a7a7aab7bef4fa8ea3595d7e89f157f494a2679
sha512sums = 5dc55dc3655bd2e075dfc69572cde967d4ec9b5ebe27807a893c1beaa681e1af8639a80e3c09d665ddb7a6f40475ae6ad951ca9a243d1533ad68783077a1d51a
sha512sums = 991dfdb415f2cff30107addf6fcf9349865a7d91a8e2f2c42b3d561541016f1af41f41aeec23300de8b3d9b75938f14dd073fd6daa245b5fcbcb9ca2166adb48
- b2sums = SKIP
+ b2sums = 138b4a9733141ca8d5add3870be41a174ddc6c485cdc5e9bfc36e5855a79825c327e232676d8f08613faae382aac287ec9fc1a2a9c5b584022891081e4aa21dc
b2sums = e020b2d4bc694ca056f5c15b148c69553ab610b5e1789f52543aa65e098f8097a41709b5b0fc22a6a01088a9d3f14d623b1b6e9ae2570acd4f380f429301c003
b2sums = be25b05d775ac4e88065e8018a1026b4c41a073639e59e6520818b7ca578cc93ac2120bd090caf1d255fade69a6680ca764b14cb32f6dd61c80b521d1b16f205
diff --git a/PKGBUILD b/PKGBUILD
index 40bc41edceb3..13c8396b2d0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: George Rawlinson <george@rawlinson.net.nz>
pkgname=snappymail
-pkgver=2.32.0
+pkgver=2.36.1
pkgrel=1
pkgdesc='A simple, modern & fast web-based email client'
arch=('any')
-license=('AGPL3')
+license=('AGPL-3.0-or-later')
url='https://snappymail.eu'
depends=('php-fpm' 'php-sodium')
makedepends=(
@@ -21,25 +21,18 @@ optdepends=(
'php-pgsql: storage backend for contacts'
'php-sqlite: storage backend for contacts'
)
-_commit='b2477f2ce3581fc8d03dc8494a5c8554bd05bc24'
source=(
- "$pkgname::git+https://github.com/the-djmaze/snappymail.git#commit=$_commit"
+ "$pkgname::git+https://github.com/the-djmaze/snappymail.git#tag=v$pkgver"
'sysusers.conf'
'tmpfiles.conf'
)
-sha512sums=('SKIP'
+sha512sums=('04ad79629233c07be51b3aafa1e76b5924de6ff2ef52efdc0d97d8c5c125ae7e078a946ed62c99c29405dc4b8a7a7aab7bef4fa8ea3595d7e89f157f494a2679'
'5dc55dc3655bd2e075dfc69572cde967d4ec9b5ebe27807a893c1beaa681e1af8639a80e3c09d665ddb7a6f40475ae6ad951ca9a243d1533ad68783077a1d51a'
'991dfdb415f2cff30107addf6fcf9349865a7d91a8e2f2c42b3d561541016f1af41f41aeec23300de8b3d9b75938f14dd073fd6daa245b5fcbcb9ca2166adb48')
-b2sums=('SKIP'
+b2sums=('138b4a9733141ca8d5add3870be41a174ddc6c485cdc5e9bfc36e5855a79825c327e232676d8f08613faae382aac287ec9fc1a2a9c5b584022891081e4aa21dc'
'e020b2d4bc694ca056f5c15b148c69553ab610b5e1789f52543aa65e098f8097a41709b5b0fc22a6a01088a9d3f14d623b1b6e9ae2570acd4f380f429301c003'
'be25b05d775ac4e88065e8018a1026b4c41a073639e59e6520818b7ca578cc93ac2120bd090caf1d255fade69a6680ca764b14cb32f6dd61c80b521d1b16f205')
-pkgver() {
- cd "$pkgname"
-
- git describe --tags | sed "s/^v//"
-}
-
prepare() {
# create folder for build output
mkdir -p build
@@ -53,7 +46,7 @@ prepare() {
# remove unnecessary $PATH variables
sed \
- -i snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php \
+ -i snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php \
-e '/\(\/sw\/bin\|local\/bin\)/d'
}
diff --git a/update-package.json.patch b/update-package.json.patch
deleted file mode 100644
index 0a0315744eb5..000000000000
--- a/update-package.json.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -3,7 +3,7 @@
- "title": "SnappyMail",
- "description": "Simple, modern & fast web-based email client",
- "private": true,
-- "version": "2.24.3",
-+ "version": "2.24.4",
- "homepage": "https://snappymail.eu",
- "author": {
- "name": "DJ Maze",