diff options
| author | cheusov <cheusov> | 2012-06-17 13:18:42 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2012-06-17 13:18:42 +0000 |
| commit | f72e121f743e885b4efbf615428ad174c8fa6dd7 (patch) | |
| tree | 28d3af07e967802ad04018ae0cc882db7b622d5b /textproc | |
| parent | a3f9680d3b12a6dcdfbbc9432c3fdb56afe187a1 (diff) | |
| download | pkgsrc-f72e121f743e885b4efbf615428ad174c8fa6dd7.tar.gz | |
Fix bug in dictl reported in Debian Linux (bug# 677868).
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677868
Dump pkgrevision for dict-client
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/dict-client/Makefile | 6 | ||||
| -rw-r--r-- | textproc/dict-server/distinfo | 3 | ||||
| -rw-r--r-- | textproc/dict-server/patches/patch-dictl.in | 25 |
3 files changed, 30 insertions, 4 deletions
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile index ef29960d5dc..30f0eef69eb 100644 --- a/textproc/dict-client/Makefile +++ b/textproc/dict-client/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.35 2011/05/07 10:06:02 cheusov Exp $ +# $NetBSD: Makefile,v 1.36 2012/06/17 13:18:43 cheusov Exp $ .include "../../textproc/dict-server/Makefile.common" PKGNAME= ${DISTNAME:S/dictd/dict-client/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc COMMENT= Dictionary Service Protocol client @@ -19,7 +19,7 @@ BUILD_TARGET= dict INSTALL_TARGET= install.dict FILESDIR= ${.CURDIR}/../../textproc/dict-server/files -#PATCHDIR= ${.CURDIR}/../../textproc/dict-server/patches +PATCHDIR= ${.CURDIR}/../../textproc/dict-server/patches DISTINFO_FILE= ${.CURDIR}/../../textproc/dict-server/distinfo .include "../../devel/zlib/buildlink3.mk" diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo index bc05f457e71..a17535aa2bc 100644 --- a/textproc/dict-server/distinfo +++ b/textproc/dict-server/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.20 2012/05/12 15:18:23 cheusov Exp $ +$NetBSD: distinfo,v 1.21 2012/06/17 13:18:42 cheusov Exp $ SHA1 (dictd-1.12.0.tar.gz) = 0a1b0c4103e5c3c8b749f9a5dc005cb70e4639e8 RMD160 (dictd-1.12.0.tar.gz) = 56abaebf57baabcb72b96ccf6ec5c39cc3a67ceb Size (dictd-1.12.0.tar.gz) = 423183 bytes SHA1 (patch-colorit.in) = 84e205155cce66b36196c03417deab74c10d8a1a +SHA1 (patch-dictl.in) = 56a0010eefb041474e250e746ba429e66ffd2086 diff --git a/textproc/dict-server/patches/patch-dictl.in b/textproc/dict-server/patches/patch-dictl.in new file mode 100644 index 00000000000..3b2c04149e1 --- /dev/null +++ b/textproc/dict-server/patches/patch-dictl.in @@ -0,0 +1,25 @@ +$NetBSD: patch-dictl.in,v 1.1 2012/06/17 13:18:42 cheusov Exp $ +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677868 +--- dictl.in.orig 2009-01-10 21:16:56.000000000 +0000 ++++ dictl.in +@@ -59,11 +59,17 @@ echo apple | + + ##################################### + ++shquote (){ ++ __cmd=`printf '%s\n' "$1" | sed "s|'|'\\\\\''|g"` ++ printf "%s\n" "'$__cmd'" ++} ++ + cmd='dict' + while test $# -ne 0; do +- cmd="$cmd '$1'" ++ cmd="$cmd "`shquote "$1"` + shift + done +-cmd=$(echo $cmd | charset2charset $DICTL_CHARSET $DICTL_SERVER_CHARSET) + +-eval $cmd -P - | charset2charset $DICTL_SERVER_CHARSET $DICTL_CHARSET ++cmd=$(printf '%s\n' "$cmd" | charset2charset $DICTL_CHARSET $DICTL_SERVER_CHARSET) ++ ++eval "$cmd" | charset2charset $DICTL_SERVER_CHARSET $DICTL_CHARSET |