aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-10-22 23:03:24 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2011-10-23 00:42:30 +0300
commit21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee (patch)
treec3204285a3ba57d590d815c682f1113b6f48d834
parenteb8797c9a28f3f4e238bad89b56d331492df7828 (diff)
downloadpies-21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee.tar.gz
pies-21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee.tar.bz2
Switch to the latest Grecs.
* Makefile.am (ChangeLog): Use git2chg.awk to build it. * NEWS: Update. * bootstrap.conf (gnulib_modules): Grecs does not depend on gnulib any more. * configure.ac: Version 1.2.90. Define GRECS_HOST_PROJECT_INCLUDES, remove grecs Makefiles from AC_CONFIG_FILES: it is now done by GRECS_SETUP itself. * gnulib.modules (gitlog-to-changelog,argp): Remove. (configmake): New module. * grecs: Update to a52ab6c6. * lib/libpies.h: Remove redefinitions of _() and N_(). * src/Makefile.am: Update for the recent grecs. * src/acl.c: Rewrite using Grecs support for lists and symtabs. * src/acl.h: Likewise. * src/diag.c: Likewise. * src/inetd.c: Likewise. * src/meta1gram.y: Likewise. * src/meta1lex.h: Likewise. * src/meta1lex.l: Likewise. * src/pies.c: Likewise. * src/pies.h: Likewise. * src/progman.c: Likewise. * src/userprivs.c: Likewise.
-rw-r--r--Makefile.am42
-rw-r--r--NEWS8
-rw-r--r--bootstrap.conf9
-rw-r--r--configure.ac9
-rw-r--r--gnulib.modules3
m---------grecs0
-rw-r--r--lib/libpies.h6
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am17
-rw-r--r--src/acl.c206
-rw-r--r--src/acl.h4
-rw-r--r--src/cmdline.opt193
-rw-r--r--src/diag.c40
-rw-r--r--src/inetd.c18
-rw-r--r--src/meta1gram.y47
-rw-r--r--src/meta1lex.h3
-rw-r--r--src/meta1lex.l55
-rw-r--r--src/pies.c329
-rw-r--r--src/pies.h12
-rw-r--r--src/progman.c86
-rw-r--r--src/userprivs.c49
21 files changed, 562 insertions, 575 deletions
diff --git a/Makefile.am b/Makefile.am
index b3c49a2..de4bf81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of GNU Pies. 1# This file is part of GNU Pies.
2# Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff 2# Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff
3# 3#
4# GNU Pies is free software; you can redistribute it and/or modify 4# GNU Pies is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -34,37 +34,19 @@ alpha:
34alphacheck: 34alphacheck:
35 $(MAKE) distcheck distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"` 35 $(MAKE) distcheck distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`
36 36
37# Define the following variables in order to use the ChangeLog rule below: 37# Name of the previous ChangeLog file.
38# prev_change_log [optional] Name of the previous ChangeLog file.
39# gen_start_date [optional] Start ChangeLog from this date.
40# changelog_dir [mandatory] Directory where to create ChangeLog
41prev_change_log = ChangeLog.mfd 38prev_change_log = ChangeLog.mfd
39# Start Git ChangeLog from this date.
42gen_start_date = 2009-09-04 40gen_start_date = 2009-09-04
43changelog_dir = .
44 41
45.PHONY: ChangeLog 42.PHONY: ChangeLog
46ChangeLog: 43ChangeLog:
47 @if test -d .git; then \ 44 $(AM_V_GEN)if test -d .git; then \
48 cmd=$(top_srcdir)/build-aux/gitlog-to-changelog; \ 45 git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \
49 if test -n "$(gen_start_date)"; then \ 46 awk -f $(top_srcdir)/@GRECS_SUBDIR@/build-aux/git2chg.awk \
50 cmd="$$cmd --since=\"$(gen_start_date)\""; \ 47 -vsince=\"$(gen_start_date)\" -vappend=\"$(prev_change_log)\" \
51 fi; \ 48 > ChangeLog.tmp; \
52 $$cmd --format='%s%n%n%b%n' | \ 49 cmp ChangeLog ChangeLog.tmp > /dev/null 2>&1 || \
53 sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t; \ 50 mv ChangeLog.tmp ChangeLog; \
54 if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \ 51 rm -f ChangeLog.tmp; \
55 then \
56 echo "" >> $(changelog_dir)/cl-t; \
57 cat "$(prev_change_log)" | \
58 sed '/^Local Variables:/,/^End:/d' >> $(changelog_dir)/cl-t; \
59 fi; \
60 echo "Local Variables:" >> $(changelog_dir)/cl-t; \
61 echo "mode: change-log" >> $(changelog_dir)/cl-t; \
62 echo "version-control: never" >> $(changelog_dir)/cl-t; \
63 echo "buffer-read-only: t" >> $(changelog_dir)/cl-t; \
64 echo "End:" >> $(changelog_dir)/cl-t; \
65 echo "" >> $(changelog_dir)/cl-t; \
66 sed -n '1,/^[^#]/s/^#//p' $(top_srcdir)/Makefile.am \
67 >> $(changelog_dir)/cl-t; \
68 rm -f $(changelog_dir)/ChangeLog; \
69 mv $(changelog_dir)/cl-t $(changelog_dir)/ChangeLog; \
70 fi 52 fi
diff --git a/NEWS b/NEWS
index d4b2392..9bc6609 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,13 @@
1GNU Pies NEWS -- history of user-visible changes. 2009-12-11 1GNU Pies NEWS -- history of user-visible changes. 2011-10-23
2Copyright (C) 2009, 2010 Sergey Poznyakoff 2Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff
3See the end of file for copying conditions. 3See the end of file for copying conditions.
4 4
5Please send Pies bug reports to <bug-pies@gnu.org> or 5Please send Pies bug reports to <bug-pies@gnu.org> or
6<bug-pies@gnu.org.ua> 6<bug-pies@gnu.org.ua>
7 7
8 8
9Version 1.2.90 (Git)
10
9Version 1.2, 2009-12-11 11Version 1.2, 2009-12-11
10 12
11* First release as a GNU package. 13* First release as a GNU package.
@@ -72,7 +74,7 @@ part of Mailfromd (http://mailfromd.software.gnu.org.ua).
72========================================================================= 74=========================================================================
73Copyright information: 75Copyright information:
74 76
75Copyright (C) 2009 Sergey Poznyakoff 77Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff
76 78
77 Permission is granted to anyone to make or distribute verbatim copies 79 Permission is granted to anyone to make or distribute verbatim copies
78 of this document as received, in any medium, provided that the 80 of this document as received, in any medium, provided that the
diff --git a/bootstrap.conf b/bootstrap.conf
index 364978b..492aa78 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,5 +1,5 @@
1# Bootstrap configuration for GNU Pies. -*- shell-script -*- 1# Bootstrap configuration for GNU Pies. -*- shell-script -*-
2# Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff 2# Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff
3# 3#
4# GNU Pies is free software; you can redistribute it and/or modify 4# GNU Pies is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -31,11 +31,12 @@ if [ -n "$MODAVOID" ]; then
31fi 31fi
32 32
33# gnulib modules used by this package. 33# gnulib modules used by this package.
34gnulib_modules=`grep -h '^[^#]' gnulib.modules grecs/gnulib.modules | sort | uniq` 34gnulib_modules=`grep -h '^[^#]' gnulib.modules | sort | uniq`
35 35
36NLS_MARKERS="\ 36NLS_MARKERS="\
37 mu_error:1" 37 mu_error:1\
38 38 grecs_error:3\
39 grecs_warning:3"
39 40
40# Additional xgettext options to use. Use "\\\newline" to break lines. 41# Additional xgettext options to use. Use "\\\newline" to break lines.
41if [ -n "$NLS_MARKERS" ]; then 42if [ -n "$NLS_MARKERS" ]; then
diff --git a/configure.ac b/configure.ac
index a8848dd..0c1d2b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1# This file is part of GNU Pies. -*- autoconf -*- 1# This file is part of GNU Pies. -*- autoconf -*-
2# Copyright (C) 2009, 2010 Sergey Poznyakoff 2# Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff
3# 3#
4# GNU Pies is free software; you can redistribute it and/or modify 4# GNU Pies is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
15# along with GNU Pies. If not, see <http://www.gnu.org/licenses/>. 15# along with GNU Pies. If not, see <http://www.gnu.org/licenses/>.
16 16
17AC_PREREQ([2.63]) 17AC_PREREQ([2.63])
18AC_INIT([GNU Pies], [1.2], [bug-pies@gnu.org.ua]) 18AC_INIT([GNU Pies], [1.2.90], [bug-pies@gnu.org.ua])
19AC_CONFIG_SRCDIR([src/pies.h]) 19AC_CONFIG_SRCDIR([src/pies.h])
20AC_CONFIG_AUX_DIR([build-aux]) 20AC_CONFIG_AUX_DIR([build-aux])
21AC_CONFIG_HEADERS([config.h]) 21AC_CONFIG_HEADERS([config.h])
@@ -57,7 +57,8 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyname memmove memset select setenv socket str
57gl_INIT 57gl_INIT
58 58
59# Grecs 59# Grecs
60GRECS_SETUP 60GRECS_SETUP([grecs],[tests git2chg getopt])
61GRECS_HOST_PROJECT_INCLUDES='-I$(top_srcdir)/gnu -I$(top_builddir)/gnu'
61 62
62# Test for setproctitle 63# Test for setproctitle
63MF_PROCTITLE 64MF_PROCTITLE
@@ -85,8 +86,6 @@ IMPRIMATUR_INIT
85 86
86AC_CONFIG_FILES([Makefile 87AC_CONFIG_FILES([Makefile
87 gnu/Makefile 88 gnu/Makefile
88 grecs/Makefile
89 grecs/src/Makefile
90 lib/Makefile 89 lib/Makefile
91 src/Makefile 90 src/Makefile
92 doc/Makefile 91 doc/Makefile
diff --git a/gnulib.modules b/gnulib.modules
index d62e1a3..1e01a93 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -1,12 +1,11 @@
1# List of gnulib modules needed for Pies. 1# List of gnulib modules needed for Pies.
2# A module name per line. Empty lines and comments are ignored. 2# A module name per line. Empty lines and comments are ignored.
3 3
4argp
5c-ctype 4c-ctype
6c-strcase 5c-strcase
6configmake
7fprintftime 7fprintftime
8gettext 8gettext
9gitlog-to-changelog
10inttostr 9inttostr
11inttypes 10inttypes
12obstack 11obstack
diff --git a/grecs b/grecs
Subproject edcc575bcdc9e50bdb79f422ad0f11dc79f3eaa Subproject a52ab6c6c38e1dca047ada4d60249fb323942f0
diff --git a/lib/libpies.h b/lib/libpies.h
index 04910d5..d071846 100644
--- a/lib/libpies.h
+++ b/lib/libpies.h
@@ -1,5 +1,5 @@
1/* This file is part of GNU Pies. 1/* This file is part of GNU Pies.
2 Copyright (C) 2009, 2010 Sergey Poznyakoff 2 Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff
3 3
4 GNU Pies is free software; you can redistribute it and/or modify 4 GNU Pies is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
@@ -19,10 +19,6 @@
19#include <gettext.h> 19#include <gettext.h>
20 20
21 21
22#define _(String) gettext(String)
23#define N_(String) String
24
25
26#if defined HAVE_SYSCONF && defined _SC_OPEN_MAX 22#if defined HAVE_SYSCONF && defined _SC_OPEN_MAX