From 84b66174f9489ab058542e554b96aac33411bc13 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 26 Oct 2023 07:39:26 +0200
Subject: fetchmail: synched with the upstream package

---
 archlinuxaba/fetchmail/PKGBUILD           | 15 ++++++++-------
 archlinuxaba/fetchmail/fetchmail.service  |  2 +-
 archlinuxaba/fetchmail/fetchmail.tmpfiles |  1 +
 archlinuxaba/fetchmail/fetchmail@.service | 11 +++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 archlinuxaba/fetchmail/fetchmail@.service

diff --git a/archlinuxaba/fetchmail/PKGBUILD b/archlinuxaba/fetchmail/PKGBUILD
index 272054a..1e9c591 100644
--- a/archlinuxaba/fetchmail/PKGBUILD
+++ b/archlinuxaba/fetchmail/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 
 pkgname=fetchmail
-pkgver=6.4.36
-pkgrel=1.3
+pkgver=6.4.37
+pkgrel=1.0
 pkgdesc="A remote-mail retrieval utility"
 arch=('i486' 'i686' 'pentium4' 'x86_64')
-url="http://www.fetchmail.info"
+url='https://www.fetchmail.info'
 license=('GPL')
 _pinned_dependencies=(
   'glibc>=2.31'
-  'openssl=3.1.3'
+  'openssl=3.1.4'
 )
 depends=("${_pinned_dependencies[@]}")
 makedepends=('python')
@@ -18,11 +18,11 @@ optdepends=('tk: for using fetchmailconf'
 options=('!makeflags')
 source=("https://sourceforge.net/projects/fetchmail/files/branch_${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
         'disable-sslv3.patch' 'fetchmail.tmpfiles' 'fetchmail.sysusers' 'fetchmail.service')
-sha512sums=('c9658f7b79de5e4f1dcaee4eee9b3a0039295e9dff8be1fb6c4ad0c3513b9c2bd14dce58e9cbca974716dd805621c83948168659345c7c190f3cb6f06b544b5d'
+sha512sums=('99a620380d9bd0713d76495f587adbcc95fc16e5fcb048dc528f3039ebd8fcfbb1e2f44e10fc25f70e50940ce89922ff39f1f3d724d1f47a8d4918a37c07d8d0'
             '1425f3655c8fe7c6ca32b6fc876fd7f0ecfb24a86f63d9ee123fe710ebbdd8fbf5b5ef0f1831cd9702de56cc707a2361a427cf2ed840b63a39beda71a18dfba3'
-            'f6e3eb409a1d88bcfb02012491fdbbf859803dbee45998879525fd35a2377bae95504da8aafcb24bcc2e695e15c96f6ec6f7e6521d28012370a4ec5e2a25a351'
+            '19ee984b92ea2025a9895b0e3be6cda1960c605c5966a89a379435e6265c9c198a24240c7f825a41df51ead49830a9a1a0b669796c2f920ca6d93acfd69e53b9'
             'c1169c54b70be53e3093d65a2d0f1e251fadf24a8008484583d79dd3cedea13782137c0db5f9052b2d02fdbd6bd0fdcb78c6403fe39926ac636b45a44d452b29'
-            '49c2843ddb06f587611f838bc9dab3fe04af991d70c27f8ffdd6351d8d6401683a356a03401e232a53e44ee43f6d85aa520f233f256974d07972913145fdf0f5')
+            'e9561b592838a7c85f1421a64408713dd195d7734e8e7ea41176b48b82c69853492bf3341cf2cc8a1da0b034e3b596993e38254c11692297c7e53790f837bb36')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -39,6 +39,7 @@ package() {
   install -D -m644 fetchmail.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/fetchmail.conf
   install -D -m644 fetchmail.sysusers "${pkgdir}"/usr/lib/sysusers.d/fetchmail.conf
   install -D -m644 fetchmail.service "${pkgdir}"/usr/lib/systemd/system/fetchmail.service
+  install -D -m644 fetchmail@.service "${pkgdir}"/usr/lib/systemd/system/fetchmail@.service
 
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
diff --git a/archlinuxaba/fetchmail/fetchmail.service b/archlinuxaba/fetchmail/fetchmail.service
index 64c1182..ca8f16a 100644
--- a/archlinuxaba/fetchmail/fetchmail.service
+++ b/archlinuxaba/fetchmail/fetchmail.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 User=fetchmail
-ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc
+ExecStart=/usr/bin/fetchmail --pidfile /run/fetchmail/fetchmailrc.pid -f /etc/fetchmailrc -d 900
 RestartSec=1
 
 [Install]
diff --git a/archlinuxaba/fetchmail/fetchmail.tmpfiles b/archlinuxaba/fetchmail/fetchmail.tmpfiles
index 07945f8..458ac22 100644
--- a/archlinuxaba/fetchmail/fetchmail.tmpfiles
+++ b/archlinuxaba/fetchmail/fetchmail.tmpfiles
@@ -1 +1,2 @@
 d /run/fetchmail 700 fetchmail nobody
+d /var/lib/fetchmail 755 fetchmail nobody
diff --git a/archlinuxaba/fetchmail/fetchmail@.service b/archlinuxaba/fetchmail/fetchmail@.service
new file mode 100644
index 0000000..afda8f5
--- /dev/null
+++ b/archlinuxaba/fetchmail/fetchmail@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A remote-mail retrieval utility
+After=network.target
+
+[Service]
+User=fetchmail
+ExecStart=/usr/bin/fetchmail --pidfile /run/fetchmail/fetchmailrc.%I.pid -f /etc/fetchmailrc.%I -d 900
+RestartSec=1
+
+[Install]
+Alias=multi-user.target.wants/fetchmail@%i.service
-- 
cgit v1.2.3-54-g00ecf