upgpkg: alps 2023.03.20-1

upstream release

3 files changed, 8 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbe44c14afee..e266bfc7f88d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = alps
 	pkgdesc = A simple and extensible webmail
-	pkgver = 2023.03.17
+	pkgver = 2023.03.20
 	pkgrel = 1
 	url = https://git.sr.ht/~migadu/alps
 	arch = i686
@@ -13,19 +13,17 @@ pkgbase = alps
 	depends = glibc
 	options = !lto
 	backup = etc/alps.conf
-	source = alps-2023.03.17.tar.gz::https://git.sr.ht/~migadu/alps/archive/eeedc9a387117ebb8cb9ee4d38eccbbf240783d0.tar.gz
+	source = alps-2023.03.20.tar.gz::https://git.sr.ht/~migadu/alps/archive/f1d00df4dda7a35651359b76bad34a9d1262994d.tar.gz
 	source = alps.conf
 	source = alps-system.service
 	source = alps-user.service
 	source = alps-plugins-path.patch
 	source = alps-themes-path.patch
-	source = alps-fix-156.patch
-	b2sums = 9d7bcfe02378a9ae5761fe7dca26e7365777c851ad9433ab46d9d83106c80704eb3b1c341b5edc454a7475b382113ef6f2fe7c1ec3a126f801574914d2c8e78e
+	b2sums = 35363b5be20f73743535aa1d8953041fce9459407d66d92fab66eea541d54e980b2c6a0535a4028d0cd3b209874fc5f28611d9e4fef49c2f5054942b29f26954
 	b2sums = 8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5
 	b2sums = 56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e
 	b2sums = a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c
 	b2sums = b3bc983fa8350e36ff176e882bf7b67cb5ba4c0863e70c9cb5c2bd78a0ee12504ae997dec44cb008e68ead14d08dd30ea33719f0a107b170d6906ee4d69f8e5d
 	b2sums = f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21
-	b2sums = d4120519c80efb2ae4ba486aaa02f1fa78520c004627ec86a816ba05bf8080ea7ea254337a54084eeab83f262a0887c2f83fee817a8df83d471bfd9853bb8264
 
 pkgname = alps
diff --git a/PKGBUILD b/PKGBUILD
index 8d72a7a8accf..6e13f188550a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
 
-_commit='eeedc9a387117ebb8cb9ee4d38eccbbf240783d0'
+_commit='f1d00df4dda7a35651359b76bad34a9d1262994d'
 pkgname=alps
-pkgver=2023.03.17
+pkgver=2023.03.20
 pkgrel=1
 pkgdesc='A simple and extensible webmail'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
@@ -17,20 +17,17 @@ source=("${pkgname}-${pkgver}.tar.gz::https://git.sr.ht/~migadu/${pkgname}/archi
         "${pkgname}-system.service"
         "${pkgname}-user.service"
         "${pkgname}-plugins-path.patch"
-        "${pkgname}-themes-path.patch"
-        "${pkgname}-fix-156.patch")
-b2sums=('9d7bcfe02378a9ae5761fe7dca26e7365777c851ad9433ab46d9d83106c80704eb3b1c341b5edc454a7475b382113ef6f2fe7c1ec3a126f801574914d2c8e78e'
+        "${pkgname}-themes-path.patch")
+b2sums=('35363b5be20f73743535aa1d8953041fce9459407d66d92fab66eea541d54e980b2c6a0535a4028d0cd3b209874fc5f28611d9e4fef49c2f5054942b29f26954'
         '8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5'
         '56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e'
         'a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c'
         'b3bc983fa8350e36ff176e882bf7b67cb5ba4c0863e70c9cb5c2bd78a0ee12504ae997dec44cb008e68ead14d08dd30ea33719f0a107b170d6906ee4d69f8e5d'
-        'f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21'
-        'd4120519c80efb2ae4ba486aaa02f1fa78520c004627ec86a816ba05bf8080ea7ea254337a54084eeab83f262a0887c2f83fee817a8df83d471bfd9853bb8264')
+        'f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21')
 
 prepare(){
   patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-plugins-path".patch
   patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-themes-path".patch
-  patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-fix-156".patch
 }
 
 build() {
diff --git a/alps-fix-156.patch b/alps-fix-156.patch
deleted file mode 100644
index 9172f9847b08..000000000000
--- a/alps-fix-156.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/plugins/base/imap.go	2022-05-08 10:19:23.329157653 +0200
-+++ b/plugins/base/imap.go	2022-05-08 10:23:38.878395784 +0200
-@@ -530,14 +530,23 @@
- 	}
- 
- 	ch := make(chan *imap.Message, 1)
--	if err := conn.UidFetch(seqSet, fetch, ch); err != nil {
--		return nil, nil, fmt.Errorf("failed to fetch message: %v", err)
--	}
-+	done := make(chan error, 1)
-+	go func() {
-+		done <- conn.UidFetch(seqSet, fetch, ch)
-+	}()
- 
-+	// There may be multiple FETCH data responses.
-+	// Keep the first message and discard the rest.
- 	msg := <-ch
- 	if msg == nil {
- 		return nil, nil, fmt.Errorf("server didn't return message")
- 	}
-+	for range ch {
-+	}
-+
-+	if err := <-done; err != nil {
-+		return nil, nil, fmt.Errorf("failed to fetch message: %v", err)
-+	}
- 
- 	body := msg.GetBody(&partHeaderSection)
- 	if body == nil {