diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-22 23:03:24 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-23 00:42:30 +0300 |
commit | 21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee (patch) | |
tree | c3204285a3ba57d590d815c682f1113b6f48d834 | |
parent | eb8797c9a28f3f4e238bad89b56d331492df7828 (diff) | |
download | pies-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.am | 42 | ||||
-rw-r--r-- | NEWS | 8 | ||||
-rw-r--r-- | bootstrap.conf | 9 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | gnulib.modules | 3 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | lib/libpies.h | 6 | ||||
-rw-r--r-- | src/.gitignore | 1 | ||||
-rw-r--r-- | src/Makefile.am | 17 | ||||
-rw-r--r-- | src/acl.c | 206 | ||||
-rw-r--r-- | src/acl.h | 4 | ||||
-rw-r--r-- | src/cmdline.opt | 193 | ||||
-rw-r--r-- | src/diag.c | 40 | ||||
-rw-r--r-- | src/inetd.c | 18 | ||||
-rw-r--r-- | src/meta1gram.y | 47 | ||||
-rw-r--r-- | src/meta1lex.h | 3 | ||||
-rw-r--r-- | src/meta1lex.l | 55 | ||||
-rw-r--r-- | src/pies.c | 329 | ||||
-rw-r--r-- | src/pies.h | 12 | ||||
-rw-r--r-- | src/progman.c | 86 | ||||
-rw-r--r-- | src/userprivs.c | 49 |
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,3 +1,3 @@ | |||
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 | # |
@@ -36,35 +36,17 @@ alphacheck: | |||
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 | ||
41 | prev_change_log = ChangeLog.mfd | 38 | prev_change_log = ChangeLog.mfd |
39 | # Start Git ChangeLog from this date. | ||
42 | gen_start_date = 2009-09-04 | 40 | gen_start_date = 2009-09-04 |
43 | changelog_dir = . | ||
44 | 41 | ||
45 | .PHONY: ChangeLog | 42 | .PHONY: ChangeLog |
46 | ChangeLog: | 43 | ChangeLog: |
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 |
@@ -1,3 +1,3 @@ | |||
1 | GNU Pies NEWS -- history of user-visible changes. 2009-12-11 | 1 | GNU Pies NEWS -- history of user-visible changes. 2011-10-23 |
2 | Copyright (C) 2009, 2010 Sergey Poznyakoff | 2 | Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
@@ -8,2 +8,4 @@ Please send Pies bug reports to <bug-pies@gnu.org> or | |||
8 | 8 | ||
9 | Version 1.2.90 (Git) | ||
10 | |||
9 | Version 1.2, 2009-12-11 | 11 | Version 1.2, 2009-12-11 |
@@ -74,3 +76,3 @@ Copyright information: | |||
74 | 76 | ||
75 | Copyright (C) 2009 Sergey Poznyakoff | 77 | Copyright (C) 2009, 2010, 2011 Sergey Poznyakoff |
76 | 78 | ||
diff --git a/bootstrap.conf b/bootstrap.conf index 364978b..492aa78 100644 --- a/bootstrap.conf +++ b/bootstrap.conf | |||
@@ -1,3 +1,3 @@ | |||
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 | # |
@@ -33,7 +33,8 @@ fi | |||
33 | # gnulib modules used by this package. | 33 | # gnulib modules used by this package. |
34 | gnulib_modules=`grep -h '^[^#]' gnulib.modules grecs/gnulib.modules | sort | uniq` | 34 | gnulib_modules=`grep -h '^[^#]' gnulib.modules | sort | uniq` |
35 | 35 | ||
36 | NLS_MARKERS="\ | 36 | NLS_MARKERS="\ |
37 | mu_error:1" | 37 | mu_error:1\ |
38 | 38 | grecs_error:3\ | |
39 | grecs_warning:3" | ||
39 | 40 | ||
diff --git a/configure.ac b/configure.ac index a8848dd..0c1d2b9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,3 +1,3 @@ | |||
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 | # |
@@ -17,3 +17,3 @@ | |||
17 | AC_PREREQ([2.63]) | 17 | AC_PREREQ([2.63]) |
18 | AC_INIT([GNU Pies], [1.2], [bug-pies@gnu.org.ua]) | 18 | AC_INIT([GNU Pies], [1.2.90], [bug-pies@gnu.org.ua]) |
19 | AC_CONFIG_SRCDIR([src/pies.h]) | 19 | AC_CONFIG_SRCDIR([src/pies.h]) |
@@ -59,3 +59,4 @@ gl_INIT | |||
59 | # Grecs | 59 | # Grecs |
60 | GRECS_SETUP | 60 | GRECS_SETUP([grecs],[tests git2chg getopt]) |
61 | GRECS_HOST_PROJECT_INCLUDES='-I$(top_srcdir)/gnu -I$(top_builddir)/gnu' | ||
61 | 62 | ||
@@ -87,4 +88,2 @@ AC_CONFIG_FILES([Makefile | |||
87 | gnu/Makefile | 88 | gnu/Makefile |
88 | grecs/Makefile | ||
89 | grecs/src/Makefile | ||
90 | lib/Makefile | 89 | lib/Makefile |
diff --git a/gnulib.modules b/gnulib.modules index d62e1a3..1e01a93 100644 --- a/gnulib.modules +++ b/gnulib.modules | |||
@@ -3,8 +3,7 @@ | |||
3 | 3 | ||
4 | argp | ||
5 | c-ctype | 4 | c-ctype |
6 | c-strcase | 5 | c-strcase |
6 | configmake | ||
7 | fprintftime | 7 | fprintftime |
8 | gettext | 8 | gettext |
9 | gitlog-to-changelog | ||
10 | inttostr | 9 | inttostr |
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,3 +1,3 @@ | |||
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 | ||
@@ -21,6 +21,2 @@ | |||
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 |
diff --git a/src/.gitignore b/src/.gitignore index 18a7111..4ad4290 100644 --- a/src/.gitignore +++ b/src/.gitignore | |||
@@ -1 +1,2 @@ | |||
1 | cmdline.h | ||
1 | inetd | 2 | inetd |
diff --git a/src/Makefile.am b/src/Makefile.am index 19c6483..455b2c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,3 +1,3 @@ | |||
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 | # |
@@ -37,2 +37,3 @@ noinst_HEADERS = \ | |||
37 | acl.h\ | 37 | acl.h\ |
38 | cmdline.h\ | ||
38 | meta1gram.h\ | 39 | meta1gram.h\ |
@@ -43,5 +44,13 @@ meta1lex.c: meta1gram.h | |||
43 | 44 | ||
45 | BUILT_SOURCES=cmdline.h | ||
46 | |||
44 | incdir=$(pkgdatadir)/$(VERSION)/include | 47 | incdir=$(pkgdatadir)/$(VERSION)/include |
45 | inc_DATA = pp-setup | 48 | inc_DATA = pp-setup |
46 | EXTRA_DIST = pp-setup inetd.in | 49 | EXTRA_DIST = cmdline.opt pp-setup inetd.in |
50 | |||
51 | SUFFIXES=.opt .c .h | ||
52 | .opt.h: | ||
53 | $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@ | ||
54 | |||
55 | cmdline.h: cmdline.opt | ||
47 | 56 | ||
@@ -51,3 +60,3 @@ INCLUDES = \ | |||
51 | -I$(top_builddir)/gnu\ | 60 | -I$(top_builddir)/gnu\ |
52 | -I$(top_srcdir)/grecs/src | 61 | @GRECS_INCLUDES@ |
53 | 62 | ||
@@ -55,3 +64,3 @@ LDADD = \ | |||
55 | ../lib/libpies.a\ | 64 | ../lib/libpies.a\ |
56 | ../grecs/src/libgrecs.a\ | 65 | @GRECS_LDADD@\ |
57 | ../gnu/libgnu.a\ | 66 | ../gnu/libgnu.a\ |
@@ -1,3 +1,3 @@ | |||
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 | ||
@@ -27,3 +27,2 @@ | |||
27 | #include <netdb.h> | 27 | #include <netdb.h> |
28 | #include <hash.h> | ||
29 | 28 | ||
@@ -42,4 +41,4 @@ struct acl_entry | |||
42 | pies_acl_t acl; | 41 | pies_acl_t acl; |
43 | gl_list_t groups; | 42 | struct grecs_list *groups; |
44 | gl_list_t sockaddrs; | 43 | struct grecs_list *sockaddrs; |
45 | }; | 44 | }; |
@@ -50,3 +49,3 @@ struct pies_acl | |||
50 | grecs_locus_t locus; | 49 | grecs_locus_t locus; |
51 | gl_list_t list; | 50 | struct grecs_list *list; |
52 | }; | 51 | }; |
@@ -63,7 +62,3 @@ pies_acl_create (const char *name, grec |