/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: 2010-09-26 17:36:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7
* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
87
87
        plugins.d/plymouth
88
88
CPROGS=plugin-runner $(PLUGINS)
89
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 mandos-ctl.8 \
 
90
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
91
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
92
        plugins.d/mandos-client.8mandos \
93
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
95
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
95
        plugins.d/plymouth.8mandos
96
96
 
97
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
98
 
300
300
        fi
301
301
        gzip --best --to-stdout mandos.8 \
302
302
                > $(MANDIR)/man8/mandos.8.gz
 
303
        gzip --best --to-stdout mandos-monitor.8 \
 
304
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
305
        gzip --best --to-stdout mandos-ctl.8 \
 
306
                > $(MANDIR)/man8/mandos-ctl.8.gz
303
307
        gzip --best --to-stdout mandos.conf.5 \
304
308
                > $(MANDIR)/man5/mandos.conf.5.gz
305
309
        gzip --best --to-stdout mandos-clients.conf.5 \
346
350
                > $(MANDIR)/man8/mandos-keygen.8.gz
347
351
        gzip --best --to-stdout plugin-runner.8mandos \
348
352
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
353
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
354
                > $(MANDIR)/man8/mandos-client.8mandos.gz
349
355
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
350
356
                > $(MANDIR)/man8/password-prompt.8mandos.gz
351
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
352
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
353
357
        gzip --best --to-stdout plugins.d/usplash.8mandos \
354
358
                > $(MANDIR)/man8/usplash.8mandos.gz
355
359
        gzip --best --to-stdout plugins.d/splashy.8mandos \
356
360
                > $(MANDIR)/man8/splashy.8mandos.gz
357
361
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
358
362
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
363
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
364
                > $(MANDIR)/man8/plymouth.8mandos.gz
359
365
 
360
366
install-client: install-client-nokey
361
367
# Post-installation stuff
370
376
                $(PREFIX)/sbin/mandos-ctl \
371
377
                $(PREFIX)/sbin/mandos-monitor \
372
378
                $(MANDIR)/man8/mandos.8.gz \
 
379
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
380
                $(MANDIR)/man8/mandos-ctl.8.gz \
373
381
                $(MANDIR)/man5/mandos.conf.5.gz \
374
382
                $(MANDIR)/man5/mandos-clients.conf.5.gz
375
383
        update-rc.d -f mandos remove
391
399
                $(INITRAMFSTOOLS)/hooks/mandos \
392
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
393
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
402
                $(MANDIR)/man8/mandos-keygen.8.gz \
394
403
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
395
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
404
                $(MANDIR)/man8/mandos-client.8mandos.gz
396
405
                $(MANDIR)/man8/password-prompt.8mandos.gz \
397
406
                $(MANDIR)/man8/usplash.8mandos.gz \
398
407
                $(MANDIR)/man8/splashy.8mandos.gz \
399
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
400
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
401
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
402
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
403
412
        update-initramfs -k all -u