/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-08-02 10:48:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080802104824-fx0miwp9o4g9r31e
* plugbasedclient.c (struct process): New fields "eof", "completed",
                                      and "status".
  (handle_sigchld): New function.
  (main): Initialize "dir" to NULL to only closedir() it if necessary.
          Move "process_list" to be a global variable to be accessible
          by "handle_sigchld".  Make "handle_sigchld" handle SIGCHLD.
          Remove redundant check for NULL "dir".  Free "filename" when
          no longer used.  Block SIGCHLD around fork()/exec().
          Restore normal signals in child.  Only loop while running
          processes exist.  Print process buffer when the process is
          done and it has emitted EOF, not when it only emits EOF.
          Remove processes from list which exit non-cleanly.  In
          cleaning up, closedir() if necessary.  Bug fix: set next
          pointer correctly when freeing process list.

* plugins.d/passprompt.c (main): Do not ignore SIGQUIT.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
 
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
 
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-parameter -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow -Wunsafe-loop-optimizations -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wold-style-definition -Wpacked -Wnested-externs -Wunreachable-code -Winline -Wvolatile-register-var 
9
2
DEBUG=-ggdb3
10
3
# For info about _FORTIFY_SOURCE, see
11
4
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
13
6
#COVERAGE=--coverage
14
7
OPTIMIZE=-Os
15
8
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
17
 
PREFIX=/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=/usr/share/man
22
 
 
23
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
25
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
26
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
27
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
28
 
GPGME_LIBS=$(shell gpgme-config --libs)
29
9
 
30
10
# Do not change these two
31
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
32
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
11
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
33
12
LDFLAGS=$(COVERAGE)
34
13
 
35
 
DOCBOOKTOMAN=xsltproc --nonet \
36
 
        --param man.charmap.use.subset          0 \
37
 
        --param make.year.ranges                1 \
38
 
        --param make.single.year.ranges         1 \
39
 
        --param man.output.quietly              1 \
40
 
        --param man.authors.section.enabled     0 \
41
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
42
 
# DocBook-to-man post-processing to fix a \n escape bug
43
 
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
44
 
 
45
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
46
 
PROGS=plugin-runner $(PLUGINS)
47
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
48
 
        plugins.d/password-request.8mandos \
49
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
50
 
        mandos-clients.conf.5
51
 
 
52
 
objects=$(addsuffix .o,$(PROGS))
 
14
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
 
15
 
 
16
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
53
17
 
54
18
all: $(PROGS)
55
19
 
56
 
doc: $(DOCS)
57
 
 
58
 
%.5: %.xml
59
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
60
 
 
61
 
%.8: %.xml
62
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
63
 
 
64
 
%.8mandos: %.xml
65
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
66
 
 
67
 
plugins.d/password-request: plugins.d/password-request.o
68
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
69
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
70
 
 
71
 
.PHONY : all doc clean distclean run-client run-server install \
72
 
        install-server install-client uninstall uninstall-server \
73
 
        uninstall-client purge purge-server purge-client
74
 
 
 
20
plugbasedclient: plugbasedclient.o
 
21
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
22
 
 
23
plugins.d/mandosclient: plugins.d/mandosclient.o
 
24
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
25
 
 
26
plugins.d/passprompt: plugins.d/passprompt.o
 
27
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
28
 
 
29
.PHONY : clean
75
30
clean:
76
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
77
 
 
78
 
distclean: clean
79
 
mostlyclean: clean
80
 
maintainer-clean: clean
81
 
        -rm --force --recursive keydir
82
 
 
83
 
check:
84
 
        ./mandos --check
85
 
 
86
 
run-client: all
87
 
        -mkdir keydir
88
 
        -./mandos-keygen --dir keydir
89
 
        ./plugin-runner --plugin-dir=plugins.d \
90
 
                --options-for=password-request:--keydir=keydir
91
 
 
92
 
run-server:
93
 
        ./mandos --debug --configdir=.
94
 
 
95
 
install: install-server install-client
96
 
 
97
 
install-server: doc
98
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
99
 
                $(MANDIR)/man8
100
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
101
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
102
 
        install --mode=0640 --target-directory=$(CONFDIR) \
103
 
                clients.conf
104
 
        gzip --best --to-stdout mandos.8 \
105
 
                > $(MANDIR)/man8/mandos.8.gz
106
 
        gzip --best --to-stdout mandos.conf.5 \
107
 
                > $(MANDIR)/man5/mandos.conf.5.gz
108
 
        gzip --best --to-stdout mandos-clients.conf.5 \
109
 
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
110
 
 
111
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
112
 
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
113
 
                $(MANDIR)/man8
114
 
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
115
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
116
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
117
 
                plugin-runner
118
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
119
 
                mandos-keygen
120
 
        install --mode=0755 \
121
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
122
 
                plugins.d/password-prompt
123
 
        install --mode=4755 \
124
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
125
 
                plugins.d/password-request
126
 
        install initramfs-tools-hook \
127
 
                /usr/share/initramfs-tools/hooks/mandos
128
 
        install initramfs-tools-hook-conf \
129
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
130
 
        install initramfs-tools-script \
131
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
132
 
        gzip --best --to-stdout mandos-keygen.8 \
133
 
                > $(MANDIR)/man8/mandos-keygen.8.gz
134
 
        gzip --best --to-stdout plugin-runner.8mandos \
135
 
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
136
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
137
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
138
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
139
 
                > $(MANDIR)/man8/password-request.8mandos.gz
140
 
        -$(PREFIX)/sbin/mandos-keygen
141
 
        update-initramfs -k all -u
142
 
 
143
 
uninstall: uninstall-server uninstall-client
144
 
 
145
 
uninstall-server: $(PREFIX)/sbin/mandos
146
 
        -rm --force $(PREFIX)/sbin/mandos \
147
 
                $(MANDIR)/man8/mandos.8.gz \
148
 
                $(MANDIR)/man5/mandos.conf.5.gz \
149
 
                $(MANDIR)/man5/mandos-clients.conf.5.gz
150
 
        -rmdir $(CONFDIR)
151
 
 
152
 
uninstall-client:
153
 
# Refuse to uninstall client if /etc/crypttab is explicitly configured
154
 
# to use it.
155
 
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
156
 
                /etc/crypttab
157
 
        -rm --force $(PREFIX)/sbin/mandos-keygen \
158
 
                $(PREFIX)/lib/mandos/plugin-runner \
159
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
160
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
161
 
                /usr/share/initramfs-tools/hooks/mandos \
162
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
163
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
164
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
165
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
166
 
                $(MANDIR)/man8/password-request.8mandos.gz
167
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
168
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
169
 
        update-initramfs -k all -u
170
 
 
171
 
purge: purge-server purge-client
172
 
 
173
 
purge-server: uninstall-server
174
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
175
 
        -rmdir $(CONFDIR)
176
 
 
177
 
purge-client: uninstall-client
178
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
179
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
31
        -rm -f $(PROGS) $(objects) core