T.J. Townsend pushed to branch main at Arch Linux / Packaging / Packages / 
opensmtpd


Commits:
91d1f230 by T.J. Townsend at 2023-10-26T14:43:29-04:00
upgpkg: 7.4.0p0-3

fix man page installation paths and drop smtp user from the root group

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- opensmtpd.sysusers


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = opensmtpd
        pkgdesc = Free implementation of the server-side SMTP protocol
        pkgver = 7.4.0p0
-       pkgrel = 2
+       pkgrel = 3
        url = https://www.opensmtpd.org/
        install = opensmtpd.install
        arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = opensmtpd
        depends = openssl
        depends = pam
        depends = libxcrypt
+       depends = systemd
        depends = zlib
        optdepends = opensmtpd-filter-rspamd: rspamd integration
        provides = smtp-server
@@ -21,15 +22,17 @@ pkgbase = opensmtpd
        backup = etc/smtpd/smtpd.conf
        backup = etc/smtpd/aliases
        source = https://www.opensmtpd.org/archives/opensmtpd-7.4.0p0.tar.gz
+       source = https://github.com/OpenSMTPD/OpenSMTPD/commit/24258ecc02.patch
        source = 
opensmtpd-7.4.0p0.signify::https://www.opensmtpd.org//archives/opensmtpd-7.4.0p0.sum.sig
        source = opensmtpd-20181026.pub
        source = opensmtpd.sysusers
        source = smtpd.service
        source = smtpd.socket
        sha256sums = 
c181ccc3434a11e583619e00028520d457fe062e34dc03beea358078220ce374
+       sha256sums = 
5806c5c3751fdeb1e790af68060142b5cc40383f433d50eb1f2c8eb8f1d00d42
        sha256sums = 
bbdccb72eac8c713c1d24d6d48f3cfd8eb8ff7bf0f36e8b72bf389405c11dab7
        sha256sums = 
b74dca53567cd5070905a0a1acd77041805b6c0c4a0e1285830ea13654e1dcd5
-       sha256sums = 
b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13
+       sha256sums = 
29ef725c187462f279eebe86ed91343e8fc9b4db8d15c74ab7b4e1ae1c3130f3
        sha256sums = 
abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922
        sha256sums = 
32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8
 


=====================================
PKGBUILD
=====================================
@@ -6,12 +6,12 @@
 
 pkgname=opensmtpd
 pkgver=7.4.0p0
-pkgrel=2
+pkgrel=3
 pkgdesc="Free implementation of the server-side SMTP protocol"
 arch=(x86_64)
 url="https://www.opensmtpd.org/";
 license=(custom)
-depends=(libevent openssl pam libxcrypt zlib)
+depends=(libevent openssl pam libxcrypt systemd zlib)
 optdepends=('opensmtpd-filter-rspamd: rspamd integration')
 makedepends=(signify)
 provides=(smtp-server smtp-forwarder)
@@ -19,15 +19,17 @@ conflicts=(smtp-server smtp-forwarder)
 backup=(etc/smtpd/smtpd.conf etc/smtpd/aliases)
 options=(emptydirs)
 source=("https://www.opensmtpd.org/archives/${pkgname}-${pkgver}.tar.gz";
+        https://github.com/OpenSMTPD/OpenSMTPD/commit/24258ecc02.patch
         
${pkgname}-${pkgver}.signify::"${url}/archives/${pkgname}-${pkgver}.sum.sig"
         opensmtpd-20181026.pub
         opensmtpd.sysusers
         smtpd.service
         smtpd.socket)
 sha256sums=('c181ccc3434a11e583619e00028520d457fe062e34dc03beea358078220ce374'
+            '5806c5c3751fdeb1e790af68060142b5cc40383f433d50eb1f2c8eb8f1d00d42'
             'bbdccb72eac8c713c1d24d6d48f3cfd8eb8ff7bf0f36e8b72bf389405c11dab7'
             'b74dca53567cd5070905a0a1acd77041805b6c0c4a0e1285830ea13654e1dcd5'
-            'b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13'
+            '29ef725c187462f279eebe86ed91343e8fc9b4db8d15c74ab7b4e1ae1c3130f3'
             'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922'
             '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8')
 install=${pkgname}.install
@@ -37,7 +39,10 @@ prepare() {
            -x ${pkgname}-${pkgver}.signify \
               ${pkgname}-${pkgver}.tar.gz
 
-  sed -ri 's,/etc/mail,/etc/smtpd,g' 
${pkgname}-${pkgver}/usr.sbin/smtpd/smtpd.conf
+  cd ${pkgname}-${pkgver}
+  sed -ri 's,/etc/mail,/etc/smtpd,g' usr.sbin/smtpd/smtpd.conf
+  patch -Np1 -i ../24258ecc02.patch
+  autoreconf -vfi
 }
 
 build() {
@@ -71,7 +76,7 @@ package() {
   ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/newaliases
   ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/makemap
 
-  install -Dm644 etc/aliases -t  "${pkgdir}"/etc/smtpd/
+  install -Dm644 etc/aliases -t "${pkgdir}"/etc/smtpd/
 
   install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 


=====================================
opensmtpd.sysusers
=====================================
@@ -1,4 +1,3 @@
 u smtpd 91 "SMTP Daemon" -
 u smtpq 92 "SMTP Queue"  -
 
-m smtpd root



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/opensmtpd/-/commit/91d1f23096afb81d56a6b32d2a47ca5f27972caa

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/opensmtpd/-/commit/91d1f23096afb81d56a6b32d2a47ca5f27972caa
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to