/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-12-25 23:13:47 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091225231347-gg9u9ru0wj0f24hh
More consistent terminology: Clients are no longer "invalid" - they
are "disabled".  All code and documentation changed to reflect this.

D=Bus API change: The "properties" argument was removed from the
"ClientAdded" signal on interface "se.bsnet.fukt.Mandos".  All code in
both "mandos" and "mandos-monitor" changed to reflect this.

* mandos: Replaced "with closing(F)" with simply "with F" in all
          places where F is a file object.
  (Client.still_valid): Removed.  All callers changed to look at
                        "Client.enabled" instead.
  (dbus_service_property): Check for unsupported signatures with the
                           "byte_arrays" option.
  (DBusObjectWithProperties.Set): - '' -
  (ClientHandler.handle): Use the reverse pipe to receive the
                          "Client.enabled" attribute instead of the
                          now-removed "Client.still_valid()" method.
  (ForkingMixInWithPipe): Renamed to "ForkingMixInWithPipes" (all
                          users changed).  Now also create a reverse
                          pipe for sending data to the child process.
  (ForkingMixInWithPipes.add_pipe): Now takes two pipe fd's as
                                    arguments.  All callers changed.
  (IPv6_TCPServer.handle_ipc): Take an additional "reply_fd" argument
                               (all callers changed).  Close the reply
                               pipe when the child data pipe is
                               closed.  New "GETATTR" IPC method; will
                               pickle client attribute and send it
                               over the reply pipe FD.
  (MandosDBusService.ClientAdded): Removed "properties" argument.  All
                                   emitters changed.
* mandos-clients.conf.xml (DESCRIPTION, OPTIONS): Use
                                                  "enabled/disabled"
                                                  terminology.
* mandos-ctl: Option "--is-valid" renamed to "--is-enabled".
* mandos-monitor: Enable user locale.  Try to log exceptions.
  (MandosClientPropertyCache.__init__): Removed "properties" argument.
                                        All callers changed.
  (UserInterface.add_new_client): Remove "properties" argument.  All
                                  callers changed.  Supply "logger"
                                  argument to MandosClientWidget().
  (UserInterface.add_client): New "logger" argument.  All callers
                              changed.
* mandos.xml (BUGS, SECURITY/CLIENTS): Use "enabled/disabled"
                                       terminology.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.5.3
 
26
version=1.0.14
27
27
SED=sed
28
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
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
59
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
65
        --param man.authors.section.enabled     0 \
71
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
76
69
# DocBook-to-man post-processing to fix a '\n' escape bug
77
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
71
 
90
83
        --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
84
 
92
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
93
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
94
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
95
87
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 \
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
99
90
        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
 
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
103
94
 
104
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
105
96
 
126
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
127
118
        $(DOCBOOKTOHTML)
128
119
 
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
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
135
121
                legalnotice.xml
136
122
        $(DOCBOOKTOMAN)
145
131
                 legalnotice.xml
146
132
        $(DOCBOOKTOHTML)
147
133
 
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
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
163
135
                legalnotice.xml
164
136
        $(DOCBOOKTOMAN)
205
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
178
                $@)
207
179
 
208
 
