/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: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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.4.1
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
 
87
94
        plugins.d/plymouth
88
95
CPROGS=plugin-runner $(PLUGINS)
89
96
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 \
 
97
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
98
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
99
        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
 
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
96
103
 
97
104
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
105
 
119
126
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
127
        $(DOCBOOKTOHTML)
121
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
 
122
134
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
135
                legalnotice.xml
124
136
        $(DOCBOOKTOMAN)
140
152
                 legalnotice.xml
141
153
        $(DOCBOOKTOHTML)
142
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
 
143
162
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
163
                legalnotice.xml
145
164
        $(DOCBOOKTOMAN)
203
222
                $@)
204
223
 
205
224
plugins.d/mandos-client: plugins.d/mandos-client.c
206
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
225
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
226
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
208
227
 
209
228
.PHONY : all doc html clean distclean run-client run-server install \
210
229
        install-server install-client uninstall uninstall-server \
216
235
distclean: clean
217
236
mostlyclean: clean
218
237
maintainer-clean: clean
219
 
        -rm --force --recursive keydir confdir
 
238
        -rm --force --recursive keydir confdir statedir
220
239
 
221
240
check:  all
222
241
        ./mandos --check
246
265
 
247
266
# Run the server with a local config
248
267
run-server: confdir/mandos.conf confdir/clients.conf
249
 
        @echo "#################################################################"
250
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
254
 
        @echo "#################################################################"
255
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
268
        ./mandos --debug --no-dbus --configdir=confdir \
 
269
                --statedir=statedir $(SERVERARGS)
256
270
 
257
271
# Used by run-server
258
272
confdir/mandos.conf: mandos.conf
263
277
        install --mode=u=rw $< $@
264
278
# Add a client password
265
279
        ./mandos-keygen --dir keydir --password >> $@
 
280
statedir:
 
281
        install --directory statedir
266
282
 
267
283
install: install-server install-client-nokey
268
284
 
273
289
 
274
290
install-server: doc
275
291
        install --directory $(CONFDIR)
 
292
        install --directory --mode=u=rwx --owner=$(USER) \
 
293
                --group=$(GROUP) $(STATEDIR)
276
294
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
295
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
296
                mandos-ctl
293
311
        fi
294
312
        gzip --best --to-stdout mandos.8 \
295
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
296
318
        gzip --best --to-stdout mandos.conf.5 \
297
319
                > $(MANDIR)/man5/mandos.conf.5.gz
298
320
        gzip --best --to-stdout mandos-clients.conf.5 \
339
361
                > $(MANDIR)/man8/mandos-keygen.8.gz
340
362
        gzip --best --to-stdout plugin-runner.8mandos \
341
363
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
364
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
365
                > $(MANDIR)/man8/mandos-client.8mandos.gz
342
366
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
343
367
                > $(MANDIR)/man8/password-prompt.8mandos.gz
344
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
345
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
346
368
        gzip --best --to-stdout plugins.d/usplash.8mandos \
347
369
                > $(MANDIR)/man8/usplash.8mandos.gz
348
370
        gzip --best --to-stdout plugins.d/splashy.8mandos \
349
371
                > $(MANDIR)/man8/splashy.8mandos.gz
350
372
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
351
373
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
374
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
375
                > $(MANDIR)/man8/plymouth.8mandos.gz
352
376
 
353
377
install-client: install-client-nokey
354
378
# Post-installation stuff
363
387
                $(PREFIX)/sbin/mandos-ctl \
364
388
                $(PREFIX)/sbin/mandos-monitor \
365
389
                $(MANDIR)/man8/mandos.8.gz \
 
390
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
391
                $(MANDIR)/man8/mandos-ctl.8.gz \
366
392
                $(MANDIR)/man5/mandos.conf.5.gz \
367
393
                $(MANDIR)/man5/mandos-clients.conf.5.gz
368
394
        update-rc.d -f mandos remove
384
410
                $(INITRAMFSTOOLS)/hooks/mandos \
385
411
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
386
412
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
413
                $(MANDIR)/man8/mandos-keygen.8.gz \
387
414
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
388
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
415
                $(MANDIR)/man8/mandos-client.8mandos.gz
389
416
                $(MANDIR)/man8/password-prompt.8mandos.gz \
390
417
                $(MANDIR)/man8/usplash.8mandos.gz \
391
418
                $(MANDIR)/man8/splashy.8mandos.gz \
392
419
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
393
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
420
                $(MANDIR)/man8/plymouth.8mandos.gz \
394
421
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
395
422
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
396
423
        update-initramfs -k all -u