[arch-commits] Commit in opensmtpd/repos (18 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Mon Jul 1 22:20:09 UTC 2013
Date: Tuesday, July 2, 2013 @ 00:20:09
Author: seblu
Revision: 93322
db-move: moved opensmtpd from [community-testing] to [community] (i686, x86_64)
Added:
opensmtpd/repos/community-i686/PKGBUILD
(from rev 93321, opensmtpd/repos/community-testing-i686/PKGBUILD)
opensmtpd/repos/community-i686/opensmtpd.install
(from rev 93321, opensmtpd/repos/community-testing-i686/opensmtpd.install)
opensmtpd/repos/community-i686/smtpd.service
(from rev 93321, opensmtpd/repos/community-testing-i686/smtpd.service)
opensmtpd/repos/community-i686/smtpd.socket
(from rev 93321, opensmtpd/repos/community-testing-i686/smtpd.socket)
opensmtpd/repos/community-x86_64/PKGBUILD
(from rev 93321, opensmtpd/repos/community-testing-x86_64/PKGBUILD)
opensmtpd/repos/community-x86_64/opensmtpd.install
(from rev 93321, opensmtpd/repos/community-testing-x86_64/opensmtpd.install)
opensmtpd/repos/community-x86_64/smtpd.service
(from rev 93321, opensmtpd/repos/community-testing-x86_64/smtpd.service)
opensmtpd/repos/community-x86_64/smtpd.socket
(from rev 93321, opensmtpd/repos/community-testing-x86_64/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-testing-i686/
opensmtpd/repos/community-testing-x86_64/
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 | 144 +++++++++++++++++++++++++++++++++++
/opensmtpd.install | 58 ++++++++++++++
/smtpd.service | 20 ++++
/smtpd.socket | 16 +++
community-i686/PKGBUILD | 63 ---------------
community-i686/opensmtpd.install | 14 ---
community-i686/smtpd.service | 10 --
community-i686/smtpd.socket | 8 -
community-x86_64/PKGBUILD | 63 ---------------
community-x86_64/opensmtpd.install | 14 ---
community-x86_64/smtpd.service | 10 --
community-x86_64/smtpd.socket | 8 -
12 files changed, 238 insertions(+), 190 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-i686/PKGBUILD 2013-07-01 22:20:09 UTC (rev 93322)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=opensmtpd
-pkgver=5.3.2p1
-pkgrel=2
-pkgdesc='Free implementation of the server-side SMTP protocol'
-arch=('i686' 'x86_64')
-url='http://www.opensmtpd.org/'
-license=('custom')
-depends=('libevent')
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
-backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets')
-install=opensmtpd.install
-source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
- 'smtpd.service'
- 'smtpd.socket')
-md5sums=('8fc513dd632461f70e433103d75dbf50'
- 'a278f272d97a9fe5a8aac784a7c98d67'
- 'c2c01e9ca78df3f65efe40a7c0e17ee0')
-
-build() {
- cd $pkgname-$pkgver
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --libexecdir=/usr/bin \
- --with-maildir=/var/spool/mail \
- --with-privsep-path=/var/empty \
- --with-sock-dir=/run \
- --with-privsep-user=mail \
- --with-filter-user=mail \
- --with-queue-user=mail \
- --with-pam
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- cd "$pkgdir"
- # working directory
- install -dm711 var/spool/smtpd
- # license
- install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
- install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
- # remove duplicate hardlink into a subfolder
- rm -r usr/bin/opensmtpd
- # empty aliases file
- install -Dm644 /dev/null "$pkgdir/etc/aliases"
- install -Dm644 /dev/null "$pkgdir/etc/virtual"
- install -Dm640 /dev/null "$pkgdir/etc/secrets"
- # fake sendmail binary (used to be smtp-forwarder)
- # use hardlink as upstream does...
- ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opensmtpd/repos/community-i686/PKGBUILD (from rev 93321, opensmtpd/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-07-01 22:20:09 UTC (rev 93322)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=opensmtpd
+pkgver=5.3.3p1
+pkgrel=1
+pkgdesc='Free implementation of the server-side SMTP protocol'
+arch=('i686' 'x86_64')
+url='http://www.opensmtpd.org/'
+license=('custom')
+depends=('libevent')
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
+backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
+install=opensmtpd.install
+source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
+ 'smtpd.service'
+ 'smtpd.socket')
+md5sums=('795982f9b0b45c7645f897ba2ead0024'
+ 'a278f272d97a9fe5a8aac784a7c98d67'
+ 'c2c01e9ca78df3f65efe40a7c0e17ee0')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf
+ # regen configure. don't use bootstrap script (doesn't support automake 1.14)
+ libtoolize --copy --force
+ aclocal -I m4
+ autoconf
+ autoheader
+ automake --foreign --add-missing --copy
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/smtpd \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/bin \
+ --with-maildir=/var/spool/mail \
+ --with-privsep-path=/var/empty \
+ --with-sock-dir=/run \
+ --with-privsep-user=smtpd \
+ --with-lookup-user=smtpd \
+ --with-queue-user=smtpq \
+ --with-filter-user=smtpf \
+ --with-pam
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+ # license
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # working directory
+ cd "$pkgdir"
+ install -dm711 var/spool/smtpd
+ install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
+ install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
+ # remove duplicate hardlink into a subfolder
+ rm -vr usr/bin/opensmtpd
+ # empty aliases file (used by default config)
+ install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
+ # fake sendmail binary (used to be smtp-forwarder)
+ # use hardlink as upstream does
+ cd "$pkgdir/usr/bin"
+ ln smtpctl "$pkgdir/usr/bin/sendmail"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/opensmtpd.install
===================================================================
--- community-i686/opensmtpd.install 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-i686/opensmtpd.install 2013-07-01 22:20:09 UTC (rev 93322)
@@ -1,14 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-# arg 1: the new package version
-post_install() {
- makemap -t aliases /etc/aliases
-}
-
-# arg 1: the old package version
-post_remove() {
- rm -f /etc/aliases.db
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opensmtpd/repos/community-i686/opensmtpd.install (from rev 93321, opensmtpd/repos/community-testing-i686/opensmtpd.install)
===================================================================
--- community-i686/opensmtpd.install (rev 0)
+++ community-i686/opensmtpd.install 2013-07-01 22:20:09 UTC (rev 93322)
@@ -0,0 +1,29 @@
+# arg 1: the new package version
+post_install() {
+ # create users
+ getent passwd smtpd >/dev/null || useradd -d / -u 91 -g 1 smtpd
+ getent passwd smtpq >/dev/null || useradd -d /var/spool/smtpd -u 92 -g 1 smtpq
+ getent passwd smtpf >/dev/null || useradd -d / -u 93 -g 1 smtpf
+ # initialise aliase db
+ #[[ -e /etc/smtpd/aliases.db ]] || makemap -t aliases /etc/smtpd/aliases
+ true
+}
+
+# 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!'
+ fi
+}
+
+# arg 1: the old package version
+post_remove() {
+ for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done
+ true
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/smtpd.service
===================================================================
--- community-i686/smtpd.service 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-i686/smtpd.service 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 93321, opensmtpd/repos/community-testing-i686/smtpd.service)
===================================================================
--- community-i686/smtpd.service (rev 0)
+++ community-i686/smtpd.service 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-i686/smtpd.socket 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 93321, opensmtpd/repos/community-testing-i686/smtpd.socket)
===================================================================
--- community-i686/smtpd.socket (rev 0)
+++ community-i686/smtpd.socket 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-x86_64/PKGBUILD 2013-07-01 22:20:09 UTC (rev 93322)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=opensmtpd
-pkgver=5.3.2p1
-pkgrel=2
-pkgdesc='Free implementation of the server-side SMTP protocol'
-arch=('i686' 'x86_64')
-url='http://www.opensmtpd.org/'
-license=('custom')
-depends=('libevent')
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
-backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets')
-install=opensmtpd.install
-source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
- 'smtpd.service'
- 'smtpd.socket')
-md5sums=('8fc513dd632461f70e433103d75dbf50'
- 'a278f272d97a9fe5a8aac784a7c98d67'
- 'c2c01e9ca78df3f65efe40a7c0e17ee0')
-
-build() {
- cd $pkgname-$pkgver
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --libexecdir=/usr/bin \
- --with-maildir=/var/spool/mail \
- --with-privsep-path=/var/empty \
- --with-sock-dir=/run \
- --with-privsep-user=mail \
- --with-filter-user=mail \
- --with-queue-user=mail \
- --with-pam
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- cd "$pkgdir"
- # working directory
- install -dm711 var/spool/smtpd
- # license
- install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
- install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
- # remove duplicate hardlink into a subfolder
- rm -r usr/bin/opensmtpd
- # empty aliases file
- install -Dm644 /dev/null "$pkgdir/etc/aliases"
- install -Dm644 /dev/null "$pkgdir/etc/virtual"
- install -Dm640 /dev/null "$pkgdir/etc/secrets"
- # fake sendmail binary (used to be smtp-forwarder)
- # use hardlink as upstream does...
- ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opensmtpd/repos/community-x86_64/PKGBUILD (from rev 93321, opensmtpd/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-07-01 22:20:09 UTC (rev 93322)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=opensmtpd
+pkgver=5.3.3p1
+pkgrel=1
+pkgdesc='Free implementation of the server-side SMTP protocol'
+arch=('i686' 'x86_64')
+url='http://www.opensmtpd.org/'
+license=('custom')
+depends=('libevent')
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
+backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
+install=opensmtpd.install
+source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
+ 'smtpd.service'
+ 'smtpd.socket')
+md5sums=('795982f9b0b45c7645f897ba2ead0024'
+ 'a278f272d97a9fe5a8aac784a7c98d67'
+ 'c2c01e9ca78df3f65efe40a7c0e17ee0')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf
+ # regen configure. don't use bootstrap script (doesn't support automake 1.14)
+ libtoolize --copy --force
+ aclocal -I m4
+ autoconf
+ autoheader
+ automake --foreign --add-missing --copy
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/smtpd \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/bin \
+ --with-maildir=/var/spool/mail \
+ --with-privsep-path=/var/empty \
+ --with-sock-dir=/run \
+ --with-privsep-user=smtpd \
+ --with-lookup-user=smtpd \
+ --with-queue-user=smtpq \
+ --with-filter-user=smtpf \
+ --with-pam
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+ # license
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ # working directory
+ cd "$pkgdir"
+ install -dm711 var/spool/smtpd
+ install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
+ install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
+ # remove duplicate hardlink into a subfolder
+ rm -vr usr/bin/opensmtpd
+ # empty aliases file (used by default config)
+ install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
+ # fake sendmail binary (used to be smtp-forwarder)
+ # use hardlink as upstream does
+ cd "$pkgdir/usr/bin"
+ ln smtpctl "$pkgdir/usr/bin/sendmail"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/opensmtpd.install
===================================================================
--- community-x86_64/opensmtpd.install 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-x86_64/opensmtpd.install 2013-07-01 22:20:09 UTC (rev 93322)
@@ -1,14 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-# arg 1: the new package version
-post_install() {
- makemap -t aliases /etc/aliases
-}
-
-# arg 1: the old package version
-post_remove() {
- rm -f /etc/aliases.db
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opensmtpd/repos/community-x86_64/opensmtpd.install (from rev 93321, opensmtpd/repos/community-testing-x86_64/opensmtpd.install)
===================================================================
--- community-x86_64/opensmtpd.install (rev 0)
+++ community-x86_64/opensmtpd.install 2013-07-01 22:20:09 UTC (rev 93322)
@@ -0,0 +1,29 @@
+# arg 1: the new package version
+post_install() {
+ # create users
+ getent passwd smtpd >/dev/null || useradd -d / -u 91 -g 1 smtpd
+ getent passwd smtpq >/dev/null || useradd -d /var/spool/smtpd -u 92 -g 1 smtpq
+ getent passwd smtpf >/dev/null || useradd -d / -u 93 -g 1 smtpf
+ # initialise aliase db
+ #[[ -e /etc/smtpd/aliases.db ]] || makemap -t aliases /etc/smtpd/aliases
+ true
+}
+
+# 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!'
+ fi
+}
+
+# arg 1: the old package version
+post_remove() {
+ for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done
+ true
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/smtpd.service
===================================================================
--- community-x86_64/smtpd.service 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-x86_64/smtpd.service 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 93321, opensmtpd/repos/community-testing-x86_64/smtpd.service)
===================================================================
--- community-x86_64/smtpd.service (rev 0)
+++ community-x86_64/smtpd.service 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 2013-07-01 20:28:19 UTC (rev 93321)
+++ community-x86_64/smtpd.socket 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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 93321, opensmtpd/repos/community-testing-x86_64/smtpd.socket)
===================================================================
--- community-x86_64/smtpd.socket (rev 0)
+++ community-x86_64/smtpd.socket 2013-07-01 22:20:09 UTC (rev 93322)
@@ -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