diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-16 13:51:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-17 06:32:13 +0000 |
| commit | 6ee588ad9eb04ab66695b497d4e1f283246928db (patch) | |
| tree | 6928cce3d1f09f3b5d0ed168dd45b3f70b214335 /main/nsd | |
| parent | b24b312d25e39c433f44ce845ef1cfb9d5035986 (diff) | |
| download | aports-6ee588ad9eb04ab66695b497d4e1f283246928db.tar.bz2 aports-6ee588ad9eb04ab66695b497d4e1f283246928db.tar.xz | |
main/nsd: create nsd user on upgrade
fixes #2839
(cherry picked from commit 1f7cb8f7085ab7cc37a08b37dc402667ba8c6a3f)
Conflicts:
main/nsd/APKBUILD
Diffstat (limited to 'main/nsd')
| -rw-r--r-- | main/nsd/0010-stop-unlink-pid-error.patch | 26 | ||||
| -rw-r--r-- | main/nsd/APKBUILD | 6 | ||||
| l--------- | main/nsd/nsd.pre-upgrade | 1 |
3 files changed, 4 insertions, 29 deletions
diff --git a/main/nsd/0010-stop-unlink-pid-error.patch b/main/nsd/0010-stop-unlink-pid-error.patch deleted file mode 100644 index 24175df337..0000000000 --- a/main/nsd/0010-stop-unlink-pid-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch prevents nsd from attempting to unlink the pidfile on nsd -shutdown. The reason for this is because we get a permission denied -error in nsd.log when it attempts to do so. - -I think this is needed because of how normal OpenRC init scripts are -designed and handled. - -See the included /etc/init.d/nsd (nsd.initd) for my conversion of the -nsdc script that's normally distributed with nsd. The included nsdc -script is a wrapper for the converted OpenRC init script, designed to -maintain compatibility. - -Matt Smith <msmith@alpinelinux.org> - - ---- a/server.c -+++ b/server.c -@@ -1167,7 +1167,7 @@ - close(fd); - - /* Unlink it if possible... */ -- unlinkpid(nsd->pidfile); -+ //unlinkpid(nsd->pidfile); - - if(reload_listener.fd > 0) { - sig_atomic_t cmd = NSD_QUIT; diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD index 3ce4d01bdb..d86abed676 100644 --- a/main/nsd/APKBUILD +++ b/main/nsd/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> -# Maintainer: Matt Smith <mcs@darkregion.net> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org pkgname=nsd pkgver=4.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="NSD is an authoritative only, high performance, simple and open source name server." url="http://www.nlnetlabs.nl/projects/nsd/" arch="all" @@ -11,7 +11,7 @@ license="BSD" depends= depends_dev= makedepends="$depends_dev openssl-dev libevent-dev" -install="$pkgname.pre-install $pkgname.post-deinstall" +install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-deinstall" subpackages="$pkgname-doc" pkgusers="nsd" pkggroups="nsd" diff --git a/main/nsd/nsd.pre-upgrade b/main/nsd/nsd.pre-upgrade new file mode 120000 index 0000000000..303c03720f --- /dev/null +++ b/main/nsd/nsd.pre-upgrade @@ -0,0 +1 @@ +nsd.pre-install
\ No newline at end of file |