aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2021-01-08 14:00:59 +0200
committerSergey Poznyakoff <gray@gnu.org>2021-01-08 14:07:48 +0200
commita8eca185dffbe0f390ead2471042dfdfcbcf4de2 (patch)
treed95a058341a51ac734b565cf68fac70f6f67f57a
parentccca72337a0eb7f8706289a73bac99ff75e629ef (diff)
downloaddico-a8eca185dffbe0f390ead2471042dfdfcbcf4de2.tar.gz
dico-a8eca185dffbe0f390ead2471042dfdfcbcf4de2.tar.bz2
Upgrade submodules. Version 2.10.90.
* NEWS: Version 2.10.90 * configure.boot: Version 2.10.90. Raise autoconf, automake, and gettext requirements. * grecs: Upgrade to b0cbc54209de4c631952005b122ce09f84866700. * gnulib: Upgrade to v0.1-4336-gbdae9a5 * include/xdico.h: Define GNULIB_XALLOC_DIE and include xalloc.h. See the comment for the reason. * xdico/gnu/Makefile.am: Define GNULIB_XALLOC_DIE. * xdico/xalloc-die.c (xalloc-die): Call abort to avoid a 'noreturn' warning. * dico/dico-priv.h: Don't include xalloc.h * dicod/dicod.h: Likewise. * dicod/tests/apopauth.c: Likewise. * xdico/iputil.c: Likewise. * xdico/timer.c: Likewise. * xdico/userprivs.c: Likewise. * xdico/xhostname.c: Likewise. * xdico/xscript.c: Likewise. * xdico/xtkn.c: Likewise. * xdico/xutil.c: Likewise.
-rw-r--r--NEWS4
-rw-r--r--configure.boot8
-rw-r--r--dico/dico-priv.h1
-rw-r--r--dicod/dicod.h1
-rw-r--r--dicod/tests/apopauth.c1
m---------gnulib0
m---------grecs0
-rw-r--r--include/xdico.h6
-rw-r--r--xdico/gnu/Makefile.am7
-rw-r--r--xdico/iputil.c1
-rw-r--r--xdico/timer.c1
-rw-r--r--xdico/userprivs.c1
-rw-r--r--xdico/xalloc-die.c3
-rw-r--r--xdico/xhostname.c1
-rw-r--r--xdico/xscript.c1
-rw-r--r--xdico/xtkn.c1
-rw-r--r--xdico/xutil.c1
17 files changed, 22 insertions, 16 deletions
diff --git a/NEWS b/NEWS
index 2030eb8..dbc8eee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,10 @@
-GNU Dico NEWS -- history of user-visible changes. 2020-09-04
+GNU Dico NEWS -- history of user-visible changes. 2021-01-08
See the end of file for copying conditions.
Please send Dico bug reports to <bug-dico@gnu.org.ua>
+Version 2.10.90 (git)
+
Version 2.10, 2020-09-04
* Fix compilation with gcc 10
diff --git a/configure.boot b/configure.boot
index 2bcd6e6..fd2186e 100644
--- a/configure.boot
+++ b/configure.boot
@@ -27,13 +27,13 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# You should have received a copy of the GNU General Public License
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
-AC_PREREQ(2.63)
-AC_INIT([GNU dico], 2.10, [bug-dico@gnu.org])
+AC_PREREQ(2.64)
+AC_INIT([GNU dico], 2.10.90, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c])
AC_CONFIG_HEADERS(include/prog/config.h include/lib/config.h)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE([1.11 nostdinc gnits tar-ustar dist-bzip2 dist-xz std-options subdir-objects])
+AM_INIT_AUTOMAKE([1.15 nostdinc gnits tar-ustar dist-bzip2 dist-xz std-options subdir-objects])
dnl Enable silent rules by default:
AM_SILENT_RULES([yes])
@@ -113,7 +113,7 @@ AC_CHECK_LIB(crypt, crypt)
# Gettext.
AM_ICONV
AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.19])
AC_CONFIG_LINKS(include/gettext.h:xdico/gnu/gettext.h)
LOG_FACILITY="LOG_DAEMON"
diff --git a/dico/dico-priv.h b/dico/dico-priv.h
index 823fbcd..f13e341 100644
--- a/dico/dico-priv.h
+++ b/dico/dico-priv.h
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <xalloc.h>
#include <ctype.h>
#include <syslog.h>
#include <inttypes.h>
diff --git a/dicod/dicod.h b/dicod/dicod.h
index b5d0954..c94df59 100644
--- a/dicod/dicod.h
+++ b/dicod/dicod.h
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <xalloc.h>
#include <ctype.h>
#include <syslog.h>
#include <inttypes.h>
diff --git a/dicod/tests/apopauth.c b/dicod/tests/apopauth.c
index ae13029..c28721a 100644
--- a/dicod/tests/apopauth.c
+++ b/dicod/tests/apopauth.c
@@ -24,7 +24,6 @@
#include <unistd.h>
#include <assert.h>
#include <errno.h>
-#include "xalloc.h"
#include "md5.h"
dico_stream_t iostr;
diff --git a/gnulib b/gnulib
-Subproject 35e462817a08e484b4cddbb9ef25019f6910fc5
+Subproject bdae9a5d4b2cedfaef23f8c55982ba5432dd69e
diff --git a/grecs b/grecs
-Subproject 893d875a4065acb757fef55876c391b1dd07004
+Subproject b0cbc54209de4c631952005b122ce09f8486670
diff --git a/include/xdico.h b/include/xdico.h
index 468a1dd..f1a01e1 100644
--- a/include/xdico.h
+++ b/include/xdico.h
@@ -22,6 +22,12 @@
#endif
#include <dico.h>
+/* Starting from gnulib commit 52ab50a7ebc469b542bca0063430db71aefb67af,
+ xalloc.h declares xalloc_die only if GNULIB_XALLOC_DIE is defined.
+ Without this define each inclusion of xalloc.h will spit out one or
+ more warnings about this function not being declared. */
+#define GNULIB_XALLOC_DIE 1
+#include "xalloc.h"
struct sockaddr;
void sockaddr_to_str(const struct sockaddr *sa, int salen,
diff --git a/xdico/gnu/Makefile.am b/xdico/gnu/Makefile.am
index f2969cb..44219d1 100644
--- a/xdico/gnu/Makefile.am
+++ b/xdico/gnu/Makefile.am
@@ -13,7 +13,12 @@ CLEANFILES =
DISTCLEANFILES =
MAINTAINERCLEANFILES =
-AM_CPPFLAGS = @DICO_PROG_CONFIG@ -I$(srcdir) -I$(builddir)
+# Starting from gnulib commit 52ab50a7ebc469b542bca0063430db71aefb67af,
+# xalloc.h declares xalloc_die only if GNULIB_XALLOC_DIE is defined.
+# Without this define each inclusion of xalloc.h will spit out a number
+# of warnings about this function not being declared.
+# See also include/xdico.h
+AM_CPPFLAGS = @DICO_PROG_CONFIG@ -I$(srcdir) -I$(builddir) -DGNULIB_XALLOC_DIE=1
AM_CFLAGS =
include gnulib.am
diff --git a/xdico/iputil.c b/xdico/iputil.c
index 66a206a..030ded1 100644
--- a/xdico/iputil.c
+++ b/xdico/iputil.c
@@ -30,7 +30,6 @@
#include <inttostr.h>
#include <xdico.h>
-#include <xalloc.h>
static size_t
mu_stpcpy (char **pbuf, size_t *psize, const char *src)
diff --git a/xdico/timer.c b/xdico/timer.c
index fb3bbf4..26d0147 100644
--- a/xdico/timer.c
+++ b/xdico/timer.c
@@ -22,7 +22,6 @@
#include <string.h>
#include <hash.h>
#include <ctype.h>
-#include <xalloc.h>
struct timer_slot {
char *name;
diff --git a/xdico/userprivs.c b/xdico/userprivs.c
index 066e620..1328684 100644
--- a/xdico/userprivs.c
+++ b/xdico/userprivs.c
@@ -20,7 +20,6 @@
#include <unistd.h>
#include <grp.h>
#include <errno.h>
-#include <xalloc.h>
#include <xdico.h>
#include <libi18n.h>
diff --git a/xdico/xalloc-die.c b/xdico/xalloc-die.c
index 65f3569..5a2d80f 100644
--- a/xdico/xalloc-die.c
+++ b/xdico/xalloc-die.c
@@ -22,4 +22,7 @@ void
xalloc_die(void)
{
dico_die(EX_OSERR, L_CRIT, 0, "Not enough memory");
+ /* dico_die never returns. The call below prevents the spurions 'noreturn'
+ warning from gcc and serves as an extra safety measure. */
+ abort();
}
diff --git a/xdico/xhostname.c b/xdico/xhostname.c
index 8d765fa..e5f5d9b 100644
--- a/xdico/xhostname.c
+++ b/xdico/xhostname.c
@@ -19,7 +19,6 @@
#include <string.h>
#include <netdb.h>
#include <xdico.h>
-#include <xalloc.h>
#include <xgethostname.h>
#include <xgetdomainname.h>
diff --git a/xdico/xscript.c b/xdico/xscript.c
index 9f86677..f9d8de8 100644
--- a/xdico/xscript.c
+++ b/xdico/xscript.c
@@ -24,7 +24,6 @@
#include <config.h>
#include <xdico.h>
#include <string.h>
-#include <xalloc.h>
#include <errno.h>
#define TRANS_READ 0x1
diff --git a/xdico/xtkn.c b/xdico/xtkn.c
index 4ba34b4..5356863 100644
--- a/xdico/xtkn.c
+++ b/xdico/xtkn.c
@@ -16,7 +16,6 @@
#include <config.h>
#include <xdico.h>
-#include "xalloc.h"
void
xdico_tokenize_string(struct dico_tokbuf *tb, char *str)
diff --git a/xdico/xutil.c b/xdico/xutil.c
index 2d89c44..61ac2f7 100644
--- a/xdico/xutil.c
+++ b/xdico/xutil.c
@@ -16,7 +16,6 @@
#include <config.h>
#include <xdico.h>
-#include <xalloc.h>
#include <string.h>
#include <errno.h>
#include <c-strcase.h>

Return to:

Send suggestions and report system problems to the System administrator.