/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: 2013-05-22 20:00:18 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20130522200018-xtbddz21pl7c69kw
* mandos: Bug fix: Don't print output from checkers when running in
          foreground.
          Bug fix: Do not fail when client is removed from
          clients.conf but saved settings remain.
  (Client.server_settings): New attribute.
  (Client.__init__): Take new "server_settings" keyword argument.  All
                     callers changed.
  (Client.start_checker): Redirect stdout and stderr for checkers when
                          running in foreground.
  (main): New "wnull" global variable for a writable /dev/null file.
          Do not restore settings for clients no longer in config file.
  (main/cleanup): Close wnull file object.  Do not save client
                  attribute "server_settings"
* mandos-monitor: Update to work in Urwid 1.0.1.
                  Adapt to work in both Python 3 and Python 2.

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
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
17
17
# If BROKEN_PIE is set, do not build with -pie
18
18
ifndef BROKEN_PIE
19
19
FORTIFY += -fPIE
20
 
LINK_FORTIFY_LD += -fPIE
21
20
LINK_FORTIFY += -pie
22
21
endif
23
22
#COVERAGE=--coverage
24
23
OPTIMIZE=-Os
25
24
LANGUAGE=-std=gnu99
26
25
htmldir=man
27
 
version=1.0.14
 
26
version=1.6.0
28
27
SED=sed
29
28
 
 
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
 
30
32
## Use these settings for a traditional /usr/local install
31
33
# PREFIX=$(DESTDIR)/usr/local
32
34
# CONFDIR=$(DESTDIR)/etc/mandos
33
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
34
36
# MANDIR=$(PREFIX)/man
35
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
36
39
##
37
40
 
38
41
## These settings are for a package-type install
41
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
42
45
MANDIR=$(PREFIX)/share/man
43
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
44
48
##
45
49
 
46
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
55
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
57
61
        -DVERSION='"$(version)"'
58
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
59
63
 
60
64
# Commands to format a DocBook <refentry> document into a manual page
61
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
64
68
        --param make.single.year.ranges         1 \
65
69
        --param man.output.quietly              1 \
66
70
        --param man.authors.section.enabled     0 \
67
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
72
        $(notdir $<); \
69
 
        $(MANPOST) $(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)
70
78
# DocBook-to-man post-processing to fix a '\n' escape bug
71
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
72
80
 
84
92
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
85
93
 
86
94
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
95
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
96
        plugins.d/plymouth
88
97
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
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 \
91
101
        plugins.d/mandos-client.8mandos \
92
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
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
95
105
 
96
106
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
107
 
118
128
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
119
129
        $(DOCBOOKTOHTML)
120
130
 
 
131
intro.8mandos: intro.xml common.ent legalnotice.xml
 
132
        $(DOCBOOKTOMAN)
 
133
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
134
        $(DOCBOOKTOHTML)
 
135
 
121
136
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
122
137
                legalnotice.xml
123
138
        $(DOCBOOKTOMAN)
132
147
                 legalnotice.xml
133
148
        $(DOCBOOKTOHTML)
134
149
 
 
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
 
135
164
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
136
165
                legalnotice.xml
137
166
        $(DOCBOOKTOMAN)
178
207
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
208
                $@)
180
209
 
 
210
mandos-monitor: Makefile
 
211
        $(strip $(SED) --in-place \
 
212
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
213
                $@)
 
214
 
181
215
mandos.lsm: Makefile
182
216
        $(strip $(SED) --in-place \
183
217
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
190
224
                $@)
191
225
 
192
226
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
227
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
228
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
195
229
 
196
230
.PHONY : all doc html clean distclean run-client run-server install \
197
231
        install-server install-client uninstall uninstall-server \
203
237
distclean: clean
204
238
mostlyclean: clean
205
239
maintainer-clean: clean
206
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
207
241
 
208
242
check:  all
209
243
        ./mandos --check
 
244
        ./mandos-ctl --check
210
245
 
211
246
# Run the client with a local config and key
212
247
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 "###################################################################"
213
259
        ./plugin-runner --plugin-dir=plugins.d \
214
260
                --config-file=plugin-runner.conf \
215
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
261
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
216
262
                $(CLIENTARGS)
217
263
 
218
264
# Used by run-client
221
267
        ./mandos-keygen --dir keydir --force
222
268
 
223
269
# Run the server with a local config
224
 
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
271
        ./mandos --debug --no-dbus --configdir=confdir \
 
272
                --statedir=statedir $(SERVERARGS)
