diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-15 19:50:28 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-15 19:50:28 +0000 |
commit | dd60f61239bc94e9ebba77cd4729f0217859baa0 (patch) | |
tree | 269ad77561474d9b189b8070f511077526e9db79 | |
parent | b5b897e47ab11998c46db7f9ba96410a187c0634 (diff) | |
parent | faee6973baa1a4be70090803e3fbac0641751cc4 (diff) | |
download | packages-dd60f61239bc94e9ebba77cd4729f0217859baa0.tar.gz packages-dd60f61239bc94e9ebba77cd4729f0217859baa0.tar.bz2 packages-dd60f61239bc94e9ebba77cd4729f0217859baa0.tar.xz packages-dd60f61239bc94e9ebba77cd4729f0217859baa0.zip |
Merge branch 'ska-fixes.20191007' into 'master'
user/netqmail: qmail.org is dead, update url+source
See merge request adelie/packages!360
-rw-r--r-- | system/mdevd/APKBUILD | 16 | ||||
-rw-r--r-- | user/netqmail/APKBUILD | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index b21a0be09..d41559e46 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd pkgver=0.1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -20,15 +20,11 @@ build() { } package() { - svcdir="$pkgdir/etc/s6-linux-init/current/run-image/service/mdevd" cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p -m 0755 "$svcdir" + mkdir -p -m 0755 "$pkgdir/etc" cp -f "$srcdir/mdev.conf" "$pkgdir/etc/" chmod 0644 "$pkgdir/etc/mdev.conf" - cp -f "$srcdir/mdevd.run" "$svcdir/run" - echo 3 > "$svcdir/notification-fd" - touch "$svcdir/down" } @@ -43,10 +39,14 @@ doc() { openrc() { rldir="$subpkgdir"/etc/runlevels/sysinit + svcdir="$subpkgdir/etc/s6-linux-init/current/run-image/service/mdevd" default_openrc - mkdir -p "$rldir" + mkdir -p "$rldir" "$svcdir" + cp -f "$srcdir/mdevd.run" "$svcdir/run" + chmod 0755 "$svcdir/run" + echo 3 > "$svcdir/notification-fd" + touch "$svcdir/down" ln -s ../../init.d/mdevd "$rldir/mdevd" - ln -s ../../init.d/mdevd-coldplug "$rldir/mdevd-coldplug" } sha512sums="94bbcaf0c39511da392c932c5d38ced7029727a46997877d03bba41fc7302df3d4400d3957be9361055e954f3a22b785db40d56bb2f031bc49bb2f398179efe0 mdevd-0.1.1.0.tar.gz diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 698c0c4d9..173f4da66 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=netqmail pkgver=1.06 -pkgrel=5 +pkgrel=6 pkgdesc="The qmail mail transfer agent (community version)" -url="http://www.qmail.org/$pkgname/" +url="http://www.netqmail.org/" arch="all" license="Public-Domain" provides=sendmail @@ -14,7 +14,7 @@ makedepends="utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" install="$pkgname.post-install $pkgname.pre-deinstall" provider_priority=1 -source="http://www.qmail.org/$pkgname-$pkgver.tar.gz +source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch 0002-qbiffutmpx-20170820.patch 0003-qmailremote-20170716.patch |