730d29f471
- Update to 0.48.1:
* Fix wrong quoting in lbdb-fetchaddr
* m_muttalias: Fix some shellcheck warnings.
* Change project homepage URL to https.
* Use literal tab characters in order to make m_abook and m_goobook
modules work without requiring GNU sed(1). Thanks to Raf Czlonka.
* Add tests for m_abook.
* Add update-version target to update version in all autotool files.
* m_abook: Fix a shellcheck warning.
* lbdbq, lbdb-fetchaddr: Fix some shellcheck warnings.
* Upgrade Standards-Version to 4.3.0
- Declare Rules-Requires-Root: no.
* Upgrade debhelper to v12.
* m_inmail/lbdb-munge: Use INMAIL_DB if set in config
* Upgrade debhelper to v11.
* Replace legacy `...` by $(...) in sh scripts.
* Update copyright notice.
* Add test_perl to check perl syntax.
* Add some perl libs <!nocheck> to Build-Depends, to be able do
perl syntax check.
* Replace undefined $rv by $?.
* Make the database file for m_inmail/lbdb-fetchaddr configurable.
* Add LBDB_OVERRIDE_METHODS, OVERIDE_MUTTALIAS_FILES variables for
testing.
* Add a test suite.
- Add a test for m_muttalias.
* m_muttalias: rewrite sed regex as ERE, which should be more POSIX
compatible and should work on non GNU sed, too.
* lbdbq: Remove whitespace from number of matches to become more
portable.
OBS-URL: https://build.opensuse.org/request/show/800604
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/lbdb?expand=0&rev=12
17 lines
610 B
Diff
17 lines
610 B
Diff
--- b/lbdb_lib.sh.in 2019-01-07 19:30:29.000000000 +0100
|
|
+++ a/lbdb_lib.sh.in 2020-05-06 10:13:38.987327900 +0200
|
|
@@ -56,11 +56,8 @@
|
|
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
|
|
- 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
|