/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-04-17 01:16:37 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090417011637-bcqjpm7fskm4370v
Code cleanup and one bug fix.

* mandos (Client.enable): Bug fix: Do not enable if already enabled.
  (MandosServer.__init__): Create empty set of clients if none passed.
  (main): Do not create clients set; do not pass a clients set to
          MandosServer.  Use tcp_server.clients throughout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.6.1
 
19
version=1.0.8
27
20
SED=sed
28
21
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
22
## Use these settings for a traditional /usr/local install
33
23
# PREFIX=$(DESTDIR)/usr/local
34
24
# CONFDIR=$(DESTDIR)/etc/mandos
35
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
26
# MANDIR=$(PREFIX)/man
37
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
28
##
40
29
 
41
30
## These settings are for a package-type install
44
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
34
MANDIR=$(PREFIX)/share/man
46
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
36
##
49
37
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
52
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
54
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
56
44
        getconf LFS_LDFLAGS)
57
45
 
58
46
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
49
        -DVERSION='"$(version)"'
62
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
51
 
64
52
# Commands to format a DocBook <refentry> document into a manual page
65
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
66
54
        --param man.charmap.use.subset          0 \
67
55
        --param make.year.ranges                1 \
68
56
        --param make.single.year.ranges         1 \
69
57
        --param man.output.quietly              1 \
70
58
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
60
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
78
62
# DocBook-to-man post-processing to fix a '\n' escape bug
79
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
64
 
81
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
82
66
        --param make.year.ranges                1 \
83
67
        --param make.single.year.ranges         1 \
84
68
        --param man.output.quietly              1 \
86
70
        --param citerefentry.link               1 \
87
71
        --output $@ \
88
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
90
74
# Fix citerefentry links
91
75
HTMLPOST=$(SED) --in-place \
92
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'
93
77
 
94
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
97
80
CPROGS=plugin-runner $(PLUGINS)
98
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
101
83
        plugins.d/mandos-client.8mandos \
102
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
 
        plugins.d/plymouth.8mandos intro.8mandos
 
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
105
87
 
106
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
107
89
 
128
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
129
111
        $(DOCBOOKTOHTML)
130
112
 
131
 
intro.8mandos: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOMAN)
133
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
134
 
        $(DOCBOOKTOHTML)
135
 
 
136
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
137
114
                legalnotice.xml
138
115
        $(DOCBOOKTOMAN)
147
124
                 legalnotice.xml
148
125
        $(DOCBOOKTOHTML)
149
126
 
150
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
158
 
                legalnotice.xml
159
 
        $(DOCBOOKTOMAN)
160
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
161
 
                 legalnotice.xml
162
 
        $(DOCBOOKTOHTML)
163
 
 
164
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
165
128
                legalnotice.xml
166
129
        $(DOCBOOKTOMAN)
188
151
 
189
152
# Update all these files with version number $(version)
190
153
common.ent: Makefile
191
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
192
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
193
 
                $@)
 
156
                $@
194
157
 
195
158
mandos: Makefile
196
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
197
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
198
 
                $@)
 
161
                $@
199
162
 
200
163
mandos-keygen: Makefile
201
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
202
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
203
 
                $@)
 
166
                $@
204
167
 
205
168
mandos-ctl: Makefile
206
 
        $(strip $(SED) --in-place \
207
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
208
 
                $@)
209
 
 
210
 
mandos-monitor: Makefile
211
 
        $(strip $(SED) --in-place \
212
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
213
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
214
172
 
215
173
mandos.lsm: Makefile
216
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
217
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
218
 
                $@)
219
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
220
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
221
 
                $@)
222
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
223
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
224
 
                $@)
 
182
                $@
225
183
 
226
 
plugins.d/mandos-client: plugins.d/mandos-client.c
227
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
229
187
 
230
188
.PHONY : all doc html clean distclean run-client run-server install \
231
189
        install-server install-client uninstall uninstall-server \
237
195
distclean: clean
238
196
mostlyclean: clean
239
197
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
241
199
 
242
200
check:  all
243
201
        ./mandos --check
244
 
        ./mandos-ctl --check
245
202
 
246
203
# Run the client with a local config and key
247
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
 
        @echo "###################################################################"
249
 
        @echo "# The following error messages are harmless and can be safely     #"
250
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
251
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
252
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
254
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
255
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
256
 
        @echo "#                     seteuid: Operation not permitted            #"
257
 
        @echo "#                     klogctl: Operation not permitted            #"
258
 
        @echo "###################################################################"
