Hello community, here is the log from the commit of package lbdb checked in at Thu May 17 11:42:53 CEST 2007. -------- --- lbdb/lbdb.changes 2006-10-16 12:11:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/lbdb/lbdb.changes 2007-05-16 11:47:26.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 16 11:47:08 CEST 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 + +------------------------------------------------------------------- Old: ---- lbdb_0.33.tar.gz New: ---- lbdb_0.34.tar.gz lbdb-hostname.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lbdb.spec ++++++ --- /var/tmp/diff_new_pack.Kr2261/_old 2007-05-17 11:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Kr2261/_new 2007-05-17 11:42:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package lbdb (Version 0.33) +# spec file for package lbdb (Version 0.34) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -12,15 +12,16 @@ Name: lbdb Summary: Address Database for mutt -Version: 0.33 +Version: 0.34 Release: 1 -License: GPL +License: GNU General Public License (GPL) 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 Patch: lbdb.rc.dif Patch1: lbdb-0.32-evolution.diff +Patch2: lbdb-hostname.diff %description The Little Brother's Database (lbdb) consists of a set of small tools @@ -46,6 +47,7 @@ %setup -n lbdb-%{version} %patch -p0 %patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags}" \ @@ -83,7 +85,12 @@ %dir %{_libdir}/lbdb %doc %{_mandir}/man?/* -%changelog -n lbdb +%changelog +* 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 - new version 0.33 * Add SORT_OUTPUT=reverse_comment to do reverse sort by the third column ++++++ lbdb_0.33.tar.gz -> lbdb_0.34.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lbdb-0.33/debian/changelog new/lbdb-0.34/debian/changelog --- old/lbdb-0.33/debian/changelog 2006-10-14 14:14:44.000000000 +0200 +++ new/lbdb-0.34/debian/changelog 2006-11-12 13:09:38.000000000 +0100 @@ -1,3 +1,14 @@ +lbdb (0.34) unstable; urgency=medium + + * vcquery: avoid free() on unallocated memory if fullname is not set. + Thanks to Gregor Jasny <gjasny@web.de> for finding and providing a + patch (Closes: #395421). + * vcquery: Use value of concatenated N fields if FN field is missing. + Thanks to Gregor Jasny <gjasny@web.de> for providing a patch + (Closes: #395422). + + -- Roland Rosenfeld <roland@debian.org> Sun, 12 Nov 2006 13:09:16 +0100 + lbdb (0.33) unstable; urgency=low * Add SORT_OUTPUT=reverse_comment to do reverse sort by the third column diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lbdb-0.33/mutt_ldap_query.pl.in new/lbdb-0.34/mutt_ldap_query.pl.in --- old/lbdb-0.33/mutt_ldap_query.pl.in 2006-07-02 17:32:22.000000000 +0200 +++ new/lbdb-0.34/mutt_ldap_query.pl.in 2006-07-02 17:32:22.000000000 +0200 @@ -68,7 +68,7 @@ # Return version string from CVS tag sub versionstring { - my $ver = ' $Name: debian_version_0_33 $ '; + my $ver = ' $Name: debian_version_0_34 $ '; $ver =~ s/Name//g; $ver =~ s/[:\$]//g; $ver =~ s/\s+//g; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lbdb-0.33/vcquery.c new/lbdb-0.34/vcquery.c --- old/lbdb-0.33/vcquery.c 2005-10-30 00:30:26.000000000 +0200 +++ new/lbdb-0.34/vcquery.c 2006-11-12 13:08:21.000000000 +0100 @@ -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: vcquery.c,v 1.2 2005-10-29 22:30:26 roland Exp $ + * $Id: vcquery.c,v 1.4 2006-11-12 12:08:21 roland Exp $ */ #include <stdio.h> @@ -48,11 +48,32 @@ } while (vf_get_next_object(&vfobj)) { + fullname = 0; /* First extract name */ if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "FN", NULL)) if ((fullname = vf_get_prop_value_string(prop, 0))) fullname = strdup(fullname); + /* No full name, lets try name */ + if (!fullname + && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "N", NULL)) { + char name[STRING+1] = { 0 }; + size_t available = STRING; + int props = 0; + + while (available > 0 + && (propval = vf_get_prop_value_string(prop, props++))) { + strncat(name, propval, available); + available -= strlen(propval); + + if (available > 0) + strncat(name, " ", available--); + } + + if (available < STRING) + fullname = strdup(name); + } + if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "EMAIL", NULL)) { do { int props = 0; ++++++ lbdb-hostname.diff ++++++ Index: lbdb-0.34/lbdb_lib.sh.in =================================================================== --- lbdb-0.34.orig/lbdb_lib.sh.in +++ lbdb-0.34/lbdb_lib.sh.in @@ -55,21 +55,18 @@ lbdb_hostname() if test "x$MAIL_DOMAIN_NAME" != "x" ; then hn=$MAIL_DOMAIN_NAME elif test -f /etc/mailname; then - hn=`cat /etc/mailname` + read hn < /etc/mailname else hn="" if test -r /etc/resolv.conf ; then - hn="`sed -n -e 's/^[ ]*domain[ ]\{1,\}\([^ ]*\)/\1/p' /etc/resolv.conf`" - if test "x$hn" = "x" ; then - hn="`sed -n -e 's/^[ ]*search[ ]\{1,\}\([^ ]*\)/\1/p' /etc/resolv.conf`" - fi + hn=`awk '/^#/{next}($1 == "search" || $1 == "domain" ) && $2 != "" {print $2;exit}' < /etc/resolv.conf` fi if test "x$hn" = "x" ; then hn=`lbdb_hn_sendmail` if test "x$hn" = "xNONE" ; then for i in /etc/HOSTNAME /etc/hostname ; do if test -f $i ; then - hn="`cat $i`" + read hn < $i break; fi done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org