diff options
| author | codeworkx | 2018-02-26 21:05:31 +0100 |
|---|---|---|
| committer | codeworkx | 2018-02-26 21:06:19 +0100 |
| commit | c9d27fac17f5ed579ec920fee112ef5a78a93bcf (patch) | |
| tree | edd66953a483ea5964ff4d2b9ca38d8d977ccdf7 | |
| parent | 95291c77923097ab89dfbbc1afc14e8ec1c0d135 (diff) | |
| download | aur-c9d27fac17f5ed579ec920fee112ef5a78a93bcf.tar.gz | |
update and add conflicting packages
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 56 | ||||
| -rw-r--r-- | install | 6 | ||||
| -rw-r--r-- | stubby.sysusers | 1 |
4 files changed, 40 insertions, 37 deletions
@@ -1,19 +1,19 @@ pkgbase = stubby-git - pkgdesc = DNS Privacy Daemon - pkgver = 2543.81bfa684 + pkgdesc = DNS Privacy stub resolver + pkgver = 2718.8797280 pkgrel = 1 url = https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby - install = install arch = x86_64 - arch = i686 license = BSD makedepends = libtool makedepends = git - depends = libyaml - depends = openssl - backup = usr/etc/stubby/stubby.yml + conflicts = getdns + conflicts = stubby + backup = etc/stubby/stubby.yml source = stubby::git+https://github.com/getdnsapi/getdns.git + source = stubby.sysusers sha256sums = SKIP + sha256sums = 2acedcf2b65d6e802a70deb55a5befbb71ff83be68a0ba5231a09c126910142b pkgname = stubby-git @@ -2,46 +2,54 @@ _pkgbase=stubby pkgname=stubby-git -pkgver=2543.81bfa684 +pkgver=2718.8797280 pkgrel=1 -pkgdesc="DNS Privacy Daemon" -arch=('x86_64' 'i686') +pkgdesc="DNS Privacy stub resolver" +arch=('x86_64') url="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby" license=('BSD') - +backup=('etc/stubby/stubby.yml') makedepends=('libtool' 'git') -depends=('libyaml' 'openssl') - -source=("$_pkgbase::git+https://github.com/getdnsapi/getdns.git") -sha256sums=('SKIP') - -backup=('usr/etc/stubby/stubby.yml') -install=install +conflicts=('getdns' 'stubby') +source=("$_pkgbase::git+https://github.com/getdnsapi/getdns.git" + "${_pkgbase}.sysusers") +sha256sums=('SKIP' + '2acedcf2b65d6e802a70deb55a5befbb71ff83be68a0ba5231a09c126910142b') pkgver() { - cd "$srcdir/$_pkgbase" + cd ${srcdir}/${_pkgbase} printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/$_pkgbase" - git submodule update --init - libtoolize -ci - autoreconf -fi - ./configure --prefix=/usr --without-libidn --enable-stub-only --with-ssl=/usr --with-stubby + cd ${srcdir}/${_pkgbase} + git submodule update --init + libtoolize -ci + autoreconf -fi + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --without-libidn \ + --with-ssl=/usr \ + --enable-stub-only \ + --with-stubby } build() { - cd "$srcdir/$_pkgbase" - make + cd ${srcdir}/${_pkgbase} + make } package() { - cd "$srcdir/$_pkgbase" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${_pkgbase} + + make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$_pkgbase/LICENSE" + install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgbase} + rmdir "${pkgdir}"/var{/run,} - install -D -m644 stubby/systemd/stubby.service "${pkgdir}/usr/lib/systemd/system/stubby.service" - install -D -m644 stubby/systemd/stubby.conf "${pkgdir}/usr/lib/tmpfiles.d/stubby.conf" + install -Dm644 stubby/systemd/${_pkgbase}.service -t "${pkgdir}"/usr/lib/systemd/system/ + install -Dm644 stubby/systemd/${_pkgbase}.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/ + install -Dm644 ../../${_pkgbase}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${_pkgbase}.conf } diff --git a/install b/install deleted file mode 100644 index d9825e0f0ece..000000000000 --- a/install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - if ! getent passwd stubby &>/dev/null; then - groupadd -r stubby - useradd -r -g stubby -d / -s /bin/nologin -c stubby stubby - fi -} diff --git a/stubby.sysusers b/stubby.sysusers new file mode 100644 index 000000000000..be618418ec05 --- /dev/null +++ b/stubby.sysusers @@ -0,0 +1 @@ +u stubby - "DNS Privacy Daemon" - |