Imported Upstream version 2.4

parent 6fcf6adc
2016-11-21 Sergey Poznyakoff <gray@gnu.org>
Version 2.4
Fix some warnings
* grecs: Upgrade
* dicod/main.c (set_supp_group): Avoid casting gid_t to void*
* lib/userprivs.c (switch_to_privs): Change accordingly
* dicod/lev.c: Avoid casting int to void*
Update documentation re WordNet
2016-11-15 Sergey Poznyakoff <gray@gnu.org>
Fix typo in doc/Makefile.am
2016-11-12 Sergey Poznyakoff <gray@gnu.org>
WordNet-related changes.
* README: Document how to rebuild WordNet to produce position-independent
code, suitable for linking with Dico.
* modules/wordnet/wordnet.c: Trivial patch.
2016-11-11 Sergey Poznyakoff <gray@gnu.org.ua>
dico: accept UNIX socket as argument to open
* dico/connect.c (dict_connect): Accept UNIX socket pathname as
argument. Improve error checking.
* dico/func.c (ds_open): If one argument given, it can be a socket
pathname.
* doc/dico.texi: Document changes to the "open" command.
2016-10-29 Sergey Poznyakoff <gray@gnu.org>
Bugfix
* include/dico/markup.h (dico_markup_type): Fix declaration.
* THANKS: Update
Fix coredump in gcide.
The coredump occurred when the requested headword matched the
entry at the start of the index page.
* modules/gcide/idx.c (gcide_idx_locate): Fix improper dereference.
* modules/gcide/tests/Makefile.am: Add def06.at
* modules/gcide/tests/testsuite.at: Include def06.at
2016-08-12 Sergey Poznyakoff <gray@gnu.org>
I18n-related fixes
Reported by Rafael Fontenelle
* dicod/acl.c: Fix mistyped translators marker.
* po/POTFILES.in: Add files from grecs
* THANKS: Updated.
2016-08-09 Sergey Poznyakoff <gray@gnu.org.ua> 2016-08-09 Sergey Poznyakoff <gray@gnu.org.ua>
Version 2.3 Version 2.3
......
GNU Dico NEWS -- history of user-visible changes. 2016-08-09 GNU Dico NEWS -- history of user-visible changes. 2016-11-21
Copyright (C) 2008-2010, 2012-2016 Sergey Poznyakoff Copyright (C) 2008-2010, 2012-2016 Sergey Poznyakoff
See the end of file for copying conditions. See the end of file for copying conditions.
Please send Dico bug reports to <bug-dico@gnu.org.ua> Please send Dico bug reports to <bug-dico@gnu.org.ua>
Version 2.4, 2016-11-21
* dico accepts UNIX socket name as argument to the open command
* Fix coredump in gcide module
* Update translations
Version 2.3, 2016-08-09 Version 2.3, 2016-08-09
......
...@@ -157,13 +157,31 @@ If you do not wish to use Guile, use `--without-guile' to disable it. ...@@ -157,13 +157,31 @@ If you do not wish to use Guile, use `--without-guile' to disable it.
** WordNet database ** WordNet database
------------------- -------------------
If you plan to use WordNet database, you will most probably need the If you plan to use WordNet database, there are several points to be
`--with-wordnet' option to inform the script about the location where observed. First of all, WordNet provides static libraries, usually
WordNet libraries and headers can be found. For example, the command with position-dependent code, which makes it difficult (or impossible,
on 64-bit architectures) to use from the shared dico modules. So,
first of all you will need to rebuild WordNet so that it contains
position-independent code. To do so, reconfigure it as follows:
./configure CFLAGS=-fPIC [other_options]
where [other_options] stands for any other options you might wish to
pass to configure.
If you are going to run this command in a source directory that has
been previously configured, it is advised to run "make distclean"
beforehand.
After configuring, run make and make install, as usual.
Once this step done, configure dico with the `--with-wordnet' option,
to inform the it about the location where WordNet libraries and
headers can be found. For example, the command
./configure --with-wordnet=/usr/local/WordNet-3.0 ./configure --with-wordnet=/usr/local/WordNet-3.0
instructs the script to look for WordNet library files in will instruct the configure script to look for WordNet library files in
/usr/local/WordNet-3.0/lib and for include files in /usr/local/WordNet-3.0/lib and for include files in
/usr/local/WordNet-3.0/include. /usr/local/WordNet-3.0/include.
...@@ -184,7 +202,7 @@ Send bug reports to <bug-dico@gnu.org>. ...@@ -184,7 +202,7 @@ Send bug reports to <bug-dico@gnu.org>.
* Copyright information: * Copyright information:
Copyright (C) 2008-2010, 2012 Sergey Poznyakoff Copyright (C) 2008-2016 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the of this document as received, in any medium, provided that the
......
...@@ -7,4 +7,12 @@ of these people. Help us keep it complete and exempt of errors. ...@@ -7,4 +7,12 @@ of these people. Help us keep it complete and exempt of errors.
Goran Tal <goran.tal@gmail.com> Goran Tal <goran.tal@gmail.com>
Karl Berry <karl@freefriends.org> Karl Berry <karl@freefriends.org>
Marc Dequènes <duck@duckcorp.org> Marc Dequènes <duck@duckcorp.org>
宋文武 <iyzsong@member.fsf.org>
Rafael Fontenelle <rffontenelle@gmail.com>
Wojciech Polak <polak@gnu.org> Wojciech Polak <polak@gnu.org>
;;;; Local Variables:
;;;; mode: Fundamental
;;;; coding: utf-8
;;;; End:
File mode changed from 100644 to 100755
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for GNU dico 2.3. # Generated by GNU Autoconf 2.69 for GNU dico 2.4.
# #
# Report bugs to <bug-dico@gnu.org>. # Report bugs to <bug-dico@gnu.org>.
# #
...@@ -592,8 +592,8 @@ MAKEFLAGS= ...@@ -592,8 +592,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='GNU dico' PACKAGE_NAME='GNU dico'
PACKAGE_TARNAME='dico' PACKAGE_TARNAME='dico'
PACKAGE_VERSION='2.3' PACKAGE_VERSION='2.4'
PACKAGE_STRING='GNU dico 2.3' PACKAGE_STRING='GNU dico 2.4'
PACKAGE_BUGREPORT='bug-dico@gnu.org' PACKAGE_BUGREPORT='bug-dico@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/dico/' PACKAGE_URL='http://www.gnu.org/software/dico/'
...@@ -2212,7 +2212,7 @@ if test "$ac_init_help" = "long"; then ...@@ -2212,7 +2212,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures GNU dico 2.3 to adapt to many kinds of systems. \`configure' configures GNU dico 2.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -2282,7 +2282,7 @@ fi ...@@ -2282,7 +2282,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of GNU dico 2.3:";; short | recursive ) echo "Configuration of GNU dico 2.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -2437,7 +2437,7 @@ fi ...@@ -2437,7 +2437,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
GNU dico configure 2.3 GNU dico configure 2.4
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -3146,7 +3146,7 @@ cat >config.log <<_ACEOF ...@@ -3146,7 +3146,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by GNU dico $as_me 2.3, which was It was created by GNU dico $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -4058,7 +4058,7 @@ fi ...@@ -4058,7 +4058,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='dico' PACKAGE='dico'
VERSION='2.3' VERSION='2.4'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -35668,7 +35668,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -35668,7 +35668,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by GNU dico $as_me 2.3, which was This file was extended by GNU dico $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -35740,7 +35740,7 @@ _ACEOF ...@@ -35740,7 +35740,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
GNU dico config.status 2.3 GNU dico config.status 2.4
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
...@@ -19,7 +19,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. ...@@ -19,7 +19,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>. # along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_INIT([GNU dico], 2.3, [bug-dico@gnu.org]) AC_INIT([GNU dico], 2.4, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c]) AC_CONFIG_SRCDIR([dicod/main.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
...@@ -28,7 +28,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. ...@@ -28,7 +28,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>. # along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_INIT([GNU dico], 2.3, [bug-dico@gnu.org]) AC_INIT([GNU dico], 2.4, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c]) AC_CONFIG_SRCDIR([dicod/main.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
...@@ -269,6 +269,28 @@ dict_transcript(struct dict_connection *conn, int state) ...@@ -269,6 +269,28 @@ dict_transcript(struct dict_connection *conn, int state)
} }
} }
static char const *
urlstr(dico_url_t url)
{
if (!url->string) {
if (!url->proto)
xdico_assign_string(&url->proto, "dict");
if (!url->port)
xdico_assign_string(&url->port, DICO_DICT_PORT_STR);
if (url->host) {
asprintf(&url->string, "%s://%s:%s",
url->proto,
url->host,
url->port);
} else {
asprintf(&url->string, "%s:///%s", url->proto, url->path);
}
}
return url->string;
}
int int
dict_connect(struct dict_connection **pconn, dico_url_t url) dict_connect(struct dict_connection **pconn, dico_url_t url)
{ {
...@@ -278,7 +300,7 @@ dict_connect(struct dict_connection **pconn, dico_url_t url) ...@@ -278,7 +300,7 @@ dict_connect(struct dict_connection **pconn, dico_url_t url)
struct dict_connection *conn; struct dict_connection *conn;
char const *port = url->port ? url->port : DICO_DICT_PORT_STR; char const *port = url->port ? url->port : DICO_DICT_PORT_STR;
XDICO_DEBUG_F2(1, _("Connecting to %s:%s\n"), url->host, port); XDICO_DEBUG_F1(1, _("Connecting to %s\n"), urlstr (url));
if (source_addr) { if (source_addr) {
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
...@@ -310,7 +332,34 @@ dict_connect(struct dict_connection **pconn, dico_url_t url) ...@@ -310,7 +332,34 @@ dict_connect(struct dict_connection **pconn, dico_url_t url)
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
rc = getaddrinfo(url->host, port, &hints, &res); if (url->host) {
rc = getaddrinfo(url->host, port, &hints, &res);
if (rc) {
dico_log(L_ERR, 0,
_("%s: can't get address: %s"),
url->host, gai_strerror(rc));
return -1;
}
} else {
struct sockaddr_un *s;
if (strlen(url->path) >= sizeof s->sun_path) {
dico_log(L_ERR, 0, _("%s: UNIX socket name too long"), url->path);
return -1;
}
hints.ai_family = AF_UNIX;
hints.ai_addrlen = sizeof(struct sockaddr_un);
s = xcalloc(1, hints.ai_addrlen);
s->sun_family = AF_UNIX;
strcpy(s->sun_path, url->path);
hints.ai_addr = (struct sockaddr *)s;
res = &hints;
}
for (rp = res; rp; rp = rp->ai_next) { for (rp = res; rp; rp = rp->ai_next) {
if (fd != -1 && family != rp->ai_family) { if (fd != -1 && family != rp->ai_family) {
close(fd); close(fd);
...@@ -329,11 +378,16 @@ dict_connect(struct dict_connection **pconn, dico_url_t url) ...@@ -329,11 +378,16 @@ dict_connect(struct dict_connection **pconn, dico_url_t url)
if (connect(fd, rp->ai_addr, rp->ai_addrlen) != -1) if (connect(fd, rp->ai_addr, rp->ai_addrlen) != -1)
break; break;
} }
if (!rp) { if (!rp) {
dico_log(L_ERR, 0, _("%s: cannot connect"), url->host); dico_log(L_ERR, 0, _("%s: cannot connect"), urlstr(url));
return 1; return 1;
} }
if (res == &hints)
free(res->ai_addr);
else
freeaddrinfo(res);
if ((str = dico_fd_io_stream_create(fd, fd)) == NULL) { if ((str = dico_fd_io_stream_create(fd, fd)) == NULL) {
dico_log(L_ERR, errno, dico_log(L_ERR, errno,
......
...@@ -100,7 +100,7 @@ ensure_connection() ...@@ -100,7 +100,7 @@ ensure_connection()
{ {
check_disconnect(); check_disconnect();
if (!conn) { if (!conn) {
if (!dico_url.host) { if (!dico_url.host && !dico_url.path) {
script_error(_("Please specify server name or IP address")); script_error(_("Please specify server name or IP address"));
return 1; return 1;
} }
...@@ -122,12 +122,19 @@ void ...@@ -122,12 +122,19 @@ void
ds_open(int argc, char **argv) ds_open(int argc, char **argv)
{ {
if (argc > 1) { if (argc > 1) {
xdico_assign_string(&dico_url.host, argv[1]); xdico_assign_string(&dico_url.string, NULL);
xdico_assign_string(&dico_url.port, if (argv[1][0] == '/') {
argc == 3 ? argv[2] : DICO_DICT_PORT_STR); xdico_assign_string(&dico_url.host, NULL);
xdico_assign_string(&dico_url.port, NULL);
xdico_assign_string(&dico_url.path, argv[1]);
} else {
xdico_assign_string(&dico_url.host, argv[1]);
xdico_assign_string(&dico_url.port,
argc == 3 ? argv[2] : DICO_DICT_PORT_STR);
}
} }
if (!dico_url.host) { if (!dico_url.host && !dico_url.path) {
script_error(_("Please specify server name or IP address")); script_error(_("Please specify server name or IP address"));
return; return;
} }
......
...@@ -395,7 +395,7 @@ _acl_check_cb(void *item, void *data) ...@@ -395,7 +395,7 @@ _acl_check_cb(void *item, void *data)
dico_log(L_DEBUG, 0, "%s:%d: %s", dico_log(L_DEBUG, 0, "%s:%d: %s",
/* FIXME: beg:end */ /* FIXME: beg:end */
ent->locus.beg.file, ent->locus.beg.line, ent->locus.beg.file, ent->locus.beg.line,
/* TRANSLATIONS: `MATCHES' is the verb `match' in 2nd person. /* TRANSLATORS: `MATCHES' is the verb `match' in 2nd person.
E.g., in French: CONCORD AVEC */ E.g., in French: CONCORD AVEC */
result ? _("MATCHES") : _("does not match")); result ? _("MATCHES") : _("does not match"));
} }
......
...@@ -23,7 +23,7 @@ lev_sel(int cmd, dico_key_t key, const char *dict_word) ...@@ -23,7 +23,7 @@ lev_sel(int cmd, dico_key_t key, const char *dict_word)
{ {
if (cmd == DICO_SELECT_RUN) { if (cmd == DICO_SELECT_RUN) {
int dist = dico_levenshtein_distance(key->word, dict_word, int dist = dico_levenshtein_distance(key->word, dict_word,
(int)key->strat->closure); *(int*)key->strat->closure);
if (dist < 0) if (dist < 0)
return 0; return 0;
return dist <= levenshtein_distance; return dist <= levenshtein_distance;
...@@ -31,23 +31,28 @@ lev_sel(int cmd, dico_key_t key, const char *dict_word) ...@@ -31,23 +31,28 @@ lev_sel(int cmd, dico_key_t key, const char *dict_word)
return 0; return 0;
} }
static int lev_flags = 0;
static int nlev_flags = DICO_LEV_NORM;
static int dlev_flags = DICO_LEV_DAMERAU;
static int ndlev_flags = DICO_LEV_NORM | DICO_LEV_DAMERAU;
static struct dico_strategy levstrat[] = { static struct dico_strategy levstrat[] = {
{ "lev", { "lev",
"Match headwords within given Levenshtein distance", "Match headwords within given Levenshtein distance",
lev_sel, lev_sel,
NULL }, &lev_flags },
{ "nlev", { "nlev",
"Match headwords within given Levenshtein distance (normalized)", "Match headwords within given Levenshtein distance (normalized)",
lev_sel, lev_sel,
(void*)DICO_LEV_NORM }, &nlev_flags },
{ "dlev", { "dlev",
"Match headwords within given Damerau-Levenshtein distance", "Match headwords within given Damerau-Levenshtein distance",
lev_sel, lev_sel,
(void*)DICO_LEV_DAMERAU }, &dlev_flags },
{ "ndlev", { "ndlev",
"Match headwords within given Damerau-Levenshtein distance (normalized)", "Match headwords within given Damerau-Levenshtein distance (normalized)",
lev_sel, lev_sel,
(void*)(DICO_LEV_NORM|DICO_LEV_DAMERAU) } &ndlev_flags }
}; };
static void static void
......
...@@ -408,15 +408,17 @@ set_supp_group(enum grecs_callback_command cmd, ...@@ -408,15 +408,17 @@ set_supp_group(enum grecs_callback_command cmd,
return 1; return 1;
} }
if (!group_list) if (!group_list) {
group_list = xdico_list_create(); group_list = xdico_list_create();
dico_list_set_free_item(group_list, dicod_free_item, NULL);
}
if (value->type == GRECS_TYPE_LIST) if (value->type == GRECS_TYPE_LIST)
grecs_list_iterate(value->v.list, set_supp_group_iter, NULL); grecs_list_iterate(value->v.list, set_supp_group_iter, NULL);
else { else {
char *s = value->v.string; char *s = value->v.string;
struct group *group; gid_t gid, *gp;
if (*s == '+') { if (*s == '+') {
char *q; char *q;
unsigned long n = strtoul(s + 1, &q, 0); unsigned long n = strtoul(s + 1, &q, 0);
...@@ -424,15 +426,19 @@ set_supp_group(enum grecs_callback_command cmd, ...@@ -424,15 +426,19 @@ set_supp_group(enum grecs_callback_command cmd,
grecs_error(locus, 0, _("not a valid GID number: %s"), s); grecs_error(locus, 0, _("not a valid GID number: %s"), s);
return 1; return 1;
} }
group = getgrgid(n); gid = n;
} else } else {
group = getgrnam(s); struct group *group = getgrnam(s);
if (group) if (!group) {
xdico_list_append(group_list, (void*)group->gr_gid); grecs_error(locus, 0, _("%s: unknown group"), value->v.string);
else { return 1;
grecs_error(locus, 0, _("%s: unknown group"), value->v.string); }
return 1; gid = group->gr_gid;
} }
gp = xmalloc(sizeof(*gp));
*gp = gid;
xdico_list_append(group_list, gp);
} }
return 0; return 0;
} }
......
# Signature of the current package. # Signature of the current package.
m4_define([AT_PACKAGE_NAME], [GNU dico]) m4_define([AT_PACKAGE_NAME], [GNU dico])
m4_define([AT_PACKAGE_TARNAME], [dico]) m4_define([AT_PACKAGE_TARNAME], [dico])
m4_define([AT_PACKAGE_VERSION], [2.3]) m4_define([AT_PACKAGE_VERSION], [2.4])
m4_define([AT_PACKAGE_STRING], [GNU dico 2.3]) m4_define([AT_PACKAGE_STRING], [GNU dico 2.4])
m4_define([AT_PACKAGE_BUGREPORT], [bug-dico@gnu.org]) m4_define([AT_PACKAGE_BUGREPORT], [bug-dico@gnu.org])
...@@ -921,7 +921,7 @@ fi ...@@ -921,7 +921,7 @@ fi
# List of tests. # List of tests.
if $at_list_p; then if $at_list_p; then
cat <<_ATEOF || at_write_fail=1 cat <<_ATEOF || at_write_fail=1
GNU dico 2.3 test suite test groups: GNU dico 2.4 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS KEYWORDS
...@@ -962,7 +962,7 @@ _ATEOF ...@@ -962,7 +962,7 @@ _ATEOF
exit $at_write_fail exit $at_write_fail
fi fi
if $at_version_p; then if $at_version_p; then
$as_echo "$as_me (GNU dico 2.3)" && $as_echo "$as_me (GNU dico 2.4)" &&
cat <<\_ATEOF || at_write_fail=1 cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1139,11 +1139,11 @@ exec 5>>"$at_suite_log" ...@@ -1139,11 +1139,11 @@ exec 5>>"$at_suite_log"
# Banners and logs. # Banners and logs.
$as_echo "## ------------------------ ## $as_echo "## ------------------------ ##
## GNU dico 2.3 test suite. ## ## GNU dico 2.4 test suite. ##
## ------------------------ ##" ## ------------------------ ##"
{ {
$as_echo "## ------------------------ ## $as_echo "## ------------------------ ##
## GNU dico 2.3 test suite. ## ## GNU dico 2.4 test suite. ##
## ------------------------ ##" ## ------------------------ ##"
echo echo
...@@ -1987,7 +1987,7 @@ _ASBOX ...@@ -1987,7 +1987,7 @@ _ASBOX
$as_echo "Please send $at_msg and all information you think might help: $as_echo "Please send $at_msg and all information you think might help:
To: <bug-dico@gnu.org> To: <bug-dico@gnu.org>
Subject: [GNU dico 2.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} Subject: [GNU dico 2.4] $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 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 case the test suite provides a good starting point. Its output may
...@@ -2018,7 +2018,7 @@ at_fn_check_prepare_notrace 'a shell pipeline' "testsuite.at:28" ...@@ -2018,7 +2018,7 @@ at_fn_check_prepare_notrace 'a shell pipeline' "testsuite.at:28"
at_status=$? at_failed=false at_status=$? at_failed=false
$at_check_filter $at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "dicod (GNU dico) 2.3 echo >>"$at_stdout"; $as_echo "dicod (GNU dico) 2.4
" | \ " | \
$at_diff - "$at_stdout" || at_failed=: $at_diff - "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:28" at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:28"
...@@ -3349,7 +3349,7 @@ echo \"Authenticated user\" ...@@ -3349,7 +3349,7 @@ echo \"Authenticated user\"
apopauth -script=input smith testtset dicod --config ./dicod.conf --stderr -i | sed 's/dicod server on .*/dicod server/' apopauth -script=input smith testtset dicod --config ./dicod.conf --stderr -i | sed 's/dicod server on .*/dicod server/'
echo \"Authenticated admin\" echo \"Authenticated admin\"
apopauth -script=input gray guessme dicod --config ./dicod.conf --stderr -i | sed 's/dicod (GNU dico 2.3).*/dicod version/' apopauth -script=input gray guessme dicod --config ./dicod.conf --stderr -i | sed 's/dicod (GNU dico 2.4).*/dicod version/'
" "
at_fn_check_prepare_notrace 'an embedded newline' "vis02.at:23" at_fn_check_prepare_notrace 'an embedded newline' "vis02.at:23"
( $at_check_trace; ( $at_check_trace;
...@@ -3382,7 +3382,7 @@ echo "Authenticated user" ...@@ -3382,7 +3382,7 @@ echo "Authenticated user"
apopauth -script=input smith testtset dicod --config ./dicod.conf --stderr -i | sed 's/dicod server on .*/dicod server/' apopauth -script=input smith testtset dicod --config ./dicod.conf --stderr -i | sed 's/dicod server on .*/dicod server/'
echo "Authenticated admin" echo "Authenticated admin"
apopauth -script=input gray guessme dicod --config ./dicod.conf --stderr -i | sed 's/dicod (GNU dico 2.3).*/dicod version/' apopauth -script=input gray guessme dicod --config ./dicod.conf --stderr -i | sed 's/dicod (GNU dico 2.4).*/dicod version/'
) >>"$at_stdout" 2>>"$at_stderr" 5>&- ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false at_status=$? at_failed=false
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>. # along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
dist_man_MANS=dicod.8 dicod.conf.5in dico.1 dist_man_MANS=dicod.8 dicod.conf.5 dico.1
.8in.8: .8in.8:
$(AM_V_GEN)soelim -I$(builddir) $< > $@ $(AM_V_GEN)soelim -I$(builddir) $< > $@
......