259
205
        ./plugin-runner --plugin-dir=plugins.d \
260
206
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
262
208
                $(CLIENTARGS)
263
209
 
264
210
# Used by run-client
267
213
        ./mandos-keygen --dir keydir --force
268
214
 
269
215
# Run the server with a local config
270
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
271
 
        ./mandos --debug --no-dbus --configdir=confdir \
272
 
                --statedir=statedir $(SERVERARGS)
 
216
run-server: confdir/mandos.conf confdir/clients.conf
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
273
218
 
274
219
# Used by run-server
275
220
confdir/mandos.conf: mandos.conf
280
225
        install --mode=u=rw $< $@
281
226
# Add a client password
282
227
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
228
 
286
229
install: install-server install-client-nokey
287
230
 
292
235
 
293
236
install-server: doc
294
237
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
 
                mandos-ctl
300
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
 
                mandos-monitor
302
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
303
240
                mandos.conf
304
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
305
242
                clients.conf
306
 
        install --mode=u=rw,go=r dbus-mandos.conf \
307
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
243
        install --mode=u=rwx,go=rx init.d-mandos \
309
244
                $(DESTDIR)/etc/init.d/mandos
310
245
        install --mode=u=rw,go=r default-mandos \
314
249
        fi
315
250
        gzip --best --to-stdout mandos.8 \
316
251
                > $(MANDIR)/man8/mandos.8.gz
317
 
        gzip --best --to-stdout mandos-monitor.8 \
318
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
319
 
        gzip --best --to-stdout mandos-ctl.8 \
320
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
321
252
        gzip --best --to-stdout mandos.conf.5 \
322
253
                > $(MANDIR)/man5/mandos.conf.5.gz
323
254
        gzip --best --to-stdout mandos-clients.conf.5 \
324
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
256
 
328
257
install-client-nokey: all doc
329
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
262
                install --mode=u=rwx \
334
263
                        --directory "$(CONFDIR)/plugins.d"; \
335
264
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
265
        install --mode=u=rwx,go=rx \
339
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
268
                mandos-keygen
342
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
 
                mandos-change-keytype
344
269
        install --mode=u=rwx,go=rx \
345
270
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
271
                plugins.d/password-prompt
356
281
        install --mode=u=rwxs,go=rx \
357
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
358
283
                plugins.d/askpass-fifo
359
 
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
361
 
                plugins.d/plymouth
362
284
        install initramfs-tools-hook \
363
285
                $(INITRAMFSTOOLS)/hooks/mandos
364
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
370
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
371
293
        gzip --best --to-stdout plugin-runner.8mandos \
372
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
373
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
374
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
375
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
376
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
377
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
378
300
                > $(MANDIR)/man8/usplash.8mandos.gz
379
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
380
302
                > $(MANDIR)/man8/splashy.8mandos.gz
381
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
382
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
383
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
384
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
385
305
 
386
306
install-client: install-client-nokey
387
307
# Post-installation stuff
393
313
 
394
314
uninstall-server:
395
315
        -rm --force $(PREFIX)/sbin/mandos \
396
 
                $(PREFIX)/sbin/mandos-ctl \
397
 
                $(PREFIX)/sbin/mandos-monitor \
398
316
                $(MANDIR)/man8/mandos.8.gz \
399
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
400
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
401
317
                $(MANDIR)/man5/mandos.conf.5.gz \
402
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
403
319
        update-rc.d -f mandos remove
409
325
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
326
                $(DESTDIR)/etc/crypttab
411
327
        -rm --force $(PREFIX)/sbin/mandos-keygen \
412
 
                $(PREFIX)/sbin/mandos-change-keytype \
413
328
                $(PREFIX)/lib/mandos/plugin-runner \
414
329
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
416
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
417
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
418
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
419
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
420
334
                $(INITRAMFSTOOLS)/hooks/mandos \
421
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
422
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
423
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
424
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
425
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
426
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
427
340
                $(MANDIR)/man8/usplash.8mandos.gz \
428
341
                $(MANDIR)/man8/splashy.8mandos.gz \
429
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
430
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
431
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
432
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
433
346
        update-initramfs -k all -u
436
349
 
437
350
purge-server: uninstall-server
438
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
439
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
352
                $(DESTDIR)/etc/default/mandos \
441
353
                $(DESTDIR)/etc/init.d/mandos \
442
 
                $(DESTDIR)/run/mandos.pid
 
354
                $(DESTDIR)/var/run/mandos.pid
443
355
        -rmdir $(CONFDIR)
444
356
 
445
357
purge-client: uninstall-client