Date: Saturday, October 8, 2016 @ 20:37:28 Author: lfleischer Revision: 191665
archrelease: copy trunk to community-i686, community-x86_64 Added: opensmtpd/repos/community-i686/PKGBUILD (from rev 191664, opensmtpd/trunk/PKGBUILD) opensmtpd/repos/community-i686/opensmtpd.install (from rev 191664, opensmtpd/trunk/opensmtpd.install) opensmtpd/repos/community-i686/smtpd.service (from rev 191664, opensmtpd/trunk/smtpd.service) opensmtpd/repos/community-i686/smtpd.socket (from rev 191664, opensmtpd/trunk/smtpd.socket) opensmtpd/repos/community-x86_64/PKGBUILD (from rev 191664, opensmtpd/trunk/PKGBUILD) opensmtpd/repos/community-x86_64/opensmtpd.install (from rev 191664, opensmtpd/trunk/opensmtpd.install) opensmtpd/repos/community-x86_64/smtpd.service (from rev 191664, opensmtpd/trunk/smtpd.service) opensmtpd/repos/community-x86_64/smtpd.socket (from rev 191664, opensmtpd/trunk/smtpd.socket) Deleted: opensmtpd/repos/community-i686/PKGBUILD opensmtpd/repos/community-i686/opensmtpd.install opensmtpd/repos/community-i686/smtpd.service opensmtpd/repos/community-i686/smtpd.socket 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 | 130 +++++++++++++++++++++++++++++++++++ /opensmtpd.install | 52 ++++++++++++++ /smtpd.service | 20 +++++ /smtpd.socket | 16 ++++ community-i686/PKGBUILD | 64 ----------------- community-i686/opensmtpd.install | 26 ------- community-i686/smtpd.service | 10 -- community-i686/smtpd.socket | 8 -- community-x86_64/PKGBUILD | 64 ----------------- community-x86_64/opensmtpd.install | 26 ------- community-x86_64/smtpd.service | 10 -- community-x86_64/smtpd.socket | 8 -- 12 files changed, 218 insertions(+), 216 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-10-08 20:37:22 UTC (rev 191664) +++ community-i686/PKGBUILD 2016-10-08 20:37:28 UTC (rev 191665) @@ -1,64 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Sébastien Luttringer -# Contributor: parchd <par...@archlinux.info> - -pkgname=opensmtpd -pkgver=6.0.0p1 -pkgrel=1 -pkgdesc='Free implementation of the server-side SMTP protocol' -arch=('i686' 'x86_64') -url='http://www.opensmtpd.org/' -license=('custom') -depends=('libasr' 'libevent' 'openssl' '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=('a97e79589fe4147bfc124fcf39207eee8e0ad35d0b3411ca31830bd35710f81d' - '3760f7268e776b696548e57f5f9e4d18ed19e8854dc0631c176a69d558a8b362' - '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 - 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-i686/PKGBUILD (from rev 191664, opensmtpd/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,65 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: parchd <par...@archlinux.info> + +pkgname=opensmtpd +pkgver=6.0.1p1 +pkgrel=1 +pkgdesc='Free implementation of the server-side SMTP protocol' +arch=('i686' 'x86_64') +url='http://www.opensmtpd.org/' +license=('custom') +depends=('libasr' 'libevent' 'openssl' '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=('4cd61cd2d668715570896338c81d71eb64e6f90b3f88c5639b378db7b1af864a' + '3760f7268e776b696548e57f5f9e4d18ed19e8854dc0631c176a69d558a8b362' + '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 + 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" +} Deleted: community-i686/opensmtpd.install =================================================================== --- community-i686/opensmtpd.install 2016-10-08 20:37:22 UTC (rev 191664) +++ community-i686/opensmtpd.install 2016-10-08 20:37:28 UTC (rev 191665) @@ -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-i686/opensmtpd.install (from rev 191664, opensmtpd/trunk/opensmtpd.install) =================================================================== --- community-i686/opensmtpd.install (rev 0) +++ community-i686/opensmtpd.install 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,26 @@ +# 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: Deleted: community-i686/smtpd.service =================================================================== --- community-i686/smtpd.service 2016-10-08 20:37:22 UTC (rev 191664) +++ community-i686/smtpd.service 2016-10-08 20:37:28 UTC (rev 191665) @@ -1,10 +0,0 @@ -[Unit] -Description=OpenSMTPD -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/smtpd - -[Install] -WantedBy=multi-user.target Copied: opensmtpd/repos/community-i686/smtpd.service (from rev 191664, opensmtpd/trunk/smtpd.service) =================================================================== --- community-i686/smtpd.service (rev 0) +++ community-i686/smtpd.service 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSMTPD +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/smtpd + +[Install] +WantedBy=multi-user.target Deleted: community-i686/smtpd.socket =================================================================== --- community-i686/smtpd.socket 2016-10-08 20:37:22 UTC (rev 191664) +++ community-i686/smtpd.socket 2016-10-08 20:37:28 UTC (rev 191665) @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSMTPD Socket - -[Socket] -ListenStream=/run/smtpd.sock - -[Install] -WantedBy=sockets.target Copied: opensmtpd/repos/community-i686/smtpd.socket (from rev 191664, opensmtpd/trunk/smtpd.socket) =================================================================== --- community-i686/smtpd.socket (rev 0) +++ community-i686/smtpd.socket 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSMTPD Socket + +[Socket] +ListenStream=/run/smtpd.sock + +[Install] +WantedBy=sockets.target Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-10-08 20:37:22 UTC (rev 191664) +++ community-x86_64/PKGBUILD 2016-10-08 20:37:28 UTC (rev 191665) @@ -1,64 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Sébastien Luttringer -# Contributor: parchd <par...@archlinux.info> - -pkgname=opensmtpd -pkgver=6.0.0p1 -pkgrel=1 -pkgdesc='Free implementation of the server-side SMTP protocol' -arch=('i686' 'x86_64') -url='http://www.opensmtpd.org/' -license=('custom') -depends=('libasr' 'libevent' 'openssl' '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=('a97e79589fe4147bfc124fcf39207eee8e0ad35d0b3411ca31830bd35710f81d' - '3760f7268e776b696548e57f5f9e4d18ed19e8854dc0631c176a69d558a8b362' - '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 - 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 191664, opensmtpd/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,65 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: parchd <par...@archlinux.info> + +pkgname=opensmtpd +pkgver=6.0.1p1 +pkgrel=1 +pkgdesc='Free implementation of the server-side SMTP protocol' +arch=('i686' 'x86_64') +url='http://www.opensmtpd.org/' +license=('custom') +depends=('libasr' 'libevent' 'openssl' '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=('4cd61cd2d668715570896338c81d71eb64e6f90b3f88c5639b378db7b1af864a' + '3760f7268e776b696548e57f5f9e4d18ed19e8854dc0631c176a69d558a8b362' + '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 + 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" +} Deleted: community-x86_64/opensmtpd.install =================================================================== --- community-x86_64/opensmtpd.install 2016-10-08 20:37:22 UTC (rev 191664) +++ community-x86_64/opensmtpd.install 2016-10-08 20:37:28 UTC (rev 191665) @@ -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.install (from rev 191664, opensmtpd/trunk/opensmtpd.install) =================================================================== --- community-x86_64/opensmtpd.install (rev 0) +++ community-x86_64/opensmtpd.install 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,26 @@ +# 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: Deleted: community-x86_64/smtpd.service =================================================================== --- community-x86_64/smtpd.service 2016-10-08 20:37:22 UTC (rev 191664) +++ community-x86_64/smtpd.service 2016-10-08 20:37:28 UTC (rev 191665) @@ -1,10 +0,0 @@ -[Unit] -Description=OpenSMTPD -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/smtpd - -[Install] -WantedBy=multi-user.target Copied: opensmtpd/repos/community-x86_64/smtpd.service (from rev 191664, opensmtpd/trunk/smtpd.service) =================================================================== --- community-x86_64/smtpd.service (rev 0) +++ community-x86_64/smtpd.service 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSMTPD +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/smtpd + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/smtpd.socket =================================================================== --- community-x86_64/smtpd.socket 2016-10-08 20:37:22 UTC (rev 191664) +++ community-x86_64/smtpd.socket 2016-10-08 20:37:28 UTC (rev 191665) @@ -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 191664, opensmtpd/trunk/smtpd.socket) =================================================================== --- community-x86_64/smtpd.socket (rev 0) +++ community-x86_64/smtpd.socket 2016-10-08 20:37:28 UTC (rev 191665) @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSMTPD Socket + +[Socket] +ListenStream=/run/smtpd.sock + +[Install] +WantedBy=sockets.target