kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug in dictl reported in Debian Linux (bug# 677868).

Browse source 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677868
Dump pkgrevision for dict-client
This commit is contained in:
cheusov 2012-06-17 13:18:42 +00:00
parent e9ce82592e
commit 1789d4eca5
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
textproc/dict-client/Makefile
View file

@ -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"

3
textproc/dict-server/distinfo
View file

@ -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

25
textproc/dict-server/patches/patch-dictl.in Normal file
View file

@ -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