Hello community,
here is the log from the commit of package lbdb for openSUSE:Factory
checked in at Tue Nov 2 14:28:53 CET 2010.
--------
--- lbdb/lbdb.changes 2009-11-03 20:19:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/lbdb/lbdb.changes 2010-05-19 15:57:11.000000000 +0200
@@ -1,0 +2,11 @@
+Wed May 19 11:52:50 UTC 2010 - lnussel@suse.de
+
+- new version 0.37
+ * Fix bashisms in m_bbdb
+ * Fix query shell functions to catch non-zero exit status in case they
+ get invoked in set -e context.
+ * m_evolution: support line breaks and long lines.
+ * Fix documentation concerning the quotes on lbdbq call
+- fix path to evolution-addressbook-export
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lbdb_0.36.tar.gz
New:
----
lbdb_0.37.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lbdb.spec ++++++
--- /var/tmp/diff_new_pack.i1gbU8/_old 2010-11-02 14:27:58.000000000 +0100
+++ /var/tmp/diff_new_pack.i1gbU8/_new 2010-11-02 14:27:58.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package lbdb (Version 0.36)
+# spec file for package lbdb (Version 0.37)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
Name: lbdb
Summary: Address Database for mutt
-Version: 0.36
-Release: 2
-License: GPL v2 or later
+Version: 0.37
+Release: 1
+License: GPLv2+
Url: http://www.spinnaker.de/lbdb/
Group: Productivity/Networking/Email/Utilities
Source: http://www.spinnaker.de/debian/lbdb_%{version}.tar.gz
@@ -63,7 +63,7 @@
FINGER=/usr/bin/finger ABOOK=/usr/bin/abook \
ADDR_EMAIL=/usr/bin/addr-email SH=/bin/sh \
YPCAT=/usr/bin/ypcat MAWK=/usr/bin/awk \
- EVOLUTION_ADDRESSBOOK_EXPORT='/opt/gnome/lib*/evolution/*/evolution-addressbook-export' \
+ EVOLUTION_ADDRESSBOOK_EXPORT='/usr/lib/evolution/*/evolution-addressbook-export' \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
++++++ lbdb-0.32-evolution.diff ++++++
--- /var/tmp/diff_new_pack.i1gbU8/_old 2010-11-02 14:27:58.000000000 +0100
+++ /var/tmp/diff_new_pack.i1gbU8/_new 2010-11-02 14:27:58.000000000 +0100
@@ -1,8 +1,8 @@
-Index: lbdb-0.36/m_evolution.sh.in
+Index: lbdb-0.37/m_evolution.sh.in
===================================================================
---- lbdb-0.36.orig/m_evolution.sh.in
-+++ lbdb-0.36/m_evolution.sh.in
-@@ -27,9 +27,16 @@
+--- lbdb-0.37.orig/m_evolution.sh.in
++++ lbdb-0.37/m_evolution.sh.in
+@@ -28,9 +28,16 @@
m_evolution_query ()
{
AWK=@AWK@
@@ -18,6 +18,6 @@
+ done
+
+ if [ -x "$EVOLUTION_ADDRESSBOOK_EXPORT" ]; then
- $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
- | $AWK 'BEGIN {FS=":"; RS="\r\n"; name=""} \
- /^END:VCARD/ { if ((name!="" || fileas!="") && email!="") \
+ $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
+ | $AWK 'BEGIN {
+ FS = ":"
++++++ lbdb_0.36.tar.gz -> lbdb_0.37.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/debian/changelog new/lbdb-0.37/debian/changelog
--- old/lbdb-0.36/debian/changelog 2008-06-14 12:39:14.000000000 +0200
+++ new/lbdb-0.37/debian/changelog 2010-05-18 20:03:31.000000000 +0200
@@ -1,3 +1,16 @@
+lbdb (0.37) unstable; urgency=low
+
+ * Fix bashisms in m_bbdb (Closes: #530113).
+ * Fix query shell functions to catch non-zero exit status in case they
+ get invoked in set -e context. Thanks to martin f. krafft
+ for providing a patch (Closes: #515076).
+ * m_evolution: support line breaks and long lines. Thanks to Jan Larres
+ for providing a patch (Closes: #505540).
+ * Fix documentation concerning the quotes on lbdbq call (Closes: #542012).
+ * Upgrade to Standards-Version 3.8.4 (no changes).
+
+ -- Roland Rosenfeld Tue, 18 May 2010 20:03:18 +0200
+
lbdb (0.36) unstable; urgency=low
* Remove duplicate "See also: mutt" from lbdbq.man (Closes: #441588).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/debian/control new/lbdb-0.37/debian/control
--- old/lbdb-0.36/debian/control 2008-06-14 12:29:23.000000000 +0200
+++ new/lbdb-0.37/debian/control 2010-05-18 20:03:31.000000000 +0200
@@ -2,7 +2,7 @@
Section: mail
Priority: optional
Maintainer: Roland Rosenfeld
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5), perl, libvformat1-dev
Homepage: http://www.spinnaker.de/lbdb/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/lbdbq.man.in new/lbdb-0.37/lbdbq.man.in
--- old/lbdb-0.36/lbdbq.man.in 2007-09-16 10:28:33.000000000 +0200
+++ new/lbdb-0.37/lbdbq.man.in 2010-05-18 19:51:02.000000000 +0200
@@ -15,7 +15,7 @@
.\" along with this program; if not, write to the Free Software Foundation,
.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
.\"
-.\" $Id: lbdbq.man.in,v 1.48 2007-09-16 08:28:33 roland Exp $
+.\" $Id: lbdbq.man.in,v 1.49 2010-05-18 17:51:02 roland Exp $
.\"
.TH LBDBQ 1 "September 2007" "Unix" "User Manuals"
.SH NAME
@@ -312,7 +312,7 @@
from mutt, add the following line to your
.I $HOME/.muttrc:
.nf
- set query_command="lbdbq '%s'"
+ set query_command="lbdbq %s"
.fi
.SH OPTIONS
.IP "-v | --version"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_addr_email.sh.in new/lbdb-0.37/m_addr_email.sh.in
--- old/lbdb-0.36/m_addr_email.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_addr_email.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -23,7 +23,7 @@
# This is a frontend to addr-email(1) from the addressbook(1) package,
# which can be found at http://red.roses.de/~clemens/addressbook/.
#
-# $Id: m_addr_email.sh.in,v 1.5 2005-10-29 14:48:09 roland Exp $
+# $Id: m_addr_email.sh.in,v 1.6 2009-06-11 10:56:22 roland Exp $
m_addr_email_query()
{
@@ -33,7 +33,7 @@
then
$ADDR_EMAIL "$@" \
| sed -e 's/^\([^,]*\), \([^:]*\): \(.*\)$/\3 \1 \2/' \
- | grep -a '@'
+ | grep -a '@' || :
# | sed -e 's/\(.*\):[ ]\([^ ].*$\)/\2 \1 addr-email/'
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_bbdb.sh.in new/lbdb-0.37/m_bbdb.sh.in
--- old/lbdb-0.36/m_bbdb.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_bbdb.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_bbdb.sh.in,v 1.7 2005-10-29 14:48:09 roland Exp $
+# $Id: m_bbdb.sh.in,v 1.9 2009-06-11 10:56:22 roland Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -39,7 +39,7 @@
GNUCLIENT=gnuclient
fi
fi
- if [ "$GNUCLIENT" == "no" ]; then
+ if [ "$GNUCLIENT" = "no" ]; then
GNUCLIENT=
fi
@@ -50,7 +50,7 @@
success=1
fi
fi
- if [ $success == 0 ]; then
+ if [ $success = 0 ]; then
if [ -z "$EMACS" ]
then
if type emacs >/dev/null 2>&1; then
@@ -64,5 +64,5 @@
--eval "$form" 2>/dev/null
fi
fi
- fi | grep -va '^$'
+ fi | grep -va '^$' || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_evolution.sh.in new/lbdb-0.37/m_evolution.sh.in
--- old/lbdb-0.36/m_evolution.sh.in 2008-06-14 12:00:12.000000000 +0200
+++ new/lbdb-0.37/m_evolution.sh.in 2009-06-11 13:03:38.000000000 +0200
@@ -4,8 +4,9 @@
#
# m_evolution - Evolution Address book module for lbdb
# Copyright (C) 2004 Guido Guenther
-# Copyright (C) 2004-2006 Roland Rosenfeld
+# Copyright (C) 2004-2009 Roland Rosenfeld
# Copyright (C) 2008 brian m. carlson
+# Copyright (C) 2009 Jan Larres
#
# loosely based on m_gnomecard
#
@@ -30,14 +31,44 @@
EVOLUTION_ADDRESSBOOK_EXPORT=@EVOLUTION_ADDRESSBOOK_EXPORT@
if [ -x $EVOLUTION_ADDRESSBOOK_EXPORT ]; then
- $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
- | $AWK 'BEGIN {FS=":"; RS="\r\n"; name=""} \
- /^END:VCARD/ { if ((name!="" || fileas!="") && email!="") \
- printf("%s\t%s\tEV:%s\n",email,name,fileas); \
- name=""; fileas=""; email=""} \
- /^FN:/ {name=$2; } \
- /^X-EVOLUTION-FILE-AS:/ {fileas=$2; gsub("\\\\", "", fileas)} \
- /^EMAIL[;:]/ {email=$2;}'\
- | grep -ia "$@"
+ $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
+ | $AWK 'BEGIN {
+ FS = ":"
+ RS = "\r\n"
+ name = ""
+ emails = ""
+ last_email = 0
+ }
+ /^END:VCARD/ {
+ if ((name != "" || fileas != "") && emails != "") {
+ sub("^#", "", emails)
+ split(emails, emails_arr, "#")
+ for (email in emails_arr)
+ printf("%s\t%s\tEV:%s\n",emails_arr[email],name,fileas)
+ }
+ name = ""; fileas = ""; emails = ""
+ }
+ /^FN:/ {
+ name = $2
+ }
+ /^X-EVOLUTION-FILE-AS:/ {
+ fileas = $2
+ gsub("\\\\", "", fileas)
+ }
+ # DEST-EMAIL is needed to skip addresses in list contacts
+ /^EMAIL[;:]/ && ! /X-EVOLUTION-DEST-EMAIL/ {
+ emails = emails "#" $2
+ last_email = 1
+ }
+ # only join email lines for performance reasons
+ /^ [^ ]/ && last_email == 1 {
+ cont = $1
+ sub("^ ", "", cont)
+ emails = emails cont
+ }
+ ! /^EMAIL[;:]/ && ! /^ [^ ]/ {
+ last_email = 0
+ }' \
+ | grep -ia "$@" || :
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_fido.sh.in new/lbdb-0.37/m_fido.sh.in
--- old/lbdb-0.36/m_fido.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_fido.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -2,7 +2,7 @@
#
# -*-sh-*-
#
-# $Id: m_fido.sh.in,v 1.7 2005-10-29 14:48:09 roland Exp $
+# $Id: m_fido.sh.in,v 1.8 2009-06-11 10:56:22 roland Exp $
#
# Copyright (C) 1998-2005 Roland Rosenfeld
#
@@ -26,5 +26,5 @@
m_fido_query()
{
test -f $m_fido_db || return
- grep -ia "$@." $m_fido_db
+ grep -ia "$@." $m_fido_db || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_finger.sh.in new/lbdb-0.37/m_finger.sh.in
--- old/lbdb-0.36/m_finger.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_finger.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
-# $Id: m_finger.sh.in,v 1.9 2005-10-29 14:48:09 roland Exp $
+# $Id: m_finger.sh.in,v 1.10 2009-06-11 10:56:22 roland Exp $
m_finger_query()
{
@@ -45,8 +45,7 @@
$FINGER $f_user$athost 2> /dev/null \
| sed -n -e "s/^Login: *\([^ ]*\)[ ]*Name: \(.*\)$/\1@$mailhost \2 (finger)/p" \
-e "s/^Login name: *\([^ ]*\)[ ]*In real life: \(.*\)$/\1@$mailhost \2 (finger)/p" \
- | grep -av 'In real life: ???' \
- || true
+ | grep -av 'In real life: ???' || :
done
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_gnomecard.sh.in new/lbdb-0.37/m_gnomecard.sh.in
--- old/lbdb-0.36/m_gnomecard.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_gnomecard.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_gnomecard.sh.in,v 1.8 2005-10-29 14:48:09 roland Exp $
+# $Id: m_gnomecard.sh.in,v 1.9 2009-06-11 10:56:22 roland Exp $
#
prefix=@prefix@
@@ -65,7 +65,7 @@
type=substr($1,7); \
printf ("%s\t%s\tGC:%s\n", \
email, name, type) }' \
- < $file | grep -ia "$@"
+ < $file | grep -ia "$@" || :
fi
done
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_gpg.sh.in new/lbdb-0.37/m_gpg.sh.in
--- old/lbdb-0.36/m_gpg.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_gpg.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_gpg.sh.in,v 1.25 2005-10-29 14:48:09 roland Exp $
+# $Id: m_gpg.sh.in,v 1.26 2009-06-11 10:56:22 roland Exp $
#
m_gpg_query()
@@ -31,7 +31,7 @@
| grep -a '^\(pub\|uid\):[^re]:\([^:]*:\)\{7,7\}[^<>:]* <[^<>@: ]*@[^<>@: ]*>[^<>@:]*:' \
| sed -e 's/^\([^:]*:\)\{9,9\}\([^<:]*\) <\([^>:]*\)>.*:.*$/\3 \2 (GnuPG)/' \
| sed -e 's/ \([^ ]\{27,27\}\)[^ ]* / \1... /' \
- | grep -ia "$@"
+ | grep -ia "$@" || :
# $GPG --list-keys --no-greeting "$@" 2>/dev/null \
# | grep -a '^\(pub\|uid\) .\{25,25\} [^<>]* <[^<>@ ]*@[^<>@ ]*>' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_inmail.sh.in new/lbdb-0.37/m_inmail.sh.in
--- old/lbdb-0.36/m_inmail.sh.in 2005-10-29 16:48:09.000000000 +0200
+++ new/lbdb-0.37/m_inmail.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_inmail.sh.in,v 1.13 2005-10-29 14:48:09 roland Exp $
+# $Id: m_inmail.sh.in,v 1.14 2009-06-11 10:56:22 roland Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -30,5 +30,5 @@
export SORT_OUTPUT
$libdir/lbdb-munge
test -f $m_inmail_db || return
- grep -ia "$@." $m_inmail_db
+ grep -ia "$@." $m_inmail_db || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_ldap.sh.in new/lbdb-0.37/m_ldap.sh.in
--- old/lbdb-0.36/m_ldap.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_ldap.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -5,7 +5,7 @@
# m_ldap - ldap module for lbdb
# Copyright (C) 2001 Marc de Courville
#
-# $Id: m_ldap.sh.in,v 1.5 2005-10-29 14:48:10 roland Exp $
+# $Id: m_ldap.sh.in,v 1.6 2009-06-11 10:56:22 roland Exp $
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,9 +31,9 @@
then
for NICK in $LDAP_NICKS
do
- $libdir/mutt_ldap_query --lbdb_output --nickname=$NICK "$@"
+ $libdir/mutt_ldap_query --lbdb_output --nickname=$NICK "$@" || :
done
else
- $libdir/mutt_ldap_query --lbdb_output "$@"
+ $libdir/mutt_ldap_query --lbdb_output "$@" || :
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_muttalias.sh.in new/lbdb-0.37/m_muttalias.sh.in
--- old/lbdb-0.36/m_muttalias.sh.in 2007-05-27 10:42:22.000000000 +0200
+++ new/lbdb-0.37/m_muttalias.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_muttalias.sh.in,v 1.10 2007-05-27 08:42:22 roland Exp $
+# $Id: m_muttalias.sh.in,v 1.11 2009-06-11 10:56:22 roland Exp $
m_muttalias_query()
{
@@ -39,7 +39,7 @@
-e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*\(\\\".*\\\"[^<>()]*\|[^<>()]*\)<\([^<>()]*\)>[^<>]*$/\3 \2 alias \1/' \
-e 's/^alias[ ][ ]*\([^ ][^ ]*\)[ ][ ]*\([^<>()]*\)(\(\\\".*\\\"[^<>()]*\|[^<>()]*\))[^()<>]*$/\2 \3 alias \1/' \
-e 's/\\\"//g' \
- | grep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$'
+ | grep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$' || :
fi
done
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_osx_addressbook.sh.in new/lbdb-0.37/m_osx_addressbook.sh.in
--- old/lbdb-0.36/m_osx_addressbook.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_osx_addressbook.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -24,5 +24,5 @@
m_osx_addressbook_query()
{
- $libdir/ABQuery "$@" | grep -ia "$@"
+ $libdir/ABQuery "$@" | grep -ia "$@" || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_palm.sh.in new/lbdb-0.37/m_palm.sh.in
--- old/lbdb-0.36/m_palm.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_palm.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_palm.sh.in,v 1.7 2005-10-29 14:48:10 roland Exp $
+# $Id: m_palm.sh.in,v 1.8 2009-06-11 10:56:22 roland Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -30,5 +30,5 @@
{
palmdatabase=${PALM_ADDRESS_DATABASE:-$HOME/.jpilot/AddressDB.pdb}
test -f $palmdatabase || return
- $libdir/palm_lsaddr $palmdatabase | grep -ia "$@"
+ $libdir/palm_lsaddr $palmdatabase | grep -ia "$@" || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_passwd.sh.in new/lbdb-0.37/m_passwd.sh.in
--- old/lbdb-0.36/m_passwd.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_passwd.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_passwd.sh.in,v 1.12 2005-10-29 14:48:10 roland Exp $
+# $Id: m_passwd.sh.in,v 1.13 2009-06-11 10:56:22 roland Exp $
#
m_passwd_query()
@@ -34,5 +34,5 @@
esac
sed -e "s/^\([^:]*\):[^:]*:\([^:]*\):[^:]*:\([^:,]*\)[,:].*\$/\1@$HOST \3 UID \2/" /etc/passwd \
- | grep -ia "$@" | grep -a "$IGNORESYS"
+ | grep -ia "$@" | grep -a "$IGNORESYS" || :
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_pgp5.sh.in new/lbdb-0.37/m_pgp5.sh.in
--- old/lbdb-0.36/m_pgp5.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_pgp5.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_pgp5.sh.in,v 1.12 2005-10-29 14:48:10 roland Exp $
+# $Id: m_pgp5.sh.in,v 1.13 2009-06-11 10:56:22 roland Exp $
#
m_pgp5_query()
@@ -31,6 +31,6 @@
| grep -a '^uid ...* <[^<>@:/ ]*@[^<>@ ]*>[^<>@]*$' \
| sed -e 's/^uid \(.*\) <\(.*\)>.*$/\2 \1 (PGP5)/' \
| sed -e 's/ \([^ ]\{27,27\}\)[^ ]* / \1... /' \
- | grep -ia "$@"
+ | grep -ia "$@" || :
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/mutt_ldap_query.pl.in new/lbdb-0.37/mutt_ldap_query.pl.in
--- old/lbdb-0.36/mutt_ldap_query.pl.in 2008-06-14 12:24:46.000000000 +0200
+++ new/lbdb-0.37/mutt_ldap_query.pl.in 2010-05-18 20:10:30.000000000 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 2000-2006 Marc de Courville
# Copyright (C) 2005-2007 Roland Rosenfeld
#
-# $Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 roland Exp $
+# $Id: mutt_ldap_query.pl.in,v 1.28 2010-05-18 18:10:30 roland Exp $
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@
# Return version string from CVS tag
sub versionstring {
- my $ver = ' $Name: debian_version_0_36 $ ';
+ my $ver = ' $Name: debian_version_0_37 $ ';
$ver =~ s/Name//g;
$ver =~ s/[:\$]//g;
$ver =~ s/\s+//g;
@@ -131,7 +131,7 @@
if ($version) {
print "mutt_ldap_query version " . &versionstring() . "\n";
- print '$Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 roland Exp $ ' . "\n";
+ print '$Id: mutt_ldap_query.pl.in,v 1.28 2010-05-18 18:10:30 roland Exp $ ' . "\n";
exit(0);
}
@@ -359,7 +359,7 @@
This perl script can be interfaced with mutt by defining in your .muttrc:
- set query_command = "mutt_ldap_query.pl '%s'"
+ set query_command = "mutt_ldap_query.pl %s"
Multiple requests are supported: the "Q" command of mutt accepts as argument
a list of queries (e.g. "Gosse de\ Courville").
@@ -368,7 +368,7 @@
little brother database query program (http://www.spinnaker.de/lbdb/)
using:
- set query_command = "lbdbq '%s'"
+ set query_command = "lbdbq %s"
and by specifying in your ~/.lbdb/lbdbrc file another method of query
just adding to the METHODS variable the m_ldap module e.g.:
@@ -544,6 +544,8 @@
just like this one 8-)
http://www.spinnaker.de/lbdb/
+=back
+
=head1 AUTHORS
Marc de Courville and the various other contributors... that kindly sent their patches.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_wanderlust.sh.in new/lbdb-0.37/m_wanderlust.sh.in
--- old/lbdb-0.36/m_wanderlust.sh.in 2005-10-29 16:48:10.000000000 +0200
+++ new/lbdb-0.37/m_wanderlust.sh.in 2009-06-11 12:56:22.000000000 +0200
@@ -18,7 +18,7 @@
## along with this program; if not, write to the Free Software Foundation,
## Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
#
-# $Id: m_wanderlust.sh.in,v 1.6 2005-10-29 14:48:10 roland Exp $
+# $Id: m_wanderlust.sh.in,v 1.7 2009-06-11 10:56:22 roland Exp $
m_wanderlust_query()
{
@@ -28,6 +28,6 @@
then
grep -ia "$@" $addresses \
| sed -e 's,^\([^ ]\+\)[ ]\+"\([^"]*\)"[ ]\+"\([^"]\+\)",\1 \3 wl \2,g' \
- | grep -a '^[^ ][^ ]* [^ ][^ ]* wl '
+ | grep -a '^[^ ][^ ]* [^ ][^ ]* wl ' || :
fi
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org