diff options
| -rw-r--r-- | courier-authlib/PKGBUILD | 14 | ||||
| -rw-r--r-- | courier-authlib/authdaemond.service | 2 | ||||
| -rw-r--r-- | courier-authlib/courier-authlib.install | 11 | ||||
| -rw-r--r-- | courier-authlib/courier-authlib.tmpfiles | 2 |
4 files changed, 7 insertions, 22 deletions
diff --git a/courier-authlib/PKGBUILD b/courier-authlib/PKGBUILD index 9aa2fdaf..ba1d7cd6 100644 --- a/courier-authlib/PKGBUILD +++ b/courier-authlib/PKGBUILD @@ -8,7 +8,7 @@ pkgname=courier-authlib pkgver=0.69.0 -pkgrel='6' +pkgrel='7' pkgdesc="Authentication library for the Courier mailserver(s)" arch=(i686 x86_64) license=('GPL2') @@ -25,12 +25,10 @@ optdepends=('sqlite: With support for the authsqlite authentication module' options=(!libtool !staticlibs emptydirs) install=${pkgname}.install source=(https://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - courier-authlib.tmpfiles authdaemond.service courier.conf) sha512sums=('c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614' -'5047fea9990cd2cd415e11c81fbd8ff83b70dadf0fc178b2398b2c9930843a4669abb3c6801f2953c1ebfdae73c1f82d0ee8c24e900f3876ee6b3aa689363b62' -'64a33dff492448c5ccb470b6b34fd2fbe4d97c60a88216ddfa91db0f64f984593a15138d28d717c29e8dc81c889b6c32f3ea9a52773ac8a808c560bcaf1d1831' +'7855fadbef9e6845868d720f9637cc6fe97814b9d994641a351e48536e1985323f095c708f30abe0f3a0c1cb8e25a746da1bb5b2baf9f63d0498d01df39f843b' '997f755516a64f38abb626790e22e0ad6c3d9fbd7d3e76199cc335ce60f9d5e94dfa083deb637cc36fe039b5b1aa713224e2175b65b1980bf3b304499e3e96e6') build() { @@ -81,9 +79,9 @@ package() { # Install service file install -Dm 644 "${srcdir}/authdaemond.service" "${pkgdir}/usr/lib/systemd/system/authdaemond.service" - # Install systemd configuration file - install -Dm 644 "$srcdir/courier-authlib.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/courier-authlib.conf" - mkdir -p "$pkgdir/var/spool/courier" -} + echo '/usr/lib/courier-authlib' \ + | install -Dm 644 '/dev/stdin' "${pkgdir}/etc/ld.so.conf.d/courier-authlib.conf" + +} diff --git a/courier-authlib/authdaemond.service b/courier-authlib/authdaemond.service index 74305c23..6ac7e4aa 100644 --- a/courier-authlib/authdaemond.service +++ b/courier-authlib/authdaemond.service @@ -5,6 +5,7 @@ Description=Courier Authentification Daemon Type=forking User=courier Group=courier +RuntimeDirectory=authdaemon ExecStart=/usr/bin/authdaemond start ExecStop=/usr/bin/authdaemond stop PIDFile=/run/authdaemon/pid @@ -12,4 +13,3 @@ AmbientCapabilities=CAP_DAC_OVERRIDE [Install] WantedBy=multi-user.target - diff --git a/courier-authlib/courier-authlib.install b/courier-authlib/courier-authlib.install index ad5c6471..4edf64cd 100644 --- a/courier-authlib/courier-authlib.install +++ b/courier-authlib/courier-authlib.install @@ -1,10 +1,7 @@ # arg 1: the new package version post_install() { if ! (grep -q '^courier:.*:72:72:' /etc/passwd); then echo courier user has incorrect uid:gid - please fix!; fi; - # set correct ownership & permissions on /run/authdaemon - systemd-tmpfiles --create /usr/lib/tmpfiles.d/courier-authlib.conf # make sure the system can see authlib libraries - echo /usr/lib/courier-authlib > /etc/ld.so.conf.d/courier-authlib.conf ldconfig } @@ -13,11 +10,3 @@ post_install() { post_upgrade() { post_install $1 } - -# arg 1: the old package version -pre_remove() { - systemd-tmpfiles --remove /usr/lib/tmpfiles.d/courier-authlib.conf - rm -f /etc/ld.so.conf.d/courier-authlib.conf - ldconfig -} >/dev/null 2>&1 - diff --git a/courier-authlib/courier-authlib.tmpfiles b/courier-authlib/courier-authlib.tmpfiles deleted file mode 100644 index f723fa61..00000000 --- a/courier-authlib/courier-authlib.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -D /run/authdaemon 0755 courier courier - |