/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-11-09 05:10:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091109051035-zcmvuhioo9gjs0cb
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
                                              D-Bus types to native
                                              Python types.
  (MandosClientPropertyCache.type_map): Removed attribute.
  (MandosClientPropertyCache.conversion): Removed method.
  (ConstrainedListBox): New; a ListBox which will keep the focus.
  (UserInterface.__init__): Take new argument "max_log_length".
  (UserInterface.divider, UserInterface.log,
  UserInterface.max_log_length, UserInterface.logbox,
  UserInterface.log_visible, UserInterface.log_wrap): New attributes.
  (UserInterface.rebuild, UserInterface.log_message,
  UserInterface.toggle_log_display, UserInterface.change_log_display):
  New methods.
  (UserInterface.remove_client): Bug fix: Eliminate double client
                                 listing when an empty list gets a
                                 ClientAdded signal.
  (UserInterface.process_input): Add more key translations.

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.4.1
 
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 \
70
66
        --param man.authors.section.enabled     0 \
71
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
68
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
69
        $(MANPOST) $(notdir $@))
76
70
# DocBook-to-man post-processing to fix a '\n' escape bug
77
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
72
 
90
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'
91
85
 
92
86
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
87
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
88
CPROGS=plugin-runner $(PLUGINS)
96
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
97
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
98
 
        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 \
99
91
        plugins.d/mandos-client.8mandos \
100
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
101
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
102
 
        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
103
95
 
104
96
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
97
 
126
118
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
119
        $(DOCBOOKTOHTML)
128
120
 
129
 
intro.8mandos: intro.xml common.ent legalnotice.xml
130
 
        $(DOCBOOKTOMAN)
131
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
121
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
122
                legalnotice.xml
136
123
        $(DOCBOOKTOMAN)
145
132
                 legalnotice.xml
146
133
        $(DOCBOOKTOHTML)
147
134
 
148
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
149
 
                legalnotice.xml
150
 
        $(DOCBOOKTOMAN)
151
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
152
 
                 legalnotice.xml
153
 
        $(DOCBOOKTOHTML)
154
 
 
155
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
156
 
                legalnotice.xml
157
 
        $(DOCBOOKTOMAN)
158
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
159
 
                 legalnotice.xml
160
 
        $(DOCBOOKTOHTML)
161
 
 
162
135
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
136
                legalnotice.xml
164
137
        $(DOCBOOKTOMAN)
205
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
179
                $@)
207
180
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
212
 
 
213
181
mandos.lsm: Makefile
214
182
        $(strip $(SED) --in-place \
215
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
222
190
                $@)
223
191
 
224
192
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
193
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
194
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
195
 
228
196
.PHONY : all doc html clean distclean run-client run-server install \
229
197
        install-server install-client uninstall uninstall-server \
235
203
distclean: clean
236
204
mostlyclean: clean
237
205
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
206
        -rm --force --recursive keydir confdir
239
207
 
240
208
check:  all
241
209
        ./mandos --check
242
210
 
243
211
# Run the client with a local config and key
244
212
run-client: all keydir/seckey.txt keydir/pubkey.txt
245
 
        @echo "###################################################################"
246
 
        @echo "# The following error messages are harmless and can be safely     #"
247
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
248
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
249
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
250
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
251
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
252
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
253
 
        @echo "#                     seteuid: Operation not permitted            #"
254
 
        @echo "#                     klogctl: Operation not permitted            #"
255
 
        @echo "###################################################################"
256
213
        ./plugin-runner --plugin-dir=plugins.d \
257
214
                --config-file=plugin-runner.conf \
258
 
                --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 \
259
216
                $(CLIENTARGS)
260
217
 
261
218
# Used by run-client
265
222
 
266
223
# Run the server with a local config
267
224
run-server: confdir/mandos.conf confdir/clients.conf
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
225
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
226
 
271
227
# Used by run-server
272
228
confdir/mandos.conf: mandos.conf
277
233
        install --mode=u=rw $< $@
278
234
# Add a client password
279
235
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
236
 
