diff options
| author | tron <tron@pkgsrc.org> | 2009-07-25 19:26:40 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-07-25 19:26:40 +0000 |
| commit | 894ed99e84ceb3ec140fb1a85dc2a92f1fcefa83 (patch) | |
| tree | b26c7bf35a3fed73168a2e098b072ecb6b2b8276 | |
| parent | f60425449ab62b4af5320326f991f64a8befc4e6 (diff) | |
| download | pkgsrc-894ed99e84ceb3ec140fb1a85dc2a92f1fcefa83.tar.gz | |
Pullup ticket #2833 - requested by joerg
nsd: portability fix
Revisions pulled up:
- net/nsd/Makefile 1.47
- net/nsd/distinfo 1.26
- net/nsd/patches/patch-ab 1.3
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri Jul 24 07:08:10 UTC 2009
Modified Files:
pkgsrc/net/nsd: Makefile distinfo
Added Files:
pkgsrc/net/nsd/patches: patch-ab
Log Message:
Redirecting stdout and stderr with &> is not portable, fix this.
Issue raised by Koh-ichi Ito on nsd-users.
| -rw-r--r-- | net/nsd/Makefile | 3 | ||||
| -rw-r--r-- | net/nsd/distinfo | 3 | ||||
| -rw-r--r-- | net/nsd/patches/patch-ab | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 2de7757bf9c..fd5e1c29036 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2009/05/20 01:55:55 joerg Exp $ +# $NetBSD: Makefile,v 1.46.2.1 2009/07/25 19:26:40 tron Exp $ DISTNAME= nsd-3.2.2 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ diff --git a/net/nsd/distinfo b/net/nsd/distinfo index 7a5d5fb7000..61874766e72 100644 --- a/net/nsd/distinfo +++ b/net/nsd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.25 2009/05/20 01:55:55 joerg Exp $ +$NetBSD: distinfo,v 1.25.2.1 2009/07/25 19:26:40 tron Exp $ SHA1 (nsd-3.2.2.tar.gz) = 23fc0be5d447ea852acd49f64743c96403a091fa RMD160 (nsd-3.2.2.tar.gz) = 740b81386488d3f45b82e9ae26dbd7a2bfc85aa9 Size (nsd-3.2.2.tar.gz) = 840917 bytes SHA1 (patch-aa) = 81b820eb4f2056ab85cad16b7dc526f1ba2737aa +SHA1 (patch-ab) = 53fad0fe0fec84da8f06909070f1d60bb8c74f85 diff --git a/net/nsd/patches/patch-ab b/net/nsd/patches/patch-ab new file mode 100644 index 00000000000..3319224ccd3 --- /dev/null +++ b/net/nsd/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.3.2.2 2009/07/25 19:26:40 tron Exp $ + +--- nsdc.sh.in.orig 2009-07-24 09:04:04.000000000 +0200 ++++ nsdc.sh.in +@@ -195,11 +195,11 @@ controlled_stop() { + if [ $try -eq 1 ]; then + kill -TERM ${pid} + else +- kill -TERM ${pid} &>/dev/null ++ kill -TERM ${pid} > /dev/null 2>&1 + fi + + # really stopped? +- kill -0 ${pid} &>/dev/null ++ kill -0 ${pid} > /dev/null 2>&1 + if [ $? -eq 0 ]; then + controlled_sleep ${try} + try=`expr ${try} + 1` |