[arch-commits] Commit in opensmtpd/repos/community-x86_64 (8 files)
Eli Schwartz
eschwartz at archlinux.org
Wed Jan 10 01:25:59 UTC 2018
Date: Wednesday, January 10, 2018 @ 01:25:58
Author: eschwartz
Revision: 280801
archrelease: copy trunk to community-x86_64
Added:
opensmtpd/repos/community-x86_64/PKGBUILD
(from rev 280800, opensmtpd/trunk/PKGBUILD)
opensmtpd/repos/community-x86_64/opensmtpd.sysusers
(from rev 280800, opensmtpd/trunk/opensmtpd.sysusers)
opensmtpd/repos/community-x86_64/smtpd.service
(from rev 280800, opensmtpd/trunk/smtpd.service)
opensmtpd/repos/community-x86_64/smtpd.socket
(from rev 280800, opensmtpd/trunk/smtpd.socket)
Deleted:
opensmtpd/repos/community-x86_64/PKGBUILD
opensmtpd/repos/community-x86_64/opensmtpd.install
opensmtpd/repos/community-x86_64/smtpd.service
opensmtpd/repos/community-x86_64/smtpd.socket
--------------------+
PKGBUILD | 138 +++++++++++++++++++++++++--------------------------
opensmtpd.install | 26 ---------
opensmtpd.sysusers | 4 +
smtpd.service | 22 ++++----
smtpd.socket | 16 ++---
5 files changed, 93 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-10 01:25:20 UTC (rev 280800)
+++ PKGBUILD 2018-01-10 01:25:58 UTC (rev 280801)
@@ -1,68 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Sébastien Luttringer
-# Contributor: parchd <parchd at archlinux.info>
-
-pkgname=opensmtpd
-pkgver=6.0.2p1
-pkgrel=6
-pkgdesc='Free implementation of the server-side SMTP protocol'
-arch=('i686' 'x86_64')
-url='http://www.opensmtpd.org/'
-license=('custom')
-depends=('libasr' 'libevent' 'openssl-1.0' 'pam')
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
-backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
-options=('emptydirs')
-install=opensmtpd.install
-source=("https://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
- 'smtpd.service'
- 'smtpd.socket')
-sha256sums=('2af9b6d08784c7e546bf124bb61e311a6aa0c9835507710a76f5c242383190ac'
- 'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922'
- '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8')
-
-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-libssl='/usr/lib/openssl-1.0' \
- --with-cflags='-I/usr/include/openssl-1.0'
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- 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 license and systemd unit files
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm644 "$srcdir/smtpd.service" "$pkgdir/usr/lib/systemd/system/smtpd.service"
- install -Dm644 "$srcdir/smtpd.socket" "$pkgdir/usr/lib/systemd/system/smtpd.socket"
-
- # install an empty aliases file (used by the default config)
- install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
-}
Copied: opensmtpd/repos/community-x86_64/PKGBUILD (from rev 280800, opensmtpd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-10 01:25:58 UTC (rev 280801)
@@ -0,0 +1,70 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Sébastien Luttringer
+# Contributor: parchd <parchd at archlinux.info>
+
+pkgname=opensmtpd
+pkgver=6.0.2p1
+pkgrel=7
+pkgdesc='Free implementation of the server-side SMTP protocol'
+arch=('x86_64')
+url='https://www.opensmtpd.org/'
+license=('custom')
+depends=('libasr' 'libevent' 'openssl-1.0' 'pam')
+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=('2af9b6d08784c7e546bf124bb61e311a6aa0c9835507710a76f5c242383190ac'
+ 'b38b64f1457b7227d55585edc711cce525e089516d16b093e6c44387380e6b13'
+ 'abf5baeb2a87c60d668ad18ea41cc08cab7a4f76339dd6df05de15cdaadaf922'
+ '32d46de5562d01de445d04c93bcc9f94bf103539b676e449c32e3603a3866cf8')
+
+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-libssl='/usr/lib/openssl-1.0' \
+ --with-cflags='-I/usr/include/openssl-1.0'
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+
+ 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 license, systemd unit files, sysusers
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "$srcdir/smtpd.service" "$pkgdir/usr/lib/systemd/system/smtpd.service"
+ install -Dm644 "$srcdir/smtpd.socket" "$pkgdir/usr/lib/systemd/system/smtpd.socket"
+ install -Dm644 "$srcdir/opensmtpd.sysusers" "$pkgdir/usr/lib/sysusers.d/opensmtpd.conf"
+
+ # install an empty aliases file (used by the default config)
+ install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
+}
Deleted: opensmtpd.install
===================================================================
--- opensmtpd.install 2018-01-10 01:25:20 UTC (rev 280800)
+++ opensmtpd.install 2018-01-10 01:25:58 UTC (rev 280801)
@@ -1,26 +0,0 @@
-# arg 1: the new package version
-post_install() {
- # create users
- getent group smtpq >/dev/null || groupadd -r smtpq
- getent passwd smtpd >/dev/null || useradd -c "SMTP Daemon" -d /var/empty -u 91 -g 1 -s /bin/nologin smtpd
- getent passwd smtpq >/dev/null || useradd -c "SMTPD Queue" -d /var/empty -u 92 -g smtpq -s/bin/nologin smtpq
- :
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install "$1"
- if (( $(vercmp $2 5.3.3p1-1) < 0 )); then
- echo 'Configuration files have been moved to /etc/smtpd.'
- echo 'New users have been added.'
- echo 'Check your configuration!'
- elif (( $(vercmp $2 5.4) < 0 )); then
- echo 'User smtpf is no more required. It will be removed!'
- echo 'Check your configuration!'
- userdel -f smtpf
- fi
- :
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opensmtpd/repos/community-x86_64/opensmtpd.sysusers (from rev 280800, opensmtpd/trunk/opensmtpd.sysusers)
===================================================================
--- opensmtpd.sysusers (rev 0)
+++ opensmtpd.sysusers 2018-01-10 01:25:58 UTC (rev 280801)
@@ -0,0 +1,4 @@
+u smtpd 91 "SMTP Daemon" -
+u smtpq 92 "SMTP Queue" -
+
+m smtpd root
Deleted: smtpd.service
===================================================================
--- smtpd.service 2018-01-10 01:25:20 UTC (rev 280800)
+++ smtpd.service 2018-01-10 01:25:58 UTC (rev 280801)
@@ -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 280800, opensmtpd/trunk/smtpd.service)
===================================================================
--- smtpd.service (rev 0)
+++ smtpd.service 2018-01-10 01:25:58 UTC (rev 280801)
@@ -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 2018-01-10 01:25:20 UTC (rev 280800)
+++ smtpd.socket 2018-01-10 01:25:58 UTC (rev 280801)
@@ -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 280800, opensmtpd/trunk/smtpd.socket)
===================================================================
--- smtpd.socket (rev 0)
+++ smtpd.socket 2018-01-10 01:25:58 UTC (rev 280801)
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSMTPD Socket
+
+[Socket]
+ListenStream=/run/smtpd.sock
+
+[Install]
+WantedBy=sockets.target
More information about the arch-commits
mailing list