/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

* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
                                       and changed "CheckedOK" key to
                                       "C".
  (UserInterface.__init__): Show version number and brief help on start.
  (UserInterface.process_input): Help key now shows help in log
                                 buffer, and shows log buffer if
                                 hidden.  Commented out
                                 non-implemented keys.

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