/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 (Client.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

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