Hello community,
here is the log from the commit of package lbdb
checked in at Wed Oct 8 18:56:04 CEST 2008.
--------
--- lbdb/lbdb.changes 2007-08-10 15:17:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/lbdb/lbdb.changes 2008-10-07 08:44:18.812772000 +0200
@@ -1,0 +2,18 @@
+Thu Oct 2 12:15:55 CEST 2008 - lnussel@suse.de
+
+- new version 0.36
+ * Remove duplicate "See also: mutt" from lbdbq.man.
+ * Update configure using autconf 2.61.
+ * Apply charset conversation patch by Peter Colberg based on code by
+ Tobias Schlemmer.
+ * Remove duplicate declaration of $ignorant.
+ * Handle mail addresses in mutt_ldap_query correct. Thanks to Colin
+ Watson for providing a patch.
+ * Mention ldapi URIs in mutt_ldap_query man page.
+ * Protect "make distclean" by checking whether makefile exists.
+ * Upgrade to Standards-Version 3.8.0:
+ - Fix Homepage header in control file.
+ * Add copyright holders to debian/copyright file.
+ * Remove outdated override.Lintian.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lbdb_0.35.1.tar.gz
New:
----
lbdb_0.36.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lbdb.spec ++++++
--- /var/tmp/diff_new_pack.C25590/_old 2008-10-08 18:55:13.000000000 +0200
+++ /var/tmp/diff_new_pack.C25590/_new 2008-10-08 18:55:13.000000000 +0200
@@ -1,21 +1,29 @@
#
-# spec file for package lbdb (Version 0.35.1)
+# spec file for package lbdb (Version 0.36)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: lbdb
Summary: Address Database for mutt
-Version: 0.35.1
+Version: 0.36
Release: 1
License: GPL v2 or later
-URL: http://www.spinnaker.de/lbdb/
+Url: http://www.spinnaker.de/lbdb/
Group: Productivity/Networking/Email/Utilities
Source: http://www.spinnaker.de/debian/lbdb_%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,7 +72,6 @@
make
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
BUILD_ROOT=${RPM_BUILD_ROOT} make \
prefix=${RPM_BUILD_ROOT}%{_prefix} \
@@ -86,59 +93,74 @@
%doc %{_mandir}/man?/*
%changelog
-* Fri Aug 10 2007 - lnussel@suse.de
+* Thu Oct 02 2008 lnussel@suse.de
+- new version 0.36
+ * Remove duplicate "See also: mutt" from lbdbq.man.
+ * Update configure using autconf 2.61.
+ * Apply charset conversation patch by Peter Colberg based on code by
+ Tobias Schlemmer.
+ * Remove duplicate declaration of $ignorant.
+ * Handle mail addresses in mutt_ldap_query correct. Thanks to Colin
+ Watson for providing a patch.
+ * Mention ldapi URIs in mutt_ldap_query man page.
+ * Protect "make distclean" by checking whether makefile exists.
+ * Upgrade to Standards-Version 3.8.0:
+ - Fix Homepage header in control file.
+ * Add copyright holders to debian/copyright file.
+ * Remove outdated override.Lintian.
+* Fri Aug 10 2007 lnussel@suse.de
- new version 0.35.1
* supports ldaps
-* Wed May 16 2007 - lnussel@suse.de
+* Wed May 16 2007 lnussel@suse.de
- new version 0.34
* vcquery: avoid free() on unallocated memory if fullname is not set.
* vcquery: Use value of concatenated N fields if FN field is missing.
- fix hostname lookup if multiple domains are listed in resolv.conf
-* Mon Oct 16 2006 - lnussel@suse.de
+* Mon Oct 16 2006 lnussel@suse.de
- new version 0.33
* Add SORT_OUTPUT=reverse_comment to do reverse sort by the third column
(most recent m_inmail timestamp at the top).
* Comment out LDAP_NICKS in lbdb.rc because this should only be an
example and if it is set there it overrides other LDAP settings
-* Thu Aug 24 2006 - lnussel@suse.de
+* Thu Aug 24 2006 lnussel@suse.de
- new version 0.32
- fix path to evolution-addressbook-export
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Mon May 09 2005 - lnussel@suse.de
+* Mon May 09 2005 lnussel@suse.de
- update to version 0.30
-* Fri Feb 27 2004 - lnussel@suse.de
+* Fri Feb 27 2004 lnussel@suse.de
- run configure similar to the original debian package to reduce
neededforbuild and to fix evolution addressbook query
- add gpg to default address query methods
-* Thu Feb 26 2004 - lnussel@suse.de
+* Thu Feb 26 2004 lnussel@suse.de
- update to version 0.29
-* Sun Feb 08 2004 - lnussel@suse.de
+* Sun Feb 08 2004 lnussel@suse.de
- update to version 0.28.2
- use %%optflags, fix aliasing problems
-* Wed Feb 12 2003 - lnussel@suse.de
+* Wed Feb 12 2003 lnussel@suse.de
- new version 0.26.2
* new ldap option $ignorant
* support for multiple abook address books
-* Fri Aug 16 2002 - ro@suse.de
+* Fri Aug 16 2002 ro@suse.de
- removed emtpy post/postun scripts (#17916)
-* Thu Apr 25 2002 - lnussel@suse.de
+* Thu Apr 25 2002 lnussel@suse.de
- new version 0.26
- now uses m_getent instead of m_passwd (lbdb.rc.dif)
- moved files from %%{_prefix}/lib to %%{_libdir}/lbdb
-* Tue Jul 24 2001 - lnussel@suse.de
+* Tue Jul 24 2001 lnussel@suse.de
- new version 0.25
-* Tue Mar 20 2001 - lnussel@suse.de
+* Tue Mar 20 2001 lnussel@suse.de
- new version 0.24
- added finger to neededforbuild
-* Wed Feb 07 2001 - lnussel@suse.de
+* Wed Feb 07 2001 lnussel@suse.de
- new version 0.23
- neededforbuild: ypbind -> yp-tools
-* Thu Nov 30 2000 - ro@suse.de
+* Thu Nov 30 2000 ro@suse.de
- neededforbuild: ypclient -> ypbind
-* Thu Oct 12 2000 - lnussel@suse.de
+* Thu Oct 12 2000 lnussel@suse.de
- new version 0.21.1
- cleaned up spec file
- changed Group to Applications/Mail
-* Tue Aug 29 2000 - lnussel@suse.de
+* Tue Aug 29 2000 lnussel@suse.de
- initial check in
++++++ lbdb_0.35.1.tar.gz -> lbdb_0.36.tar.gz ++++++
++++ 11811 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/configure.in new/lbdb-0.36/configure.in
--- old/lbdb-0.35.1/configure.in 2005-10-29 14:41:45.000000000 +0200
+++ new/lbdb-0.36/configure.in 2007-10-28 17:33:35.000000000 +0100
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.46 2005-10-29 12:41:45 roland Exp $
+dnl $Id: configure.in,v 1.47 2007-10-28 16:33:35 roland Exp $
AC_INIT(fetchaddr.c)
@@ -15,6 +15,8 @@
AC_CHECK_HEADER(getopt.h, AC_DEFINE(HAVE_GETOPT_H))
+AM_ICONV
+
dnl SH=NONE
dnl If we are runnin bash right now, BASH is set.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/changelog new/lbdb-0.36/debian/changelog
--- old/lbdb-0.35.1/debian/changelog 2007-05-28 11:04:52.000000000 +0200
+++ new/lbdb-0.36/debian/changelog 2008-06-14 12:39:14.000000000 +0200
@@ -1,3 +1,30 @@
+lbdb (0.36) unstable; urgency=low
+
+ * Remove duplicate "See also: mutt" from lbdbq.man (Closes: #441588).
+ * Update configure using autconf 2.61.
+ * Apply charset conversation patch by Peter Colberg based on code by
+ Tobias Schlemmer (Closes: #355678).
+ * Remove duplicate declaration of $ignorant (Closes: #480356, #483701).
+ * Handle mail addresses in mutt_ldap_query correct. Thanks to Colin
+ Watson for providing a patch (Closes: #469288).
+ * Mention ldapi URIs in mutt_ldap_query man page (Closes: #422730).
+ * Protect "make distclean" by checking whether makefile exists.
+ * Upgrade to Standards-Version 3.8.0:
+ - Fix Homepage header in control file.
+ * Add copyright holders to debian/copyright file.
+ * Remove outdated override.Lintian.
+
+ -- Roland Rosenfeld Sat, 14 Jun 2008 12:39:06 +0200
+
+lbdb (0.35.1+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix m_evolution to work also with recent Evolution which exports cards
+ with different FN/EMAIL fields ordering. Thanks to Brian M. Carlson for
+ the patch (Closes: #462573).
+
+ -- Stefano Zacchiroli Sat, 12 Apr 2008 17:44:04 +0200
+
lbdb (0.35.1) unstable; urgency=low
* New mail address of Brian Salter-Duke .
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/control new/lbdb-0.36/debian/control
--- old/lbdb-0.35.1/debian/control 2006-08-13 11:14:04.000000000 +0200
+++ new/lbdb-0.36/debian/control 2008-06-14 12:29:23.000000000 +0200
@@ -2,8 +2,9 @@
Section: mail
Priority: optional
Maintainer: Roland Rosenfeld
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5), perl, libvformat1-dev
+Homepage: http://www.spinnaker.de/lbdb/
Package: lbdb
Architecture: any
@@ -33,5 +34,3 @@
- m_ldap (query some LDAP server)
- m_evolution (search in the Evolution addressbook)
- m_vcf (search in vcard files using libvformat)
- .
- Homepage: http://www.spinnaker.de/lbdb/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/copyright new/lbdb-0.36/debian/copyright
--- old/lbdb-0.35.1/debian/copyright 2005-10-29 16:48:19.000000000 +0200
+++ new/lbdb-0.36/debian/copyright 2008-06-14 12:37:50.000000000 +0200
@@ -13,6 +13,24 @@
Copyright:
+Copyright (C) 1998-2000 Thomas Roessler
+ 1996-2000 Michael R. Elkins
+ 2000-2001 Dave Pearson
+ 2000-2001 Ross Campbell
+ 2000 Torsten Jerzembeck
+ 2000 Rick Frankel
+ 2000 Brian Salter-Duke
+ 2000 Gabor Fleischer
+ 2000-2006 Marc de Courville
+ 2001 Utz-Uwe Haus
+ 2002 Gergely Nagy
+ 2003 Aaron Kaplan
+ 2003 Nikolaus Rath
+ 2003-2005 Brendan Cully
+ 2004 Guido Guenther
+ 2008 brian m. carlson
+ 1998-2008 Roland Rosenfeld
+
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
the Free Software Foundation; either version 2 of the License, or (at
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/dirs new/lbdb-0.36/debian/dirs
--- old/lbdb-0.35.1/debian/dirs 2000-11-24 21:20:47.000000000 +0100
+++ new/lbdb-0.36/debian/dirs 2008-06-14 12:40:23.000000000 +0200
@@ -1,3 +1,2 @@
etc
usr/share/emacs/site-lisp/lbdb
-usr/share/lintian/overrides
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/override.Lintian new/lbdb-0.36/debian/override.Lintian
--- old/lbdb-0.35.1/debian/override.Lintian 2000-08-21 14:05:16.000000000 +0200
+++ new/lbdb-0.36/debian/override.Lintian 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-lbdb: perl-script-uses-unknown-module ./usr/lib/lbdb/palm_lsaddr use Palm::PDB
-lbdb: perl-script-uses-unknown-module ./usr/lib/lbdb/palm_lsaddr use Palm::Address
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/debian/rules new/lbdb-0.36/debian/rules
--- old/lbdb-0.35.1/debian/rules 2006-01-15 14:59:41.000000000 +0100
+++ new/lbdb-0.36/debian/rules 2008-06-14 12:39:14.000000000 +0200
@@ -42,7 +42,7 @@
dh_testroot
rm -f build-stamp
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f lbdb.spec
dh_clean
@@ -56,8 +56,6 @@
$(MAKE) install_prefix=$(DROOT) install
install -m644 -oroot -groot lbdb.el \
$(DROOT)/usr/share/emacs/site-lisp/lbdb/lbdb.el
- install -m644 -oroot -groot debian/override.Lintian \
- $(DROOT)/usr/share/lintian/overrides/lbdb
# Build architecture-independent files here.
binary-indep: build install
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/fetchaddr.c new/lbdb-0.36/fetchaddr.c
--- old/lbdb-0.35.1/fetchaddr.c 2005-10-29 16:48:08.000000000 +0200
+++ new/lbdb-0.36/fetchaddr.c 2007-10-28 17:33:35.000000000 +0100
@@ -20,7 +20,7 @@
*
*/
-/* $Id: fetchaddr.c,v 1.22 2005-10-29 14:48:08 roland Exp $ */
+/* $Id: fetchaddr.c,v 1.23 2007-10-28 16:33:35 roland Exp $ */
#include
#include
@@ -119,6 +119,9 @@
char *headerlist = NULL;
char *fieldname, *next;
char create_real_name = 0;
+#ifdef HAVE_ICONV
+ const char **charsetptr = &Charset;
+#endif
/* process command line arguments: */
if (argc > 1) {
@@ -128,6 +131,10 @@
datefmt = argv[++i];
} else if (!strcmp (argv[i], "-x") && i+1 < argc) {
headerlist = argv[++i];
+#ifdef HAVE_ICONV
+ } else if (!strcmp (argv[i], "-c") && i+1 < argc) {
+ *charsetptr = argv[++i];
+#endif
} else if (!strcmp (argv[i], "-a")) {
create_real_name = 1;
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/lbdb-fetchaddr.man.in new/lbdb-0.36/lbdb-fetchaddr.man.in
--- old/lbdb-0.35.1/lbdb-fetchaddr.man.in 2005-10-29 16:48:08.000000000 +0200
+++ new/lbdb-0.36/lbdb-fetchaddr.man.in 2007-10-28 17:33:36.000000000 +0100
@@ -24,6 +24,8 @@
.IR dateformat ]
.RB [ -x
.IR headerfieldlist ]
+.RB [ -c
+.IR charset ]
.RB [ -a ]
.br
.B lbdb-fetchaddr
@@ -88,6 +90,12 @@
mail addresses. If this option isn't given, we fall back to
.RB ` from:to:cc:resent-from:resent-to '.
.TP
+.BI -c " charset"
+The charset which will be used to write the database. This should be
+the charset which the application expects (normally the one from your
+current locale). If this option isn't given, we fall back to
+.RB ` iso-8859-15 '.
+.TP
.B -a
Also grab addresses without a real name. Use the local part of the
mail address as real name.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/lbdb-fetchaddr.sh.in new/lbdb-0.36/lbdb-fetchaddr.sh.in
--- old/lbdb-0.35.1/lbdb-fetchaddr.sh.in 2005-10-29 16:48:08.000000000 +0200
+++ new/lbdb-0.36/lbdb-fetchaddr.sh.in 2007-10-28 17:33:36.000000000 +0100
@@ -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: lbdb-fetchaddr.sh.in,v 1.19 2005-10-29 14:48:08 roland Exp $
+# $Id: lbdb-fetchaddr.sh.in,v 1.20 2007-10-28 16:33:36 roland Exp $
LBDB_VERSION=@LBDB_VERSION@
@@ -41,6 +41,7 @@
echo " -h this short help"
echo " -d 'dateformat' select date format using strftime(3)"
echo " -x 'from:to:cc' colon separated list of header fields"
+ echo " -c 'charset' charset for the database storage"
echo " -a also grep addresses without realname"
}
@@ -69,6 +70,13 @@
hdrlist="-x $1"
fi
;;
+ -c)
+ if [ $# -gt 1 ]
+ then
+ shift
+ charset="-c $1"
+ fi
+ ;;
-a)
additional_param="$additional_param $1"
;;
@@ -112,7 +120,7 @@
exit 1
fi
-if $fetchaddr $additional_param -d "$datefmt" $hdrlist >> $db ; then
+if $fetchaddr $additional_param -d "$datefmt" $hdrlist $charset >> $db ; then
touch $db.dirty
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/lbdbq.man.in new/lbdb-0.36/lbdbq.man.in
--- old/lbdb-0.35.1/lbdbq.man.in 2007-05-27 10:42:22.000000000 +0200
+++ new/lbdb-0.36/lbdbq.man.in 2007-09-16 10:28:33.000000000 +0200
@@ -15,9 +15,9 @@
.\" 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.47 2007-05-27 08:42:22 roland Exp $
+.\" $Id: lbdbq.man.in,v 1.48 2007-09-16 08:28:33 roland Exp $
.\"
-.TH LBDBQ 1 "May 2007" "Unix" "User Manuals"
+.TH LBDBQ 1 "September 2007" "Unix" "User Manuals"
.SH NAME
lbdbq \- query program for the little brother's database
.SH SYNOPSIS
@@ -341,7 +341,6 @@
.BR pgp (1),
.BR pgpk (1),
.BR gpg (1),
-.BR mutt (1),
.BR lbdb-fetchaddr (1),
.BR nodelist2lbdb (1),
.BR mutt_ldap_query (1),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/m_evolution.sh.in new/lbdb-0.36/m_evolution.sh.in
--- old/lbdb-0.35.1/m_evolution.sh.in 2006-01-15 15:27:01.000000000 +0100
+++ new/lbdb-0.36/m_evolution.sh.in 2008-06-14 12:00:12.000000000 +0200
@@ -2,11 +2,12 @@
#
# -*-sh-*-
#
-# m_evoltuion - Evoltuion Address book module for lbdb
+# m_evolution - Evolution Address book module for lbdb
# Copyright (C) 2004 Guido Guenther
# Copyright (C) 2004-2006 Roland Rosenfeld
+# Copyright (C) 2008 brian m. carlson
#
-# losely based on m_gnomecard
+# loosely based on m_gnomecard
#
# 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,11 +32,12 @@
if [ -x $EVOLUTION_ADDRESSBOOK_EXPORT ]; then
$EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
| $AWK 'BEGIN {FS=":"; RS="\r\n"; name=""} \
- /^END:VCARD/ {name=""; fileas=""} \
+ /^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)} \
- ( name!="" || fileas!="" ) && /^EMAIL[;:]/ \
- {email=$2; printf ("%s\t%s\tEV:%s\n",email,name,fileas)}'\
+ /^EMAIL[;:]/ {email=$2;}'\
| grep -ia "$@"
fi
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/mutt_ldap_query.pl.in new/lbdb-0.36/mutt_ldap_query.pl.in
--- old/lbdb-0.35.1/mutt_ldap_query.pl.in 2007-05-28 11:04:50.000000000 +0200
+++ new/lbdb-0.36/mutt_ldap_query.pl.in 2008-06-14 12:24:46.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.23 2007-05-28 09:04:50 roland Exp $
+# $Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 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
@@ -29,7 +29,6 @@
my $man = 0;
my $help = 0;
my $DEBUG = 0;
-my $ignorant = 0;
my $lbdb_output = 0;
my $version = 0;
my $ldap_server_nickname = '';
@@ -68,7 +67,7 @@
# Return version string from CVS tag
sub versionstring {
- my $ver = ' $Name: debian_version_0_35_1 $ ';
+ my $ver = ' $Name: debian_version_0_36 $ ';
$ver =~ s/Name//g;
$ver =~ s/[:\$]//g;
$ver =~ s/\s+//g;
@@ -132,7 +131,7 @@
if ($version) {
print "mutt_ldap_query version " . &versionstring() . "\n";
- print '$Id: mutt_ldap_query.pl.in,v 1.23 2007-05-28 09:04:50 roland Exp $ ' . "\n";
+ print '$Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 roland Exp $ ' . "\n";
exit(0);
}
@@ -211,7 +210,11 @@
my $result = '';
# if this is email we take all the values
if( $ldap_result_email =~ /\${$answer}/ ) {
- @emails = $entry->get_value($answer);
+ foreach my $result ($entry->get_value($answer)) {
+ my $email = $ldap_result_email;
+ $email =~ s/\${$answer}/$result/g;
+ push @emails, $email;
+ }
}
else {
my $result = '';
@@ -264,7 +267,9 @@
hostname of your ldap server. You can also use an ldap://foo[:port]
or ldaps://foo[:port] URL here to talk to different ports or SSL
-encrypted servers.
+encrypted servers. Or use ldapi://%2fvar%2flib%2fldap_sock to access an
+ldap server via a socket (use %2f as as replacement for a slash in the file
+name).
=item B<--search_base=ldap_search_base> or B<-sb ldap_search_base>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/qpto8bit.c new/lbdb-0.36/qpto8bit.c
--- old/lbdb-0.35.1/qpto8bit.c 2005-10-29 16:48:11.000000000 +0200
+++ new/lbdb-0.36/qpto8bit.c 2007-10-28 17:33:36.000000000 +0100
@@ -19,7 +19,7 @@
*
*/
-/* $Id: qpto8bit.c,v 1.3 2005-10-29 14:48:11 roland Exp $ */
+/* $Id: qpto8bit.c,v 1.4 2007-10-28 16:33:36 roland Exp $ */
#include
@@ -27,9 +27,17 @@
#include "rfc822.h"
#include "rfc2047.h"
-int main ()
+int main (int argc, char * argv[])
{
char buff[2048];
+#ifdef HAVE_ICONV
+ const char **charsetptr = &Charset;
+#endif
+
+#ifdef HAVE_ICONV
+ if (argc > 1)
+ *charsetptr = argv[1];
+#endif
while (fgets (buff, sizeof (buff), stdin)) {
rfc2047_decode (buff, buff, sizeof (buff));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/rfc2047.c new/lbdb-0.36/rfc2047.c
--- old/lbdb-0.35.1/rfc2047.c 2005-10-29 16:48:11.000000000 +0200
+++ new/lbdb-0.36/rfc2047.c 2007-10-28 17:33:36.000000000 +0100
@@ -16,10 +16,15 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
*/
-/* $Id: rfc2047.c,v 1.4 2005-10-29 14:48:11 roland Exp $ */
+/* $Id: rfc2047.c,v 1.5 2007-10-28 16:33:36 roland Exp $ */
#include
#include
+#ifdef HAVE_ICONV
+#include
+#include
+#include
+#endif
#include "rfc822.h"
#include "rfc2047.h"
@@ -36,7 +41,7 @@
};
const char MimeSpecials[] = "@.,;<>[]\\\"()?/=";
-const char Charset[] = "iso-8859-1"; /* XXX - hack */
+const char *Charset = "iso-8859-15"; /* XXX - hack */
int Index_hex[128] = {
@@ -68,12 +73,18 @@
#define hexval(c) Index_hex[(unsigned int)(c)]
#define base64val(c) Index_64[(unsigned int)(c)]
-static int rfc2047_decode_word (char *d, const char *s, size_t len)
+static int rfc2047_decode_word (char *d, const char *s, size_t dlen)
{
char *p = safe_strdup (s);
char *pp = p;
char *pd = d;
+ size_t len = dlen;
int enc = 0, filter = 0, count = 0, c1, c2, c3, c4;
+#ifdef HAVE_ICONV
+ char *fromcharset;
+ iconv_t cd;
+ size_t in;
+#endif
while ((pp = strtok (pp, "?")) != NULL)
{
@@ -82,7 +93,12 @@
{
case 2:
if (strcasecmp (pp, Charset) != 0)
+ {
filter = 1;
+#ifdef HAVE_ICONV
+ fromcharset = safe_strdup (pp);
+#endif
+ }
break;
case 3:
if (toupper (*pp) == 'Q')
@@ -152,13 +168,42 @@
safe_free (&p);
if (filter)
{
- pd = d;
- while (*pd)
+#ifdef HAVE_ICONV
+ if ((cd = iconv_open (Charset, fromcharset)) == (iconv_t)(-1))
{
- if (!IsPrint (*pd))
+#endif
+ pd = d;
+ while (*pd)
+ {
+ if (!IsPrint (*pd))
+ *pd = '?';
+ pd++;
+ }
+#ifdef HAVE_ICONV
+ } else {
+ p = safe_strdup (d);
+ pp = p;
+ in = strlen (d) + 1;
+ pd = d;
+ /* maximum available buffer length for converted string */
+ len = dlen;
+ while (*pd && iconv (cd, &pp, &in, &pd, &len) == (size_t)(-1))
+ {
+ if (errno == E2BIG)
+ break;
+
*pd = '?';
- pd++;
+ pp++;
+ in--;
+ pd++;
+ len--;
+ }
+ iconv (cd, NULL, NULL, &pd, &len);
+ iconv_close (cd);
+ safe_free (&p);
}
+ safe_free (&fromcharset);
+#endif
}
return (0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lbdb-0.35.1/rfc2047.h new/lbdb-0.36/rfc2047.h
--- old/lbdb-0.35.1/rfc2047.h 2005-10-29 16:48:11.000000000 +0200
+++ new/lbdb-0.36/rfc2047.h 2007-10-28 17:33:36.000000000 +0100
@@ -16,8 +16,9 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA.
*/
-/* $Id: rfc2047.h,v 1.3 2005-10-29 14:48:11 roland Exp $ */
+/* $Id: rfc2047.h,v 1.4 2007-10-28 16:33:36 roland Exp $ */
+extern const char *Charset;
void rfc2047_encode_string (char *, size_t, const unsigned char *);
void rfc2047_encode_adrlist (ADDRESS *);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org