Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lbdb for openSUSE:Factory checked in at 2023-08-01 14:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lbdb (Old) and /work/SRC/openSUSE:Factory/.lbdb.new.32662 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lbdb" Tue Aug 1 14:15:51 2023 rev:29 rq:1101530 version:0.52.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lbdb/lbdb.changes 2023-06-29 17:28:51.766447149 +0200 +++ /work/SRC/openSUSE:Factory/.lbdb.new.32662/lbdb.changes 2023-08-01 14:15:52.707610503 +0200 @@ -1,0 +2,15 @@ +Mon Jul 31 12:25:51 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 0.52.1: + * Fix version information. + * The m_inmail DB is now located by default in + * $XDG_DATA_HOME/lbdb/m_inmail.db. For backward compatibility + an already existing $HOME/.lbdb/m_inmail.utf-8 file is used as + first* preference + * Add $XDG_CONFIG_HOME/lbdb/config as additional ldbdrc file + location, and $XDG_CONFIG_HOME/lbdb/ldap.rc as additional + ldaprc file location + * lbdb-fetchaddr: discard stdin at the end to avoid problems + with tee(1) and command substitution + +------------------------------------------------------------------- Old: ---- lbdb-0.51.1.tar.gz New: ---- lbdb-0.52.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lbdb.spec ++++++ --- /var/tmp/diff_new_pack.4aOJdA/_old 2023-08-01 14:15:53.843617177 +0200 +++ /var/tmp/diff_new_pack.4aOJdA/_new 2023-08-01 14:15:53.847617200 +0200 @@ -17,7 +17,7 @@ Name: lbdb -Version: 0.51.1 +Version: 0.52.1 Release: 0 Summary: Address Database for mutt License: GPL-2.0-or-later ++++++ lbdb-0.51.1.tar.gz -> lbdb-0.52.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/CHANGELOG.md new/lbdb-0.52.1/CHANGELOG.md --- old/lbdb-0.51.1/CHANGELOG.md 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/CHANGELOG.md 2023-07-29 17:52:12.000000000 +0200 @@ -1,5 +1,33 @@ # Changelog +## [0.52.1] - 2023-07-29 + +### Fixed + +- Fix version information. + +## [0.52] - 2023-07-29 + +### Changed + +- The m_inmail DB is now located by default in + $XDG_DATA_HOME/lbdb/m_inmail.db. For backward compatibility an + already existing $HOME/.lbdb/m_inmail.utf-8 file is used as first + preference (https://bugs.debian.org/843917) + +### Added + +- Add $XDG_CONFIG_HOME/lbdb/config as additional ldbdrc file location, + and $XDG_CONFIG_HOME/lbdb/ldap.rc as additional ldaprc file location + (Thanks to Michael Tretter <michael.tret...@posteo.net>) + (https://github.com/RolandRosenfeld/lbdb/pull/5) + +### Fixed + +- lbdb-fetchaddr: discard stdin at the end to avoid problems with + tee(1) and command substitution + (https://github.com/RolandRosenfeld/lbdb/issues/7) + ## [0.51.1] - 2022-09-18 ### Fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/README.md new/lbdb-0.52.1/README.md --- old/lbdb-0.51.1/README.md 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/README.md 2023-07-29 17:52:12.000000000 +0200 @@ -26,6 +26,7 @@ shell scripts - `/usr/local/etc/lbdb.rc` (or where your sysconfdir points to) +- `$XDG_CONFIG_HOME/lbdb/config` - `$HOME/.lbdbrc` - `$HOME/.lbdb/lbdbrc` - `$HOME/.lbdb/rc` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/TODO new/lbdb-0.52.1/TODO --- old/lbdb-0.51.1/TODO 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/TODO 2023-07-29 17:52:12.000000000 +0200 @@ -15,10 +15,6 @@ - Optimize munge/munge-keeporder to work case-insensitive (at least on the domain part of the addresses). -- Add support for XDG_CONFIG_HOME/XDG_DATA_HOME - https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - https://bugs.debian.org/843917 - - Add support for "notmuchmail". - Add testsuite. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/configure new/lbdb-0.52.1/configure --- old/lbdb-0.51.1/configure 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/configure 2023-07-29 17:52:12.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lbdb 0.51.1. +# Generated by GNU Autoconf 2.69 for lbdb 0.52.1. # # Report bugs to <rol...@spinnaker.de>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='lbdb' PACKAGE_TARNAME='lbdb' -PACKAGE_VERSION='0.51.1' -PACKAGE_STRING='lbdb 0.51.1' +PACKAGE_VERSION='0.52.1' +PACKAGE_STRING='lbdb 0.52.1' PACKAGE_BUGREPORT='rol...@spinnaker.de' PACKAGE_URL='https://www.spinnaker.de/lbdb/' @@ -1303,7 +1303,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lbdb 0.51.1 to adapt to many kinds of systems. +\`configure' configures lbdb 0.52.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1369,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lbdb 0.51.1:";; + short | recursive ) echo "Configuration of lbdb 0.52.1:";; esac cat <<\_ACEOF @@ -1479,7 +1479,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lbdb configure 0.51.1 +lbdb configure 0.52.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1781,7 +1781,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lbdb $as_me 0.51.1, which was +It was created by lbdb $as_me 0.52.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7254,7 +7254,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lbdb $as_me 0.51.1, which was +This file was extended by lbdb $as_me 0.52.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7312,7 +7312,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lbdb config.status 0.51.1 +lbdb config.status 0.52.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/configure.ac new/lbdb-0.52.1/configure.ac --- old/lbdb-0.51.1/configure.ac 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/configure.ac 2023-07-29 17:52:12.000000000 +0200 @@ -1,4 +1,4 @@ -dnl Copyright (c) 1998-2022 Roland Rosenfeld <rol...@spinnaker.de> +dnl Copyright (c) 1998-2023 Roland Rosenfeld <rol...@spinnaker.de> dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ dnl Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. AC_INIT([lbdb], - 0.51.1, + 0.52.1, [rol...@spinnaker.de], [], [https://www.spinnaker.de/lbdb/]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/lbdb-fetchaddr.man.in new/lbdb-0.52.1/lbdb-fetchaddr.man.in --- old/lbdb-0.51.1/lbdb-fetchaddr.man.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/lbdb-fetchaddr.man.in 2023-07-29 17:52:12.000000000 +0200 @@ -1,16 +1,16 @@ .\" -*- nroff -*- -.\" Copyright (c) 1998-2018 Roland Rosenfeld <rol...@spinnaker.de> -.\" +.\" Copyright (c) 1998-2023 Roland Rosenfeld <rol...@spinnaker.de> +.\" .\" 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 your option) any later version. -.\" +.\" .\" This program is distributed in the hope that it will be useful, .\" but WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. -.\" +.\" .\" You should have received a copy of the GNU General Public License .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. @@ -20,7 +20,7 @@ lbdb-fetchaddr \- grab addresses from mails and append them to lbdb database .SH SYNOPSIS .B lbdb-fetchaddr -.RB [ -d +.RB [ -d .IR dateformat ] .RB [ -x .IR headerfieldlist ] @@ -36,16 +36,20 @@ .B lbdb-fetchaddr is a shell script which reads a mail on stdin. It extracts the contents of some header fields (default: -.RB ` From: ', -.RB ` To: ', -.RB ` Cc: ', -.RB ` Resent-From: ', +.RB ` From: ', +.RB ` To: ', +.RB ` Cc: ', +.RB ` Resent-From: ', and .RB ` Resent-To: ') from the mail header (only addresses with a real name) and appends them to the database file, which defaults to -.IR $HOME/.lbdb/m_inmail.utf-8 . -For performance issues +.I $XDG_DATA_HOME/lbdb/m_inmail.db +or +.I $HOME/.lbdb/m_inmail.utf-8 +if the latter already exists (backward compatibility). +.PP +For performance issues .B lbdb-fetchaddr appends new addresses to this file without removing duplicates. To get rid of duplicates, the program @@ -54,22 +58,22 @@ .B m_inmail if needed and removes duplicates. .PP -To use this program, put the following lines into your +To use this program, put the following lines into your .I $HOME/.procmailrc: -.nf +.nf :0hc | lbdb-fetchaddr -.fi +.fi .PP .B lbdb-fetchaddr writes the actual date to the third column of the database by using .BR strftime (3). It uses "%Y-%m-%d %H:%M" as the default date format (e.g. "1999-04-29 -14:33"). You can change this by using the +14:33"). You can change this by using the .B -d option to select a different date format string as parameter of lbdb-fetchaddr command like -.nf +.nf :0hc | lbdb-fetchaddr \-d "%y-%m-%d" .fi @@ -83,7 +87,7 @@ Print short help of lbdb-fetchaddr. .TP .BI -d " dateformat" -Use the given date format using +Use the given date format using .BR strftime (3) syntax. .TP @@ -104,13 +108,17 @@ .TP .BI -f " databasefile" Use the given file for storing the grabbed addresses instead of using -the default -.IR $HOME/.lbdb/m_inmail.utf-8 . -.SH FILES +the +.I $XDG_DATA_HOME/lbdb/m_inmail.db +resp. .I $HOME/.lbdb/m_inmail.utf-8 +default. +.SH FILES +.I $XDG_DATA_HOME/lbdb/m_inmail.db +.br +.IR $HOME/.lbdb/m_inmail.utf-8 " (old version before using $XDG_DATA_HOME)" .br .IR $HOME/.lbdb/m_inmail.list " (old version used for ISO-8859-15 encoded addresses)" - .br .I @libdir@/fetchaddr .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/lbdb-fetchaddr.sh.in new/lbdb-0.52.1/lbdb-fetchaddr.sh.in --- old/lbdb-0.51.1/lbdb-fetchaddr.sh.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/lbdb-fetchaddr.sh.in 2023-07-29 17:52:12.000000000 +0200 @@ -2,18 +2,18 @@ # # -*-sh-*- # Copyright (C) 1998-2000 Thomas Roessler <roess...@guug.de> -# 1999-2022 Roland Rosenfeld <rol...@spinnaker.de> -# +# 1999-2023 Roland Rosenfeld <rol...@spinnaker.de> +# # 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 your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. @@ -28,7 +28,9 @@ [ -n "$USE_LOCAL_LIB" ] && [ -x $USE_LOCAL_LIB/lbdb_dotlock ] && dotlock=$USE_LOCAL_LIB/lbdb_dotlock fetchaddr=${USE_LOCAL_LIB:-@libdir@}/fetchaddr -db=$HOME/.lbdb/m_inmail.utf-8 +db=${XDG_DATA_HOME:-$HOME/.local/share}/lbdb/m_inmail.db +[ -f $HOME/.lbdb/m_inmail.utf-8 ] && db=$HOME/.lbdb/m_inmail.utf-8 + datefmt='%Y-%m-%d %H:%M' additional_param="" @@ -43,17 +45,18 @@ echo " -c 'charset' charset for the database storage" echo " -a also grep addresses without realname" echo " -f 'filename' database filename defaults to" - echo " \$HOME/.lbdb/m_inmail.utf-8" + echo " \$XDG_DATA_HOME/lbdb/m_inmail.db or" + echo " \$HOME/.lbdb/m_inmail.utf-8 if already exists" } while [ $# -gt 0 ] do case "$1" in - -v) + -v) echo "lbdb-fetchaddr version $LBDB_VERSION" exit 0 ;; - -h) + -h) usage exit 0 ;; @@ -104,6 +107,8 @@ shift done + + if [ ! -f "$db" ]; then dbdir=$(dirname "$db") if [ ! -d "$dbdir" ]; then @@ -132,5 +137,7 @@ then touch "$db.dirty" fi +# drop unused stdin +cat > /dev/null $dotlock -u "$db" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/lbdb.rc.in new/lbdb-0.52.1/lbdb.rc.in --- old/lbdb-0.51.1/lbdb.rc.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/lbdb.rc.in 2023-07-29 17:52:12.000000000 +0200 @@ -3,12 +3,13 @@ # # Everything you configure here can be overridden by the users config # file which can be found at +# $XDG_CONFIG_HOME/lbdb/config # ~/.lbdbrc # ~/.lbdb/lbdbrc # ~/.lbdb/rc # (evaluated with ascending priority!) -# -# (c) 1999-2022 Roland Rosenfeld <rol...@spinnaker.de> +# +# (c) 1999-2023 Roland Rosenfeld <rol...@spinnaker.de> # # @@ -34,7 +35,7 @@ # - m_palm search your Palm addressbook file. # - m_gnomecard search your GnomeCard address database files. # - m_bbdb search your BBDB (big brother database). -# - m_ldap query an LDAP server +# - m_ldap query an LDAP server # - m_wanderlust search your wanderlust ~/.addresses file. # - m_osx_addressbook search the OS X addressbook (only available on OS X). # - m_evolution search in the Ximan Evolution addressbook. @@ -45,9 +46,10 @@ # # If you want to use a different database file for m_inmail, you can -# define it in INMAIL_DB (defaults to $HOME/.lbdb/m_inmail.utf-8) +# define it in INMAIL_DB (defaults to $XDG_DATA_HOME/lbdb/m_inmail.db or +# $HOME/.lbdb/m_inmail.utf-8 if the latter exists) # -#INMAIL_DB="$HOME/.lbdb/m_inmail.utf-8" +#INMAIL_DB="${XDG_DATA_HOME:-$HOME/.local/share}/lbdb/m_inmail.db" # # If you want m_finger to ask other host then localhost, create a list here: @@ -148,7 +150,7 @@ # - m_abook query the abook(1) program # # if you have more than one abook addressbook, use the ABOOK_FILES -# variable. It contains a space separated list of all your files. +# variable. It contains a space separated list of all your files. # Default is $HOME/.abook/addressbook $HOME/.abook.addressbook # ABOOK_FILES="$HOME/.abook/friends $HOME/.abook/work" @@ -182,7 +184,7 @@ # address in m_inmail database is first). # If you set this to "name", lbdbq sorts the output by real name. # If you set this to "comment", lbdbq sorts the output by comment (column 3). -# If you set this to "reverse_comment", lbdbq sorts the output by comment +# If you set this to "reverse_comment", lbdbq sorts the output by comment # but with reverse order (column 3). # If you set this to "address", lbdbq sorts the output by addresses # (that's the default). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/lbdbq.man.in new/lbdb-0.52.1/lbdbq.man.in --- old/lbdb-0.51.1/lbdbq.man.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/lbdbq.man.in 2023-07-29 17:52:12.000000000 +0200 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" Copyright (c) 1998-2018 Roland Rosenfeld <rol...@spinnaker.de> +.\" Copyright (c) 1998-2023 Roland Rosenfeld <rol...@spinnaker.de> .\" .\" 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 @@ -40,6 +40,8 @@ .RS .I @sysconfdir@/lbdb.rc .br +.I $XDG_CONFIG_HOME/lbdb/config +.br .I $HOME/.lbdbrc .br .I $HOME/.lbdb/lbdbrc @@ -129,8 +131,11 @@ addresses created by .BR lbdb-fetchaddr (1). By default this uses +.IR $XDG_DATA_HOME/lbdb/m_inmail.db , +which is overridden, if .I $HOME/.lbdb/m_inmail.utf-8 -as its database file, but this can be changed using +exists (the old default) as its database file, but this can be changed +using .B INMAIL_DB variable (but do not forget to change this in the .BR lbdb-fetchaddr (1) @@ -279,6 +284,8 @@ resource file .I @sysconfdir@/lbdb_ldap.rc or +.I $XDG_CONFIG_HOME/lbdb/ldap.rc +or .I $HOME/.lbdb/ldap.rc or .IR $HOME/.mutt_ldap_query.rc . @@ -357,6 +364,8 @@ .SH FILES .I @sysconfdir@/lbdb.rc .br +.I $XDG_CONFIG_HOME/lbdb/config +.br .I $HOME/.lbdbrc .br .I $HOME/.lbdb/lbdbrc @@ -365,6 +374,8 @@ .br .I @libdir@/* .br +.I $XDG_DATA_HOME/lbdb/m_inmail.db +.br .I $HOME/.lbdb/m_inmail.utf-8 .br .I $HOME/.lbdb/nodelist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/lbdbq.sh.in new/lbdb-0.52.1/lbdbq.sh.in --- old/lbdb-0.51.1/lbdbq.sh.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/lbdbq.sh.in 2023-07-29 17:52:12.000000000 +0200 @@ -51,7 +51,9 @@ trap "rm -rf $tmpdir ; trap '' 0" EXIT collection=$tmpdir/coll -for conffile in $sysconfdir/lbdb.rc $HOME/.lbdbrc \ +xdg_home=${XDG_CONFIG_HOME:=$HOME/.config} + +for conffile in $sysconfdir/lbdb.rc $xdg_home/lbdb/config $HOME/.lbdbrc \ $HOME/.lbdb/lbdbrc $HOME/.lbdb/rc ; do if test -f "$conffile" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/m_inmail.sh.in new/lbdb-0.52.1/m_inmail.sh.in --- old/lbdb-0.51.1/m_inmail.sh.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/m_inmail.sh.in 2023-07-29 17:52:12.000000000 +0200 @@ -2,17 +2,17 @@ # # Copyright (C) 1998-2000 Thomas Roessler <roess...@guug.de> # 1999-2022 Roland Rosenfeld <rol...@spinnaker.de> -# +# # 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 your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. @@ -21,7 +21,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ -M_INMAIL_DB=${INMAIL_DB:-$HOME/.lbdb/m_inmail.utf-8} +fallbackdb=${XDG_DATA_HOME:-$HOME/.local/share}/lbdb/m_inmail.db +[ -f $HOME/.lbdb/m_inmail.utf-8 ] && fallbackdb=$HOME/.lbdb/m_inmail.utf-8 + +M_INMAIL_DB=${INMAIL_DB:-$fallbackdb} m_inmail_query() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/mutt_ldap_query.pl.in new/lbdb-0.52.1/mutt_ldap_query.pl.in --- old/lbdb-0.51.1/mutt_ldap_query.pl.in 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/mutt_ldap_query.pl.in 2023-07-29 17:52:12.000000000 +0200 @@ -2,7 +2,7 @@ # # Copyright (C) 2000-2006 Marc de Courville <m...@courville.org> # Copyright (C) 2009 "Alexandra N. Kossovsky" <sa...@oktetlabs.ru> -# Copyright (C) 2005-2018 Roland Rosenfeld <rol...@spinnaker.de> +# Copyright (C) 2005-2023 Roland Rosenfeld <rol...@spinnaker.de> # # 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 @@ -91,9 +91,16 @@ } } +sub xdg_home { + my $xdg_home = $ENV{XDG_CONFIG_HOME}; + $xdg_home = $ENV{HOME} . "/.config" unless defined $xdg_home; + return($xdg_home); +} + # first we need to apply defaults process_file("@SYSCONF_DIR@/lbdb_ldap.rc", "@SYSCONF_DIR@/mutt_ldap_query.rc", + xdg_home() . "/lbdb/ldap.rc", "$ENV{HOME}/.lbdb/ldap.rc", "$ENV{HOME}/.mutt_ldap_query.rc"); @@ -272,8 +279,8 @@ specify an alternate resource file other than the system ones (F<@SYSCONF_DIR@/lbdb_ldap.rc> or F<@SYSCONF_DIR@/mutt_ldap_query.rc>) -or default personal ones (F<$HOME/.lbdb/ldap.rc> or -F<$HOME/.mutt_ldap_query.rc>). +or default personal ones (F<$XDG_CONFIG_HOME/lbdb/ldap.rc>, +F<$HOME/.lbdb/ldap.rc> or F<$HOME/.mutt_ldap_query.rc>). =item B<--server=ldap_server> or B<-ls ldap_server> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/tests/package.m4 new/lbdb-0.52.1/tests/package.m4 --- old/lbdb-0.51.1/tests/package.m4 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/tests/package.m4 2023-07-29 17:52:12.000000000 +0200 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [lbdb]) m4_define([AT_PACKAGE_TARNAME], [lbdb]) -m4_define([AT_PACKAGE_VERSION], [0.51.1]) -m4_define([AT_PACKAGE_STRING], [lbdb 0.51.1]) +m4_define([AT_PACKAGE_VERSION], [0.52.1]) +m4_define([AT_PACKAGE_STRING], [lbdb 0.52.1]) m4_define([AT_PACKAGE_BUGREPORT], [rol...@spinnaker.de]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.51.1/tests/testsuite new/lbdb-0.52.1/tests/testsuite --- old/lbdb-0.51.1/tests/testsuite 2022-09-18 10:14:54.000000000 +0200 +++ new/lbdb-0.52.1/tests/testsuite 2023-07-29 17:52:12.000000000 +0200 @@ -909,7 +909,7 @@ # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -lbdb 0.51.1 test suite test groups: +lbdb 0.52.1 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -950,7 +950,7 @@ exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (lbdb 0.51.1)" && + $as_echo "$as_me (lbdb 0.52.1)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1136,11 +1136,11 @@ # Banners and logs. $as_echo "## ----------------------- ## -## lbdb 0.51.1 test suite. ## +## lbdb 0.52.1 test suite. ## ## ----------------------- ##" { $as_echo "## ----------------------- ## -## lbdb 0.51.1 test suite. ## +## lbdb 0.52.1 test suite. ## ## ----------------------- ##" echo @@ -1984,7 +1984,7 @@ $as_echo "Please send $at_msg and all information you think might help: To: <rol...@spinnaker.de> - Subject: [lbdb 0.51.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [lbdb 0.52.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may