283
237
install: install-server install-client-nokey
284
238
 
289
243
 
290
244
install-server: doc
291
245
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
246
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
 
                mandos-ctl
297
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
 
                mandos-monitor
299
247
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
248
                mandos.conf
301
249
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
250
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
251
        install --mode=u=rwx,go=rx init.d-mandos \
306
252
                $(DESTDIR)/etc/init.d/mandos
307
253
        install --mode=u=rw,go=r default-mandos \
311
257
        fi
312
258
        gzip --best --to-stdout mandos.8 \
313
259
                > $(MANDIR)/man8/mandos.8.gz
314
 
        gzip --best --to-stdout mandos-monitor.8 \
315
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
316
 
        gzip --best --to-stdout mandos-ctl.8 \
317
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
318
260
        gzip --best --to-stdout mandos.conf.5 \
319
261
                > $(MANDIR)/man5/mandos.conf.5.gz
320
262
        gzip --best --to-stdout mandos-clients.conf.5 \
328
270
                install --mode=u=rwx \
329
271
                        --directory "$(CONFDIR)/plugins.d"; \
330
272
        fi
331
 
        install --mode=u=rwx,go=rx --directory \
332
 
                "$(CONFDIR)/network-hooks.d"
333
273
        install --mode=u=rwx,go=rx \
334
274
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
335
275
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
289
        install --mode=u=rwxs,go=rx \
350
290
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
351
291
                plugins.d/askpass-fifo
352
 
        install --mode=u=rwxs,go=rx \
353
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
354
 
                plugins.d/plymouth
355
292
        install initramfs-tools-hook \
356
293
                $(INITRAMFSTOOLS)/hooks/mandos
357
294
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
300
                > $(MANDIR)/man8/mandos-keygen.8.gz
364
301
        gzip --best --to-stdout plugin-runner.8mandos \
365
302
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
303
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
304
                > $(MANDIR)/man8/password-prompt.8mandos.gz
366
305
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
367
306
                > $(MANDIR)/man8/mandos-client.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
369
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
370
307
        gzip --best --to-stdout plugins.d/usplash.8mandos \
371
308
                > $(MANDIR)/man8/usplash.8mandos.gz
372
309
        gzip --best --to-stdout plugins.d/splashy.8mandos \
373
310
                > $(MANDIR)/man8/splashy.8mandos.gz
374
311
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
375
312
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
376
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
377
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
378
313
 
379
314
install-client: install-client-nokey
380
315
# Post-installation stuff
386
321
 
387
322
uninstall-server:
388
323
        -rm --force $(PREFIX)/sbin/mandos \
389
 
                $(PREFIX)/sbin/mandos-ctl \
390
 
                $(PREFIX)/sbin/mandos-monitor \
391
324
                $(MANDIR)/man8/mandos.8.gz \
392
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
393
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
394
325
                $(MANDIR)/man5/mandos.conf.5.gz \
395
326
                $(MANDIR)/man5/mandos-clients.conf.5.gz
396
327
        update-rc.d -f mandos remove
408
339
                $(PREFIX)/lib/mandos/plugins.d/usplash \
409
340
                $(PREFIX)/lib/mandos/plugins.d/splashy \
410
341
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
411
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
412
342
                $(INITRAMFSTOOLS)/hooks/mandos \
413
343
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
414
344
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
345
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
415
346
                $(MANDIR)/man8/mandos-keygen.8.gz \
416
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
418
347
                $(MANDIR)/man8/password-prompt.8mandos.gz \
419
348
                $(MANDIR)/man8/usplash.8mandos.gz \
420
349
                $(MANDIR)/man8/splashy.8mandos.gz \
421
350
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
422
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
351
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
352
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
424
353
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
425
354
        update-initramfs -k all -u
428
357
 
429
358
purge-server: uninstall-server
430
359
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
431
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
432
360
                $(DESTDIR)/etc/default/mandos \
433
361
                $(DESTDIR)/etc/init.d/mandos \
434
362
                $(DESTDIR)/var/run/mandos.pid