mandos-monitor: Makefile
209
 
        $(strip $(SED) --in-place \
210
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
212
 
 
213
180
mandos.lsm: Makefile
214
181
        $(strip $(SED) --in-place \
215
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
222
189
                $@)
223
190
 
224
191
plugins.d/mandos-client: plugins.d/mandos-client.c
225
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
227
194
 
228
195
.PHONY : all doc html clean distclean run-client run-server install \
229
196
        install-server install-client uninstall uninstall-server \
235
202
distclean: clean
236
203
mostlyclean: clean
237
204
maintainer-clean: clean
238
 
        -rm --force --recursive keydir confdir statedir
 
205
        -rm --force --recursive keydir confdir
239
206
 
240
207
check:  all
241
208
        ./mandos --check
242
209
 
243
210
# Run the client with a local config and key
244
211
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
212
        ./plugin-runner --plugin-dir=plugins.d \
257
213
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
214
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
259
215
                $(CLIENTARGS)
260
216
 
261
217
# Used by run-client
264
220
        ./mandos-keygen --dir keydir --force
265
221
 
266
222
# Run the server with a local config
267
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
268
 
        ./mandos --debug --no-dbus --configdir=confdir \
269
 
                --statedir=statedir $(SERVERARGS)
 
223
run-server: confdir/mandos.conf confdir/clients.conf
 
224
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
225
 
271
226
# Used by run-server
272
227
confdir/mandos.conf: mandos.conf
277
232
        install --mode=u=rw $< $@
278
233
# Add a client password
279
234
        ./mandos-keygen --dir keydir --password >> $@
280
 
statedir:
281
 
        install --directory statedir
282
235
 
283
236
install: install-server install-client-nokey
284
237
 
289
242
 
290
243
install-server: doc
291
244
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
294
245
        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
246
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
300
247
                mandos.conf
301
248
        install --mode=u=rw --target-directory=$(CONFDIR) \
302
249
                clients.conf
303
 
        install --mode=u=rw,go=r dbus-mandos.conf \
304
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
250
        install --mode=u=rwx,go=rx init.d-mandos \
306
251
                $(DESTDIR)/etc/init.d/mandos
307
252
        install --mode=u=rw,go=r default-mandos \
311
256
        fi
312
257
        gzip --best --to-stdout mandos.8 \
313
258
                > $(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
259
        gzip --best --to-stdout mandos.conf.5 \
319
260
                > $(MANDIR)/man5/mandos.conf.5.gz
320
261
        gzip --best --to-stdout mandos-clients.conf.5 \
321
262
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
322
 
        gzip --best --to-stdout intro.8mandos \
323
 
                > $(MANDIR)/man8/intro.8mandos.gz
324
263
 
325
264
install-client-nokey: all doc
326
265
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
330
269
                install --mode=u=rwx \
331
270
                        --directory "$(CONFDIR)/plugins.d"; \
332
271
        fi
333
 
        install --mode=u=rwx,go=rx --directory \
334
 
                "$(CONFDIR)/network-hooks.d"
335
272
        install --mode=u=rwx,go=rx \
336
273
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
337
274
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
351
288
        install --mode=u=rwxs,go=rx \
352
289
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
353
290
                plugins.d/askpass-fifo
354
 
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
 
                plugins.d/plymouth
357
291
        install initramfs-tools-hook \
358
292
                $(INITRAMFSTOOLS)/hooks/mandos
359
293
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
365
299
                > $(MANDIR)/man8/mandos-keygen.8.gz
366
300
        gzip --best --to-stdout plugin-runner.8mandos \
367
301
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
302
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
303
                > $(MANDIR)/man8/password-prompt.8mandos.gz
368
304
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
369
305
                > $(MANDIR)/man8/mandos-client.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
371
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
372
306
        gzip --best --to-stdout plugins.d/usplash.8mandos \
373
307
                > $(MANDIR)/man8/usplash.8mandos.gz
374
308
        gzip --best --to-stdout plugins.d/splashy.8mandos \
375
309
                > $(MANDIR)/man8/splashy.8mandos.gz
376
310
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
377
311
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
378
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
379
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
380
312
 
381
313
install-client: install-client-nokey
382
314
# Post-installation stuff
388
320
 
389
321
uninstall-server:
390
322
        -rm --force $(PREFIX)/sbin/mandos \
391
 
                $(PREFIX)/sbin/mandos-ctl \
392
 
                $(PREFIX)/sbin/mandos-monitor \
393
323
                $(MANDIR)/man8/mandos.8.gz \
394
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
395
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
396
324
                $(MANDIR)/man5/mandos.conf.5.gz \
397
325
                $(MANDIR)/man5/mandos-clients.conf.5.gz
398
326
        update-rc.d -f mandos remove
410
338
                $(PREFIX)/lib/mandos/plugins.d/usplash \
411
339
                $(PREFIX)/lib/mandos/plugins.d/splashy \
412
340
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
413
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
414
341
                $(INITRAMFSTOOLS)/hooks/mandos \
415
342
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
416
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
344
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
417
345
                $(MANDIR)/man8/mandos-keygen.8.gz \
418
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
419
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
420
346
                $(MANDIR)/man8/password-prompt.8mandos.gz \
421
347
                $(MANDIR)/man8/usplash.8mandos.gz \
422
348
                $(MANDIR)/man8/splashy.8mandos.gz \
423
349
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
424
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
350
                $(MANDIR)/man8/mandos-client.8mandos.gz
425
351
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
426
352
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
427
353
        update-initramfs -k all -u
430
356
 
431
357
purge-server: uninstall-server
432
358
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
433
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
434
359
                $(DESTDIR)/etc/default/mandos \
435
360
                $(DESTDIR)/etc/init.d/mandos \
436
361
                $(DESTDIR)/var/run/mandos.pid