Date: Thursday, June 4, 2020 @ 18:24:25 Author: archange Revision: 639025
archrelease: copy trunk to community-x86_64 Added: opensmtpd/repos/community-x86_64/PKGBUILD (from rev 639024, opensmtpd/trunk/PKGBUILD) opensmtpd/repos/community-x86_64/opensmtpd.install (from rev 639024, opensmtpd/trunk/opensmtpd.install) opensmtpd/repos/community-x86_64/opensmtpd.sysusers (from rev 639024, opensmtpd/trunk/opensmtpd.sysusers) opensmtpd/repos/community-x86_64/smtpd.service (from rev 639024, opensmtpd/trunk/smtpd.service) opensmtpd/repos/community-x86_64/smtpd.socket (from rev 639024, opensmtpd/trunk/smtpd.socket) Deleted: opensmtpd/repos/community-x86_64/PKGBUILD opensmtpd/repos/community-x86_64/opensmtpd.install opensmtpd/repos/community-x86_64/opensmtpd.sysusers opensmtpd/repos/community-x86_64/smtpd.service opensmtpd/repos/community-x86_64/smtpd.socket --------------------+ PKGBUILD | 142 +++++++++++++++++++++++++-------------------------- opensmtpd.install | 19 +++--- opensmtpd.sysusers | 8 +- smtpd.service | 22 +++---- smtpd.socket | 16 ++--- 5 files changed, 104 insertions(+), 103 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-06-04 18:23:57 UTC (rev 639024) +++ PKGBUILD 2020-06-04 18:24:25 UTC (rev 639025) @@ -1,71 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Maintainer: Bruno Pagani <archa...@archlinux.org> -# Contributor: Sébastien Luttringer -# Contributor: parchd <par...@archlinux.info> - -pkgname=opensmtpd -pkgver=6.7.1p1 -pkgrel=3 -pkgdesc="Free implementation of the server-side SMTP protocol" -arch=(x86_64) -url="https://www.opensmtpd.org/" -license=(custom) -depends=(libasr libevent libressl pam) -optdepends=('opensmtpd-filter-rspamd: rspamd integration') -provides=(smtp-server smtp-forwarder) -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" - opensmtpd.sysusers - smtpd.service - smtpd.socket) -sha256sums=('7478e918b41e734a39ad082df55cb2607f0933a506fab2c3dd3554a95cdf08ca' - 'b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13' - 'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922' - '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8') -install=${pkgname}.install - -prepare() { - sed -ri 's,/etc/mail,/etc/smtpd,g' ${pkgname}-${pkgver}/smtpd/smtpd.conf -} - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/smtpd \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/smtpd \ - --with-path-mbox=/var/spool/mail \ - --with-path-empty=/var/empty \ - --with-path-socket=/run \ - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ - --with-user-smtpd=smtpd \ - --with-user-queue=smtpq \ - --with-group-queue=smtpq \ - --with-auth-pam \ - --with-cflags='-I/usr/include/libressl -L/usr/lib/libressl -Wl,-rpath=/usr/lib/libressl' - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install SMTPD_QUEUE_USER=92 - - ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/sendmail - ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/mailq - 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 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/ - - install -Dm644 ../smtpd.service -t "${pkgdir}"/usr/lib/systemd/system/ - install -Dm644 ../smtpd.socket -t "${pkgdir}"/usr/lib/systemd/system/ - install -Dm644 ../opensmtpd.sysusers "${pkgdir}"/usr/lib/sysusers.d/opensmtpd.conf -} Copied: opensmtpd/repos/community-x86_64/PKGBUILD (from rev 639024, opensmtpd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-06-04 18:24:25 UTC (rev 639025) @@ -0,0 +1,71 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: parchd <par...@archlinux.info> + +pkgname=opensmtpd +pkgver=6.7.1p1 +pkgrel=4 +pkgdesc="Free implementation of the server-side SMTP protocol" +arch=(x86_64) +url="https://www.opensmtpd.org/" +license=(custom) +depends=(libasr libevent libressl pam) +optdepends=('opensmtpd-filter-rspamd: rspamd integration') +provides=(smtp-server smtp-forwarder) +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" + opensmtpd.sysusers + smtpd.service + smtpd.socket) +sha256sums=('7478e918b41e734a39ad082df55cb2607f0933a506fab2c3dd3554a95cdf08ca' + 'b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13' + 'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922' + '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8') +install=${pkgname}.install + +prepare() { + sed -ri 's,/etc/mail,/etc/smtpd,g' ${pkgname}-${pkgver}/smtpd/smtpd.conf +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/smtpd \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/smtpd \ + --with-path-mbox=/var/spool/mail \ + --with-path-empty=/var/empty \ + --with-path-socket=/run \ + --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ + --with-user-smtpd=smtpd \ + --with-user-queue=smtpq \ + --with-group-queue=smtpq \ + --with-auth-pam \ + --with-cflags='-I/usr/include/libressl -L/usr/lib/libressl -Wl,-rpath=/usr/lib/libressl' + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install SMTPD_QUEUE_USER=92 + + ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/sendmail + ln -s /usr/bin/smtpctl "${pkgdir}"/usr/bin/mailq + 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 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/ + + install -Dm644 ../smtpd.service -t "${pkgdir}"/usr/lib/systemd/system/ + install -Dm644 ../smtpd.socket -t "${pkgdir}"/usr/lib/systemd/system/ + install -Dm644 ../opensmtpd.sysusers "${pkgdir}"/usr/lib/sysusers.d/opensmtpd.conf +} Deleted: opensmtpd.install =================================================================== --- opensmtpd.install 2020-06-04 18:23:57 UTC (rev 639024) +++ opensmtpd.install 2020-06-04 18:24:25 UTC (rev 639025) @@ -1,9 +0,0 @@ -post_install() { - # Fix ownership of smtpctl for old systems - systemd-sysusers /usr/lib/sysusers.d/opensmtpd.conf - chgrp smtpq /usr/bin/smtpctl -} - -post_upgrade() { - post_install -} Copied: opensmtpd/repos/community-x86_64/opensmtpd.install (from rev 639024, opensmtpd/trunk/opensmtpd.install) =================================================================== --- opensmtpd.install (rev 0) +++ opensmtpd.install 2020-06-04 18:24:25 UTC (rev 639025) @@ -0,0 +1,10 @@ +post_install() { + # Fix ownership of smtpctl for old systems + systemd-sysusers /usr/lib/sysusers.d/opensmtpd.conf + chgrp smtpq /usr/bin/smtpctl + chmod 2555 /usr/bin/smtpctl +} + +post_upgrade() { + post_install +} Deleted: opensmtpd.sysusers =================================================================== --- opensmtpd.sysusers 2020-06-04 18:23:57 UTC (rev 639024) +++ opensmtpd.sysusers 2020-06-04 18:24:25 UTC (rev 639025) @@ -1,4 +0,0 @@ -u smtpd 91 "SMTP Daemon" - -u smtpq 92 "SMTP Queue" - - -m smtpd root Copied: opensmtpd/repos/community-x86_64/opensmtpd.sysusers (from rev 639024, opensmtpd/trunk/opensmtpd.sysusers) =================================================================== --- opensmtpd.sysusers (rev 0) +++ opensmtpd.sysusers 2020-06-04 18:24:25 UTC (rev 639025) @@ -0,0 +1,4 @@ +u smtpd 91 "SMTP Daemon" - +u smtpq 92 "SMTP Queue" - + +m smtpd root Deleted: smtpd.service =================================================================== --- smtpd.service 2020-06-04 18:23:57 UTC (rev 639024) +++ smtpd.service 2020-06-04 18:24:25 UTC (rev 639025) @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSMTPD -Requires=network-online.target -After=network-online.target - -[Service] -Type=forking -ExecStart=/usr/bin/smtpd - -[Install] -WantedBy=multi-user.target Copied: opensmtpd/repos/community-x86_64/smtpd.service (from rev 639024, opensmtpd/trunk/smtpd.service) =================================================================== --- smtpd.service (rev 0) +++ smtpd.service 2020-06-04 18:24:25 UTC (rev 639025) @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSMTPD +Requires=network-online.target +After=network-online.target + +[Service] +Type=forking +ExecStart=/usr/bin/smtpd + +[Install] +WantedBy=multi-user.target Deleted: smtpd.socket =================================================================== --- smtpd.socket 2020-06-04 18:23:57 UTC (rev 639024) +++ smtpd.socket 2020-06-04 18:24:25 UTC (rev 639025) @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSMTPD Socket - -[Socket] -ListenStream=/run/smtpd.sock - -[Install] -WantedBy=sockets.target Copied: opensmtpd/repos/community-x86_64/smtpd.socket (from rev 639024, opensmtpd/trunk/smtpd.socket) =================================================================== --- smtpd.socket (rev 0) +++ smtpd.socket 2020-06-04 18:24:25 UTC (rev 639025) @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSMTPD Socket + +[Socket] +ListenStream=/run/smtpd.sock + +[Install] +WantedBy=sockets.target