masqmail
changeset 431:34c919a8d74e 0.3.5
Bumps version number and updates Changelog and NEWS
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Sat, 07 Feb 2015 11:17:53 +0100 |
| parents | 180a7f6a9383 |
| children | ddc05e12e307 |
| files | ChangeLog NEWS configure configure.ac man/masqmail.8 man/masqmail.aliases.5 man/masqmail.conf.5 man/masqmail.route.5 man/mservdetect.1 man/rmail.8 |
| diffstat | 10 files changed, 149 insertions(+), 126 deletions(-) [+] |
line diff
1.1 --- a/ChangeLog Sat Feb 07 11:14:09 2015 +0100 1.2 +++ b/ChangeLog Sat Feb 07 11:17:53 2015 +0100 1.3 @@ -7,6 +7,14 @@ 1.4 technical speach and with focus on compatibility. 1.5 1.6 1.7 +0.3.5 Sat, 07 Feb 2015 11:03:01 +0100 1.8 + * Adds a glob-pattern based aliasing mechanism 1.9 + * Adds route selection based on the From header 1.10 + * Changes the path for PID files (/var/run/masqmail.pid), 1.11 + configurable with --with-piddir 1.12 + * Changes the path for lock files (/var/lock/masqmail) 1.13 + * Various bugfixes and cleanups 1.14 + 1.15 0.3.4 Wed, 18 Jan 2012 09:21:54 +0100 1.16 * Reworked the route concept. Better names: ``online_routes'' is now 1.17 known as ``query_routes'' and the ``local_net_route'' in now named
2.1 --- a/NEWS Sat Feb 07 11:14:09 2015 +0100 2.2 +++ b/NEWS Sat Feb 07 11:17:53 2015 +0100 2.3 @@ -7,6 +7,15 @@ 2.4 The manual pages describe newly added options. Take them for reference. 2.5 2.6 2.7 +0.3.5 2.8 + 2.9 +- Adds a glob-pattern based aliasing mechanism. 2.10 + 2.11 +- Adds route selection based on the From header. 2.12 + 2.13 +- Changes the paths for PID files and lock files. Both are configurable. 2.14 + 2.15 + 2.16 0.3.4 2.17 2.18 - Reworked the route concept to be more general and have better
3.1 --- a/configure Sat Feb 07 11:14:09 2015 +0100 3.2 +++ b/configure Sat Feb 07 11:17:53 2015 +0100 3.3 @@ -1,13 +1,11 @@ 3.4 #! /bin/sh 3.5 # Guess values for system-dependent variables and create Makefiles. 3.6 -# Generated by GNU Autoconf 2.68 for masqmail 0.3.5-dev. 3.7 +# Generated by GNU Autoconf 2.69 for masqmail 0.3.5. 3.8 # 3.9 # Report bugs to <meillo@marmaro.de>. 3.10 # 3.11 # 3.12 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 3.13 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 3.14 -# Foundation, Inc. 3.15 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 3.16 # 3.17 # 3.18 # This configure script is free software; the Free Software Foundation 3.19 @@ -136,6 +134,31 @@ 3.20 # CDPATH. 3.21 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 3.22 3.23 +# Use a proper internal environment variable to ensure we don't fall 3.24 + # into an infinite loop, continuously re-executing ourselves. 3.25 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 3.26 + _as_can_reexec=no; export _as_can_reexec; 3.27 + # We cannot yet assume a decent shell, so we have to provide a 3.28 +# neutralization value for shells without unset; and this also 3.29 +# works around shells that cannot unset nonexistent variables. 3.30 +# Preserve -v and -x to the replacement shell. 3.31 +BASH_ENV=/dev/null 3.32 +ENV=/dev/null 3.33 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 3.34 +case $- in # (((( 3.35 + *v*x* | *x*v* ) as_opts=-vx ;; 3.36 + *v* ) as_opts=-v ;; 3.37 + *x* ) as_opts=-x ;; 3.38 + * ) as_opts= ;; 3.39 +esac 3.40 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 3.41 +# Admittedly, this is quite paranoid, since all the known shells bail 3.42 +# out after a failed `exec'. 3.43 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 3.44 +as_fn_exit 255 3.45 + fi 3.46 + # We don't want this to propagate to other subprocesses. 3.47 + { _as_can_reexec=; unset _as_can_reexec;} 3.48 if test "x$CONFIG_SHELL" = x; then 3.49 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 3.50 emulate sh 3.51 @@ -169,7 +192,8 @@ 3.52 else 3.53 exitcode=1; echo positional parameters were not saved. 3.54 fi 3.55 -test x\$exitcode = x0 || exit 1" 3.56 +test x\$exitcode = x0 || exit 1 3.57 +test -x / || exit 1" 3.58 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 3.59 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 3.60 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 3.61 @@ -214,21 +238,25 @@ 3.62 3.63 3.64 if test "x$CONFIG_SHELL" != x; then : 3.65 - # We cannot yet assume a decent shell, so we have to provide a 3.66 - # neutralization value for shells without unset; and this also 3.67 - # works around shells that cannot unset nonexistent variables. 3.68 - # Preserve -v and -x to the replacement shell. 3.69 - BASH_ENV=/dev/null 3.70 - ENV=/dev/null 3.71 - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 3.72 - export CONFIG_SHELL 3.73 - case $- in # (((( 3.74 - *v*x* | *x*v* ) as_opts=-vx ;; 3.75 - *v* ) as_opts=-v ;; 3.76 - *x* ) as_opts=-x ;; 3.77 - * ) as_opts= ;; 3.78 - esac 3.79 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 3.80 + export CONFIG_SHELL 3.81 + # We cannot yet assume a decent shell, so we have to provide a 3.82 +# neutralization value for shells without unset; and this also 3.83 +# works around shells that cannot unset nonexistent variables. 3.84 +# Preserve -v and -x to the replacement shell. 3.85 +BASH_ENV=/dev/null 3.86 +ENV=/dev/null 3.87 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 3.88 +case $- in # (((( 3.89 + *v*x* | *x*v* ) as_opts=-vx ;; 3.90 + *v* ) as_opts=-v ;; 3.91 + *x* ) as_opts=-x ;; 3.92 + * ) as_opts= ;; 3.93 +esac 3.94 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 3.95 +# Admittedly, this is quite paranoid, since all the known shells bail 3.96 +# out after a failed `exec'. 3.97 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 3.98 +exit 255 3.99 fi 3.100 3.101 if test x$as_have_required = xno; then : 3.102 @@ -331,6 +359,14 @@ 3.103 3.104 3.105 } # as_fn_mkdir_p 3.106 + 3.107 +# as_fn_executable_p FILE 3.108 +# ----------------------- 3.109 +# Test if FILE is an executable regular file. 3.110 +as_fn_executable_p () 3.111 +{ 3.112 + test -f "$1" && test -x "$1" 3.113 +} # as_fn_executable_p 3.114 # as_fn_append VAR VALUE 3.115 # ---------------------- 3.116 # Append the text in VALUE to the end of the definition contained in VAR. Take 3.117 @@ -452,6 +488,10 @@ 3.118 chmod +x "$as_me.lineno" || 3.119 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 3.120 3.121 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 3.122 + # already done that, so ensure we don't try to do so again and fall 3.123 + # in an infinite loop. This has already happened in practice. 3.124 + _as_can_reexec=no; export _as_can_reexec 3.125 # Don't try to exec as it changes $[0], causing all sort of problems 3.126 # (the dirname of $[0] is not the place where we might find the 3.127 # original and so on. Autoconf is especially sensitive to this). 3.128 @@ -486,16 +526,16 @@ 3.129 # ... but there are two gotchas: 3.130 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 3.131 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 3.132 - # In both cases, we have to default to `cp -p'. 3.133 + # In both cases, we have to default to `cp -pR'. 3.134 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 3.135 - as_ln_s='cp -p' 3.136 + as_ln_s='cp -pR' 3.137 elif ln conf$$.file conf$$ 2>/dev/null; then 3.138 as_ln_s=ln 3.139 else 3.140 - as_ln_s='cp -p' 3.141 + as_ln_s='cp -pR' 3.142 fi 3.143 else 3.144 - as_ln_s='cp -p' 3.145 + as_ln_s='cp -pR' 3.146 fi 3.147 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 3.148 rmdir conf$$.dir 2>/dev/null 3.149 @@ -507,28 +547,8 @@ 3.150 as_mkdir_p=false 3.151 fi 3.152 3.153 -if test -x / >/dev/null 2>&1; then 3.154 - as_test_x='test -x' 3.155 -else 3.156 - if ls -dL / >/dev/null 2>&1; then 3.157 - as_ls_L_option=L 3.158 - else 3.159 - as_ls_L_option= 3.160 - fi 3.161 - as_test_x=' 3.162 - eval sh -c '\'' 3.163 - if test -d "$1"; then 3.164 - test -d "$1/."; 3.165 - else 3.166 - case $1 in #( 3.167 - -*)set "./$1";; 3.168 - esac; 3.169 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 3.170 - ???[sx]*):;;*)false;;esac;fi 3.171 - '\'' sh 3.172 - ' 3.173 -fi 3.174 -as_executable_p=$as_test_x 3.175 +as_test_x='test -x' 3.176 +as_executable_p=as_fn_executable_p 3.177 3.178 # Sed expression to map a string onto a valid CPP name. 3.179 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 3.180 @@ -560,8 +580,8 @@ 3.181 # Identity of this package. 3.182 PACKAGE_NAME='masqmail' 3.183 PACKAGE_TARNAME='masqmail' 3.184 -PACKAGE_VERSION='0.3.5-dev' 3.185 -PACKAGE_STRING='masqmail 0.3.5-dev' 3.186 +PACKAGE_VERSION='0.3.5' 3.187 +PACKAGE_STRING='masqmail 0.3.5' 3.188 PACKAGE_BUGREPORT='meillo@marmaro.de' 3.189 PACKAGE_URL='' 3.190 3.191 @@ -1189,8 +1209,6 @@ 3.192 if test "x$host_alias" != x; then 3.193 if test "x$build_alias" = x; then 3.194 cross_compiling=maybe 3.195 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 3.196 - If a cross compiler is detected then cross compile mode will be used" >&2 3.197 elif test "x$build_alias" != "x$host_alias"; then 3.198 cross_compiling=yes 3.199 fi 3.200 @@ -1276,7 +1294,7 @@ 3.201 # Omit some internal or obsolete options to make the list less imposing. 3.202 # This message is too long to be a string in the A/UX 3.1 sh. 3.203 cat <<_ACEOF 3.204 -\`configure' configures masqmail 0.3.5-dev to adapt to many kinds of systems. 3.205 +\`configure' configures masqmail 0.3.5 to adapt to many kinds of systems. 3.206 3.207 Usage: $0 [OPTION]... [VAR=VALUE]... 3.208 3.209 @@ -1342,7 +1360,7 @@ 3.210 3.211 if test -n "$ac_init_help"; then 3.212 case $ac_init_help in 3.213 - short | recursive ) echo "Configuration of masqmail 0.3.5-dev:";; 3.214 + short | recursive ) echo "Configuration of masqmail 0.3.5:";; 3.215 esac 3.216 cat <<\_ACEOF 3.217 3.218 @@ -1451,10 +1469,10 @@ 3.219 test -n "$ac_init_help" && exit $ac_status 3.220 if $ac_init_version; then 3.221 cat <<\_ACEOF 3.222 -masqmail configure 0.3.5-dev 3.223 -generated by GNU Autoconf 2.68 3.224 - 3.225 -Copyright (C) 2010 Free Software Foundation, Inc. 3.226 +masqmail configure 0.3.5 3.227 +generated by GNU Autoconf 2.69 3.228 + 3.229 +Copyright (C) 2012 Free Software Foundation, Inc. 3.230 This configure script is free software; the Free Software Foundation 3.231 gives unlimited permission to copy, distribute and modify it. 3.232 _ACEOF 3.233 @@ -1530,7 +1548,7 @@ 3.234 test ! -s conftest.err 3.235 } && test -s conftest$ac_exeext && { 3.236 test "$cross_compiling" = yes || 3.237 - $as_test_x conftest$ac_exeext 3.238 + test -x conftest$ac_exeext 3.239 }; then : 3.240 ac_retval=0 3.241 else 3.242 @@ -1874,8 +1892,8 @@ 3.243 This file contains any messages produced by compilers while 3.244 running configure, to aid debugging if configure makes a mistake. 3.245 3.246 -It was created by masqmail $as_me 0.3.5-dev, which was 3.247 -generated by GNU Autoconf 2.68. Invocation command line was 3.248 +It was created by masqmail $as_me 0.3.5, which was 3.249 +generated by GNU Autoconf 2.69. Invocation command line was 3.250 3.251 $ $0 $@ 3.252 3.253 @@ -2293,7 +2311,7 @@ 3.254 # by default. 3.255 for ac_prog in ginstall scoinst install; do 3.256 for ac_exec_ext in '' $ac_executable_extensions; do 3.257 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then 3.258 + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then 3.259 if test $ac_prog = install && 3.260 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then 3.261 # AIX install. It has an incompatible calling convention. 3.262 @@ -2462,7 +2480,7 @@ 3.263 IFS=$as_save_IFS 3.264 test -z "$as_dir" && as_dir=. 3.265 for ac_exec_ext in '' $ac_executable_extensions; do 3.266 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.267 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.268 ac_cv_prog_STRIP="${ac_tool_prefix}strip" 3.269 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.270 break 2 3.271 @@ -2502,7 +2520,7 @@ 3.272 IFS=$as_save_IFS 3.273 test -z "$as_dir" && as_dir=. 3.274 for ac_exec_ext in '' $ac_executable_extensions; do 3.275 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.276 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.277 ac_cv_prog_ac_ct_STRIP="strip" 3.278 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.279 break 2 3.280 @@ -2553,7 +2571,7 @@ 3.281 test -z "$as_dir" && as_dir=. 3.282 for ac_prog in mkdir gmkdir; do 3.283 for ac_exec_ext in '' $ac_executable_extensions; do 3.284 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue 3.285 + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue 3.286 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 3.287 'mkdir (GNU coreutils) '* | \ 3.288 'mkdir (coreutils) '* | \ 3.289 @@ -2606,7 +2624,7 @@ 3.290 IFS=$as_save_IFS 3.291 test -z "$as_dir" && as_dir=. 3.292 for ac_exec_ext in '' $ac_executable_extensions; do 3.293 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.294 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.295 ac_cv_prog_AWK="$ac_prog" 3.296 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.297 break 2 3.298 @@ -2692,7 +2710,7 @@ 3.299 3.300 # Define the identity of the package. 3.301 PACKAGE='masqmail' 3.302 - VERSION='0.3.5-dev' 3.303 + VERSION='0.3.5' 3.304 3.305 3.306 cat >>confdefs.h <<_ACEOF 3.307 @@ -2757,7 +2775,7 @@ 3.308 IFS=$as_save_IFS 3.309 test -z "$as_dir" && as_dir=. 3.310 for ac_exec_ext in '' $ac_executable_extensions; do 3.311 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.312 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.313 ac_cv_prog_CC="${ac_tool_prefix}gcc" 3.314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.315 break 2 3.316 @@ -2797,7 +2815,7 @@ 3.317 IFS=$as_save_IFS 3.318 test -z "$as_dir" && as_dir=. 3.319 for ac_exec_ext in '' $ac_executable_extensions; do 3.320 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.321 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.322 ac_cv_prog_ac_ct_CC="gcc" 3.323 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.324 break 2 3.325 @@ -2850,7 +2868,7 @@ 3.326 IFS=$as_save_IFS 3.327 test -z "$as_dir" && as_dir=. 3.328 for ac_exec_ext in '' $ac_executable_extensions; do 3.329 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.330 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.331 ac_cv_prog_CC="${ac_tool_prefix}cc" 3.332 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.333 break 2 3.334 @@ -2891,7 +2909,7 @@ 3.335 IFS=$as_save_IFS 3.336 test -z "$as_dir" && as_dir=. 3.337 for ac_exec_ext in '' $ac_executable_extensions; do 3.338 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.339 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.340 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 3.341 ac_prog_rejected=yes 3.342 continue 3.343 @@ -2949,7 +2967,7 @@ 3.344 IFS=$as_save_IFS 3.345 test -z "$as_dir" && as_dir=. 3.346 for ac_exec_ext in '' $ac_executable_extensions; do 3.347 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.348 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.349 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 3.350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.351 break 2 3.352 @@ -2993,7 +3011,7 @@ 3.353 IFS=$as_save_IFS 3.354 test -z "$as_dir" && as_dir=. 3.355 for ac_exec_ext in '' $ac_executable_extensions; do 3.356 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.357 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.358 ac_cv_prog_ac_ct_CC="$ac_prog" 3.359 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.360 break 2 3.361 @@ -3439,8 +3457,7 @@ 3.362 /* end confdefs.h. */ 3.363 #include <stdarg.h> 3.364 #include <stdio.h> 3.365 -#include <sys/types.h> 3.366 -#include <sys/stat.h> 3.367 +struct stat; 3.368 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ 3.369 struct buf { int x; }; 3.370 FILE * (*rcsopen) (struct buf *, struct stat *, int); 3.371 @@ -3925,7 +3942,7 @@ 3.372 for ac_prog in grep ggrep; do 3.373 for ac_exec_ext in '' $ac_executable_extensions; do 3.374 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 3.375 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 3.376 + as_fn_executable_p "$ac_path_GREP" || continue 3.377 # Check for GNU ac_path_GREP and select it if it is found. 3.378 # Check for GNU $ac_path_GREP 3.379 case `"$ac_path_GREP" --version 2>&1` in 3.380 @@ -3991,7 +4008,7 @@ 3.381 for ac_prog in egrep; do 3.382 for ac_exec_ext in '' $ac_executable_extensions; do 3.383 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 3.384 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 3.385 + as_fn_executable_p "$ac_path_EGREP" || continue 3.386 # Check for GNU ac_path_EGREP and select it if it is found. 3.387 # Check for GNU $ac_path_EGREP 3.388 case `"$ac_path_EGREP" --version 2>&1` in 3.389 @@ -4168,7 +4185,7 @@ 3.390 IFS=$as_save_IFS 3.391 test -z "$as_dir" && as_dir=. 3.392 for ac_exec_ext in '' $ac_executable_extensions; do 3.393 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.394 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.395 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 3.396 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.397 break 2 3.398 @@ -4208,7 +4225,7 @@ 3.399 IFS=$as_save_IFS 3.400 test -z "$as_dir" && as_dir=. 3.401 for ac_exec_ext in '' $ac_executable_extensions; do 3.402 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.403 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.404 ac_cv_prog_ac_ct_RANLIB="ranlib" 3.405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.406 break 2 3.407 @@ -4271,7 +4288,7 @@ 3.408 IFS=$as_save_IFS 3.409 test -z "$as_dir" && as_dir=. 3.410 for ac_exec_ext in '' $ac_executable_extensions; do 3.411 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.412 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.413 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 3.414 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.415 break 2 3.416 @@ -4314,7 +4331,7 @@ 3.417 IFS=$as_save_IFS 3.418 test -z "$as_dir" && as_dir=. 3.419 for ac_exec_ext in '' $ac_executable_extensions; do 3.420 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3.421 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.422 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 3.423 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.424 break 2 3.425 @@ -4774,11 +4791,11 @@ 3.426 int 3.427 main () 3.428 { 3.429 -/* FIXME: Include the comments suggested by Paul. */ 3.430 + 3.431 #ifndef __cplusplus 3.432 - /* Ultrix mips cc rejects this. */ 3.433 + /* Ultrix mips cc rejects this sort of thing. */ 3.434 typedef int charset[2]; 3.435 - const charset cs; 3.436 + const charset cs = { 0, 0 }; 3.437 /* SunOS 4.1.1 cc rejects this. */ 3.438 char const *const *pcpcc; 3.439 char **ppc; 3.440 @@ -4795,8 +4812,9 @@ 3.441 ++pcpcc; 3.442 ppc = (char**) pcpcc; 3.443 pcpcc = (char const *const *) ppc; 3.444 - { /* SCO 3.2v4 cc rejects this. */ 3.445 - char *t; 3.446 + { /* SCO 3.2v4 cc rejects this sort of thing. */ 3.447 + char tx; 3.448 + char *t = &tx; 3.449 char const *s = 0 ? (char *) 0 : (char const *) 0; 3.450 3.451 *t++ = 0; 3.452 @@ -4812,10 +4830,10 @@ 3.453 iptr p = 0; 3.454 ++p; 3.455 } 3.456 - { /* AIX XL C 1.02.0.0 rejects this saying 3.457 + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying 3.458 "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ 3.459 - struct s { int j; const int *ap[3]; }; 3.460 - struct s *b; b->j = 5; 3.461 + struct s { int j; const int *ap[3]; } bx; 3.462 + struct s *b = &bx; b->j = 5; 3.463 } 3.464 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ 3.465 const int foo = 10; 3.466 @@ -5782,16 +5800,16 @@ 3.467 # ... but there are two gotchas: 3.468 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 3.469 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 3.470 - # In both cases, we have to default to `cp -p'. 3.471 + # In both cases, we have to default to `cp -pR'. 3.472 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 3.473 - as_ln_s='cp -p' 3.474 + as_ln_s='cp -pR' 3.475 elif ln conf$$.file conf$$ 2>/dev/null; then 3.476 as_ln_s=ln 3.477 else 3.478 - as_ln_s='cp -p' 3.479 + as_ln_s='cp -pR' 3.480 fi 3.481 else 3.482 - as_ln_s='cp -p' 3.483 + as_ln_s='cp -pR' 3.484 fi 3.485 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 3.486 rmdir conf$$.dir 2>/dev/null 3.487 @@ -5851,28 +5869,16 @@ 3.488 as_mkdir_p=false 3.489 fi 3.490 3.491 -if test -x / >/dev/null 2>&1; then 3.492 - as_test_x='test -x' 3.493 -else 3.494 - if ls -dL / >/dev/null 2>&1; then 3.495 - as_ls_L_option=L 3.496 - else 3.497 - as_ls_L_option= 3.498 - fi 3.499 - as_test_x=' 3.500 - eval sh -c '\'' 3.501 - if test -d "$1"; then 3.502 - test -d "$1/."; 3.503 - else 3.504 - case $1 in #( 3.505 - -*)set "./$1";; 3.506 - esac; 3.507 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 3.508 - ???[sx]*):;;*)false;;esac;fi 3.509 - '\'' sh 3.510 - ' 3.511 -fi 3.512 -as_executable_p=$as_test_x 3.513 + 3.514 +# as_fn_executable_p FILE 3.515 +# ----------------------- 3.516 +# Test if FILE is an executable regular file. 3.517 +as_fn_executable_p () 3.518 +{ 3.519 + test -f "$1" && test -x "$1" 3.520 +} # as_fn_executable_p 3.521 +as_test_x='test -x' 3.522 +as_executable_p=as_fn_executable_p 3.523 3.524 # Sed expression to map a string onto a valid CPP name. 3.525 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 3.526 @@ -5893,8 +5899,8 @@ 3.527 # report actual input values of CONFIG_FILES etc. instead of their 3.528 # values after options handling. 3.529 ac_log=" 3.530 -This file was extended by masqmail $as_me 0.3.5-dev, which was 3.531 -generated by GNU Autoconf 2.68. Invocation command line was 3.532 +This file was extended by masqmail $as_me 0.3.5, which was 3.533 +generated by GNU Autoconf 2.69. Invocation command line was 3.534 3.535 CONFIG_FILES = $CONFIG_FILES 3.536 CONFIG_HEADERS = $CONFIG_HEADERS 3.537 @@ -5959,11 +5965,11 @@ 3.538 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.539 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 3.540 ac_cs_version="\\ 3.541 -masqmail config.status 0.3.5-dev 3.542 -configured by $0, generated by GNU Autoconf 2.68, 3.543 +masqmail config.status 0.3.5 3.544 +configured by $0, generated by GNU Autoconf 2.69, 3.545 with options \\"\$ac_cs_config\\" 3.546 3.547 -Copyright (C) 2010 Free Software Foundation, Inc. 3.548 +Copyright (C) 2012 Free Software Foundation, Inc. 3.549 This config.status script is free software; the Free Software Foundation 3.550 gives unlimited permission to copy, distribute and modify it." 3.551 3.552 @@ -6054,7 +6060,7 @@ 3.553 _ACEOF 3.554 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.555 if \$ac_cs_recheck; then 3.556 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 3.557 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 3.558 shift 3.559 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 3.560 CONFIG_SHELL='$SHELL'
4.1 --- a/configure.ac Sat Feb 07 11:14:09 2015 +0100 4.2 +++ b/configure.ac Sat Feb 07 11:17:53 2015 +0100 4.3 @@ -1,7 +1,7 @@ 4.4 dnl Process this file with autoconf to produce a configure script. 4.5 4.6 AC_PREREQ(2.59) 4.7 -AC_INIT(masqmail, 0.3.5-dev, meillo@marmaro.de) 4.8 +AC_INIT(masqmail, 0.3.5, meillo@marmaro.de) 4.9 AC_CONFIG_SRCDIR([src/masqmail.c]) 4.10 AM_CONFIG_HEADER(config.h) 4.11 AM_INIT_AUTOMAKE()
5.1 --- a/man/masqmail.8 Sat Feb 07 11:14:09 2015 +0100 5.2 +++ b/man/masqmail.8 Sat Feb 07 11:17:53 2015 +0100 5.3 @@ -1,4 +1,4 @@ 5.4 -.TH masqmail 8 2012-01-18 masqmail-0.3.4 "Maintenance Commands" 5.5 +.TH masqmail 8 2015-02-07 masqmail-0.3.5 "Maintenance Commands" 5.6 5.7 .SH NAME 5.8 masqmail \- An offline Mail Transfer Agent
6.1 --- a/man/masqmail.aliases.5 Sat Feb 07 11:14:09 2015 +0100 6.2 +++ b/man/masqmail.aliases.5 Sat Feb 07 11:17:53 2015 +0100 6.3 @@ -1,4 +1,4 @@ 6.4 -.TH masqmail.aliases 5 2012-01-18 masqmail-0.3.4 "File Formats" 6.5 +.TH masqmail.aliases 5 2015-02-07 masqmail-0.3.5 "File Formats" 6.6 6.7 .SH NAME 6.8 masqmail.aliases \- masqmail alias file format
7.1 --- a/man/masqmail.conf.5 Sat Feb 07 11:14:09 2015 +0100 7.2 +++ b/man/masqmail.conf.5 Sat Feb 07 11:17:53 2015 +0100 7.3 @@ -1,4 +1,4 @@ 7.4 -.TH masqmail.conf 5 2012-01-18 masqmail-0.3.4 "File Formats" 7.5 +.TH masqmail.conf 5 2015-02-07 masqmail-0.3.5 "File Formats" 7.6 7.7 .SH NAME 7.8 masqmail.conf \- masqmail configuration file
8.1 --- a/man/masqmail.route.5 Sat Feb 07 11:14:09 2015 +0100 8.2 +++ b/man/masqmail.route.5 Sat Feb 07 11:17:53 2015 +0100 8.3 @@ -1,4 +1,4 @@ 8.4 -.TH masqmail.route 5 2012-01-18 masqmail-0.3.4 "File Formats" 8.5 +.TH masqmail.route 5 2015-02-07 masqmail-0.3.5 "File Formats" 8.6 8.7 .SH NAME 8.8 masqmail.route \- masqmail route configuration file
9.1 --- a/man/mservdetect.1 Sat Feb 07 11:14:09 2015 +0100 9.2 +++ b/man/mservdetect.1 Sat Feb 07 11:17:53 2015 +0100 9.3 @@ -1,4 +1,4 @@ 9.4 -.TH mservdetect 1 2012-01-18 masqmail-0.3.4 "User Commands" 9.5 +.TH mservdetect 1 2015-02-07 masqmail-0.3.5 "User Commands" 9.6 9.7 .SH NAME 9.8 mservdetect \- Helper for masqmail in combination with masqdialer
10.1 --- a/man/rmail.8 Sat Feb 07 11:14:09 2015 +0100 10.2 +++ b/man/rmail.8 Sat Feb 07 11:17:53 2015 +0100 10.3 @@ -1,4 +1,4 @@ 10.4 -.TH rmail 8 2012-01-18 masqmail-0.3.4 "Maintenance Commands" 10.5 +.TH rmail 8 2015-02-07 masqmail-0.3.5 "Maintenance Commands" 10.6 10.7 .SH NAME 10.8 rmail \- handle remote mail received via uucp