diff -Nru -w kwalletcli-2.02/BSDmakefile kwalletcli-2.03/BSDmakefile --- kwalletcli-2.02/BSDmakefile 2010-01-11 19:34:35.000000000 +0100 +++ kwalletcli-2.03/BSDmakefile 2010-10-31 11:43:25.000000000 +0100 @@ -1,4 +1,4 @@ -# $MirOS: contrib/hosted/tg/code/kwalletcli/BSDmakefile,v 1.11 2010/01/11 18:34:11 tg Exp $ +# $MirOS: contrib/hosted/tg/code/kwalletcli/BSDmakefile,v 1.12 2010/10/31 10:43:01 tg Exp $ #- # Copyright © 2009, 2010 # Thorsten Glaser @@ -28,11 +28,11 @@ .if ${KDE_VER} == 3 KDE_INCS?= -I/usr/include/qt3 -I/usr/include/kde SRCS+= kwif3.cc -LDADD+= -lkwalletclient +LDADD+= -lkwalletclient -lkdecore -lqt-mt .elif ${KDE_VER} == 4 KDE_INCS?= -I/usr/include/qt4 -I/usr/include/qt4/QtCore SRCS+= kwif4.cc -LDADD+= -lkdeui +LDADD+= -lkdeui -lkdecore -lQtCore .else . error unknown KDE_VER .endif diff -Nru -w kwalletcli-2.02/debian/changelog kwalletcli-2.03/debian/changelog --- kwalletcli-2.02/debian/changelog 2010-10-21 05:31:44.000000000 +0200 +++ kwalletcli-2.03/debian/changelog 2010-11-17 00:35:41.000000000 +0100 @@ -1,3 +1,28 @@ +kwalletcli (2.03-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #676299). Remaining changes: + - Remove optional dependency on pinentry-qt, as it is no longer built + from source and this optional dependency was preventing its removal + * Dropped change (superceded in Debian): + - Fix FTBFS due to indirect linking. + + Add 01_fix_build_indirect_linking.diff + + -- Angel Abad Tue, 16 Nov 2010 23:38:21 +0100 + +kwalletcli (2.03-1) unstable; urgency=low + + * New upstream version; changes: + - Fix building the kwalletcli binary with indirect linking; + patch from Felix Geyer + - In kwalletaskpass(1), do not even attempt to call kwalletcli + if $DISPLAY is unset or empty, it will not be able to commu- + nicate with it anyway. Fixes spurious “Do you want to store … + in the KDE Wallet?” questions when logged in via ssh(1). + - Small documentation improvements, mostly re. $DISPLAY + * Policy 3.9.1, no relevant changes + + -- Thorsten Glaser Tue, 16 Nov 2010 09:38:52 +0000 + kwalletcli (2.02-2ubuntu2) natty; urgency=low * Remove optional dependency on pinentry-qt, as it is no longer built diff -Nru -w kwalletcli-2.02/debian/control kwalletcli-2.03/debian/control --- kwalletcli-2.02/debian/control 2010-10-21 05:24:13.000000000 +0200 +++ kwalletcli-2.03/debian/control 2010-11-16 19:08:27.000000000 +0100 @@ -1,4 +1,4 @@ -# $MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/control,v 1.7 2010/07/19 20:39:21 tg Exp $ +# $MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/control,v 1.8 2010/11/16 09:50:47 tg Exp $ # Source: kwalletcli Section: kde @@ -7,7 +7,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Thorsten Glaser Build-Depends: debhelper (>= 5), kdelibs5-dev, libqt4-dev -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 # First word is the $CVSROOT (-d arg) string, second word the module. # Upstream is on the same server, in the "kwalletcli" module. Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/kwalletcli/deb-kde4 diff -Nru -w kwalletcli-2.02/debian/copyright kwalletcli-2.03/debian/copyright --- kwalletcli-2.02/debian/copyright 2010-10-21 05:31:47.000000000 +0200 +++ kwalletcli-2.03/debian/copyright 2010-11-17 00:35:54.000000000 +0100 @@ -1,10 +1,10 @@ This package was debianised by Thorsten Glaser on Wed Jul 8 15:29:22 UTC 2009. -$MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/copyright.hdr,v 1.3 2010/03/03 11:31:18 tg Exp $ +$MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/copyright.hdr,v 1.4 2010/11/16 09:50:47 tg Exp $ It was downloaded from: -https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-2.02.tar.gz +https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-2.03.tar.gz Note: on Debian systems, the complete text of the GNU LGPL can diff -Nru -w kwalletcli-2.02/debian/copyright.hdr kwalletcli-2.03/debian/copyright.hdr --- kwalletcli-2.02/debian/copyright.hdr 2010-03-03 16:50:50.000000000 +0100 +++ kwalletcli-2.03/debian/copyright.hdr 2010-11-16 19:08:27.000000000 +0100 @@ -1,10 +1,10 @@ This package was debianised by Thorsten Glaser on Wed Jul 8 15:29:22 UTC 2009. -$MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/copyright.hdr,v 1.3 2010/03/03 11:31:18 tg Exp $ +$MirOS: contrib/hosted/tg/deb/kwalletcli/deb-kde4/copyright.hdr,v 1.4 2010/11/16 09:50:47 tg Exp $ It was downloaded from: -https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-2.02.tar.gz +https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-2.03.tar.gz Note: on Debian systems, the complete text of the GNU LGPL can diff -Nru -w kwalletcli-2.02/debian/patches/01_fix_build_indirect_linking.diff kwalletcli-2.03/debian/patches/01_fix_build_indirect_linking.diff --- kwalletcli-2.02/debian/patches/01_fix_build_indirect_linking.diff 2010-10-19 22:04:35.000000000 +0200 +++ kwalletcli-2.03/debian/patches/01_fix_build_indirect_linking.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Description: Fix FTBFS due to indirect linking. -Author: Felix Geyer - ---- kwalletcli-2.02.orig/GNUmakefile -+++ kwalletcli-2.02/GNUmakefile -@@ -41,7 +41,7 @@ ifeq (${KDE_VER},4) - KDE_INCS?= -I/usr/include/qt4 -I/usr/include/qt4/QtCore - SRCS+= kwif4.cc - OBJS+= kwif4.o --LDADD+= -lkdeui -+LDADD+= -lQtCore -lkdecore -lkdeui - else - $(error unknown KDE_VER) - endif diff -Nru -w kwalletcli-2.02/debian/patches/series kwalletcli-2.03/debian/patches/series --- kwalletcli-2.02/debian/patches/series 2010-10-19 22:03:13.000000000 +0200 +++ kwalletcli-2.03/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -01_fix_build_indirect_linking.diff diff -Nru -w kwalletcli-2.02/GNUmakefile kwalletcli-2.03/GNUmakefile --- kwalletcli-2.02/GNUmakefile 2009-10-09 11:03:57.000000000 +0200 +++ kwalletcli-2.03/GNUmakefile 2010-10-31 11:43:26.000000000 +0100 @@ -1,4 +1,4 @@ -# $MirOS: contrib/hosted/tg/code/kwalletcli/GNUmakefile,v 1.9 2009/10/09 09:03:33 tg Exp $ +# $MirOS: contrib/hosted/tg/code/kwalletcli/GNUmakefile,v 1.10 2010/10/31 10:43:02 tg Exp $ #- # Copyright © 2009 # Thorsten Glaser @@ -35,13 +35,13 @@ KDE_INCS?= -I/usr/include/qt3 -I/usr/include/kde SRCS+= kwif3.cc OBJS+= kwif3.o -LDADD+= -lkwalletclient +LDADD+= -lkwalletclient -lkdecore -lqt-mt else ifeq (${KDE_VER},4) KDE_INCS?= -I/usr/include/qt4 -I/usr/include/qt4/QtCore SRCS+= kwif4.cc OBJS+= kwif4.o -LDADD+= -lkdeui +LDADD+= -lkdeui -lkdecore -lQtCore else $(error unknown KDE_VER) endif diff -Nru -w kwalletcli-2.02/kwalletaskpass kwalletcli-2.03/kwalletaskpass --- kwalletcli-2.02/kwalletaskpass 2009-07-09 21:18:48.000000000 +0200 +++ kwalletcli-2.03/kwalletaskpass 2010-11-16 10:11:39.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env mksh -# $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass,v 1.3 2009/07/09 19:18:24 tg Exp $ +# $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass,v 1.4 2010/11/16 09:11:15 tg Exp $ #- -# Copyright © 2009 +# Copyright © 2009, 2010 # Thorsten Glaser # # Provided that these terms and disclaimer and all copyright notices @@ -31,7 +31,7 @@ rv=1 trywallet=0 -if [[ $1 = @(Enter passphrase for )* ]]; then +if [[ -n $DISPLAY && $1 = @(Enter passphrase for )* ]]; then trywallet=1 pw=$(kwalletcli -q -f kwalletaskpass -e "${1#Enter }") rv=$? diff -Nru -w kwalletcli-2.02/kwalletaskpass.1 kwalletcli-2.03/kwalletaskpass.1 --- kwalletcli-2.02/kwalletaskpass.1 2009-11-22 19:23:54.000000000 +0100 +++ kwalletcli-2.03/kwalletaskpass.1 2010-11-16 10:16:32.000000000 +0100 @@ -1,6 +1,6 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.3 2009/11/22 18:23:30 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.5 2010/11/16 09:16:08 tg Exp $ .\"- -.\" Copyright © 2009 +.\" Copyright © 2009, 2010 .\" Thorsten Glaser .\" .\" Provided that these terms and disclaimer and all copyright notices @@ -47,7 +47,7 @@ .el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 .. .\"- -.Dd $Mdocdate: November 22 2009 $ +.Dd $Mdocdate: November 16 2010 $ .Dt KWALLETASKPASS 1 .Os .Sh NAME @@ -86,6 +86,11 @@ or \*(Gt1 if an error occured. .Sh ENVIRONMENT .Bl -tag -width PINENTRY +.It Ev DISPLAY +The X11 display to use for child processes. +If this is unset or empty, +.Nm kwalletcli +will not be called. .It Ev PINENTRY The .Nm pinentry diff -Nru -w kwalletcli-2.02/kwalletcli.1 kwalletcli-2.03/kwalletcli.1 --- kwalletcli-2.02/kwalletcli.1 2010-03-03 10:53:59.000000000 +0100 +++ kwalletcli-2.03/kwalletcli.1 2010-11-16 10:16:32.000000000 +0100 @@ -1,4 +1,4 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.11 2010/03/03 09:53:35 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.12 2010/11/16 09:16:08 tg Exp $ .\"- .\" Copyright © 2009, 2010 .\" Thorsten Glaser @@ -47,7 +47,7 @@ .el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 .. .\"- -.Dd $Mdocdate: March 3 2010 $ +.Dd $Mdocdate: November 16 2010 $ .Dt KWALLETCLI 1 .Os .Sh NAME @@ -66,7 +66,7 @@ The .Nm utility is a command line interface to KWallet. -It will only work if KDE is running (DCOP). +It will only work if KDE is running (DCOP) and reachable (via X11). .Nm can be used to get password entries from the Wallet, or to write them there. @@ -140,6 +140,11 @@ that the folder or entry specified does not exist. The other errors are fatal and may be used to indicate the user that the KWallet should not be used any more during the current session. +.Sh ENVIRONMENT +.Bl -tag -width DISPLAY +.It Ev DISPLAY +The X11 display to use for communicating with the KDE Wallet. +.El .Sh SEE ALSO .Xr kwalletcli_getpin 1 .Sh AUTHORS