226
273
 
227
274
# Used by run-server
228
275
confdir/mandos.conf: mandos.conf
233
280
        install --mode=u=rw $< $@
234
281
# Add a client password
235
282
        ./mandos-keygen --dir keydir --password >> $@
 
283
statedir:
 
284
        install --directory statedir
236
285
 
237
286
install: install-server install-client-nokey
238
287
 
243
292
 
244
293
install-server: doc
245
294
        install --directory $(CONFDIR)
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
246
297
        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
247
302
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
248
303
                mandos.conf
249
304
        install --mode=u=rw --target-directory=$(CONFDIR) \
250
305
                clients.conf
 
306
        install --mode=u=rw,go=r dbus-mandos.conf \
 
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
251
308
        install --mode=u=rwx,go=rx init.d-mandos \
252
309
                $(DESTDIR)/etc/init.d/mandos
253
310
        install --mode=u=rw,go=r default-mandos \
257
314
        fi
258
315
        gzip --best --to-stdout mandos.8 \
259
316
                > $(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
260
321
        gzip --best --to-stdout mandos.conf.5 \
261
322
                > $(MANDIR)/man5/mandos.conf.5.gz
262
323
        gzip --best --to-stdout mandos-clients.conf.5 \
263
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
264
327
 
265
328
install-client-nokey: all doc
266
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
270
333
                install --mode=u=rwx \
271
334
                        --directory "$(CONFDIR)/plugins.d"; \
272
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
273
338
        install --mode=u=rwx,go=rx \
274
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
275
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
289
354
        install --mode=u=rwxs,go=rx \
290
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
291
356
                plugins.d/askpass-fifo
 
357
        install --mode=u=rwxs,go=rx \
 
358
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
359
                plugins.d/plymouth
292
360
        install initramfs-tools-hook \
293
361
                $(INITRAMFSTOOLS)/hooks/mandos
294
362
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
300
368
                > $(MANDIR)/man8/mandos-keygen.8.gz
301
369
        gzip --best --to-stdout plugin-runner.8mandos \
302
370
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
371
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
372
                > $(MANDIR)/man8/mandos-client.8mandos.gz
303
373
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
304
374
                > $(MANDIR)/man8/password-prompt.8mandos.gz
305
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
306
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
307
375
        gzip --best --to-stdout plugins.d/usplash.8mandos \
308
376
                > $(MANDIR)/man8/usplash.8mandos.gz
309
377
        gzip --best --to-stdout plugins.d/splashy.8mandos \
310
378
                > $(MANDIR)/man8/splashy.8mandos.gz
311
379
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
312
380
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
381
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
382
                > $(MANDIR)/man8/plymouth.8mandos.gz
313
383
 
314
384
install-client: install-client-nokey
315
385
# Post-installation stuff
321
391
 
322
392
uninstall-server:
323
393
        -rm --force $(PREFIX)/sbin/mandos \
 
394
                $(PREFIX)/sbin/mandos-ctl \
 
395
                $(PREFIX)/sbin/mandos-monitor \
324
396
                $(MANDIR)/man8/mandos.8.gz \
 
397
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
398
                $(MANDIR)/man8/mandos-ctl.8.gz \
325
399
                $(MANDIR)/man5/mandos.conf.5.gz \
326
400
                $(MANDIR)/man5/mandos-clients.conf.5.gz
327
401
        update-rc.d -f mandos remove
339
413
                $(PREFIX)/lib/mandos/plugins.d/usplash \
340
414
                $(PREFIX)/lib/mandos/plugins.d/splashy \
341
415
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
416
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
342
417
                $(INITRAMFSTOOLS)/hooks/mandos \
343
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
419
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
420
                $(MANDIR)/man8/mandos-keygen.8.gz \
345
421
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
422
                $(MANDIR)/man8/mandos-client.8mandos.gz
347
423
                $(MANDIR)/man8/password-prompt.8mandos.gz \
348
424
                $(MANDIR)/man8/usplash.8mandos.gz \
349
425
                $(MANDIR)/man8/splashy.8mandos.gz \
350
426
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
351
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
427
                $(MANDIR)/man8/plymouth.8mandos.gz \
352
428
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
353
429
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
354
430
        update-initramfs -k all -u
357
433
 
358
434
purge-server: uninstall-server
359
435
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
360
437
                $(DESTDIR)/etc/default/mandos \
361
438
                $(DESTDIR)/etc/init.d/mandos \
362
439
                $(DESTDIR)/var/run/mandos.pid