/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

* plugin-runner.c (main): When a plugin is killed by a signal, show
                          the signal name, not just the number, in the
                          debug log message.

* plugins.d/password-prompt.c (termination_handler): Store received
                                                     signal in
                                                     "signal_received".
  (main): If exiting due to signal, re-raise signal received instead
          of returning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
13
15
#COVERAGE=--coverage
14
16
OPTIMIZE=-Os
15
17
LANGUAGE=-std=gnu99
16
18
htmldir=man
17
 
version=1.0
 
19
version=1.0.11
18
20
SED=sed
19
21
 
20
22
## Use these settings for a traditional /usr/local install
33
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
34
36
##
35
37
 
36
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
37
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
38
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
39
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
40
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
41
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
42
45
 
43
46
# Do not change these two
44
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
45
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
46
49
        -DVERSION='"$(version)"'
47
 
LDFLAGS=$(COVERAGE)
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
48
51
 
49
52
# Commands to format a DocBook <refentry> document into a manual page
50
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
69
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
70
73
        $<; $(HTMLPOST) $@
71
74
# Fix citerefentry links
72
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
75
HTMLPOST=$(SED) --in-place \
 
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
73
77
 
74
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
75
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
76
80
CPROGS=plugin-runner $(PLUGINS)
77
 
PROGS=mandos mandos-keygen $(CPROGS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
78
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
79
83
        plugins.d/mandos-client.8mandos \
80
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
81
 
        mandos-clients.conf.5
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
82
87
 
83
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
84
89
 
85
90
objects=$(addsuffix .o,$(CPROGS))
86
91
 
87
 
all: $(PROGS)
 
92
all: $(PROGS) mandos.lsm
88
93
 
89
94
doc: $(DOCS)
90
95
 
146
151
 
147
152
# Update all these files with version number $(version)
148
153
common.ent: Makefile
149
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
154
        $(SED) --in-place \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
156
                $@
150
157
 
151
158
mandos: Makefile
152
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"/\1$(version)"/' $@
 
159
        $(SED) --in-place \
 
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
161
                $@
153
162
 
154
163
mandos-keygen: Makefile
155
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"/\1$(version)"/' $@
 
164
        $(SED) --in-place \
 
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
166
                $@
 
167
 
 
168
mandos-ctl: Makefile
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
 
172
 
 
173
mandos.lsm: Makefile
 
174
        $(SED) --in-place \
 
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
176
                $@
 
177
        $(SED) --in-place \
 
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
179
                $@
 
180
        $(SED) --in-place \
 
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
182
                $@
156
183
 
157
184
plugins.d/mandos-client: plugins.d/mandos-client.o
158
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
177
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
178
205
        ./plugin-runner --plugin-dir=plugins.d \
179
206
                --config-file=plugin-runner.conf \
180
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
208
                $(CLIENTARGS)
181
209
 
182
210
# Used by run-client
183
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
186
214
 
187
215
# Run the server with a local config
188
216
run-server: confdir/mandos.conf confdir/clients.conf
189
 
        ./mandos --debug --configdir=confdir
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
190
218
 
191
219
# Used by run-server
192
220
confdir/mandos.conf: mandos.conf
200
228
 
201
229
install: install-server install-client-nokey
202
230
 
203
 
install-html: $(htmldocs)
 
231
install-html: html
204
232
        install --directory $(htmldir)
205
233
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
206
234
                $(htmldocs)
258
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
259
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
260
288
        install initramfs-tools-script \
261
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
262
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
263
291
        gzip --best --to-stdout mandos-keygen.8 \
264
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
268
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
269
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
270
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
300
                > $(MANDIR)/man8/usplash.8mandos.gz
 
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
302
                > $(MANDIR)/man8/splashy.8mandos.gz
 
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
271
305
 
272
306
install-client: install-client-nokey
273
307
# Post-installation stuff
296
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
297
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
298
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
299
334
                $(INITRAMFSTOOLS)/hooks/mandos \
300
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
301
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
302
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
303
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
304
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
340
                $(MANDIR)/man8/usplash.8mandos.gz \
 
341
                $(MANDIR)/man8/splashy.8mandos.gz \
 
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
305
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
306
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
307
 
                rm --force $(CONFDIR)/plugins.d/README; \
308
 
        fi
309
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
310
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
311
346
        update-initramfs -k all -u