/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

Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

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.4.1
 
26
version=1.0.14
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
54
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
56
        -DVERSION='"$(version)"'
57
 
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))
58
58
 
59
59
# Commands to format a DocBook <refentry> document into a manual page
60
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
65
65
        --param man.authors.section.enabled     0 \
66
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
67
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
71
69
# DocBook-to-man post-processing to fix a '\n' escape bug
72
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
71
 
85
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'
86
84
 
87
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
90
87
CPROGS=plugin-runner $(PLUGINS)
91
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
 
        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 \
94
90
        plugins.d/mandos-client.8mandos \
95
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        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
98
94
 
99
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
96
 
121
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
118
        $(DOCBOOKTOHTML)
123
119
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
121
                legalnotice.xml
131
122
        $(DOCBOOKTOMAN)
140
131
                 legalnotice.xml
141
132
        $(DOCBOOKTOHTML)
142
133
 
143
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
144
 
                legalnotice.xml
145
 
        $(DOCBOOKTOMAN)
146
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
147
 
                 legalnotice.xml
148
 
        $(DOCBOOKTOHTML)
149
 
 
150
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
158
135
                legalnotice.xml
159
136
        $(DOCBOOKTOMAN)
200
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
201
178
                $@)
202
179
 
203
 
mandos-monitor: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
206
 
                $@)
207
 
 
208
180
mandos.lsm: Makefile
209
181
        $(strip $(SED) --in-place \
210
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
217
189
                $@)
218
190
 
219
191
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
222
194
 
223
195
.PHONY : all doc html clean distclean run-client run-server install \
224
196
        install-server install-client uninstall uninstall-server \
250
222
        @echo "###################################################################"
251
223
        ./plugin-runner --plugin-dir=plugins.d \
252
224
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
225
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
254
226
                $(CLIENTARGS)
255
227
 
256
228
# Used by run-client
261
233
# Run the server with a local config
262
234
run-server: confdir/mandos.conf confdir/clients.conf
263
235
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
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.                       #"
268
241
        @echo "#################################################################"
269
242
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
270
243
 
288
261
install-server: doc
289
262
        install --directory $(CONFDIR)
290
263
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
 
                mandos-ctl
293
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
294
 
                mandos-monitor
295
264
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
296
265
                mandos.conf
297
266
        install --mode=u=rw --target-directory=$(CONFDIR) \
298
267
                clients.conf
299
 
        install --mode=u=rw,go=r dbus-mandos.conf \
300
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
301
268
        install --mode=u=rwx,go=rx init.d-mandos \
302
269
                $(DESTDIR)/etc/init.d/mandos
303
270
        install --mode=u=rw,go=r default-mandos \
307
274
        fi
308
275
        gzip --best --to-stdout mandos.8 \
309
276
                > $(MANDIR)/man8/mandos.8.gz
310
 
        gzip --best --to-stdout mandos-monitor.8 \
311
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
312
 
        gzip --best --to-stdout mandos-ctl.8 \
313
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
314
277
        gzip --best --to-stdout mandos.conf.5 \
315
278
                > $(MANDIR)/man5/mandos.conf.5.gz
316
279
        gzip --best --to-stdout mandos-clients.conf.5 \
343
306
        install --mode=u=rwxs,go=rx \
344
307
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
345
308
                plugins.d/askpass-fifo
346
 
        install --mode=u=rwxs,go=rx \
347
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
348
 
                plugins.d/plymouth
349
309
        install initramfs-tools-hook \
350
310
                $(INITRAMFSTOOLS)/hooks/mandos
351
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
357
317
                > $(MANDIR)/man8/mandos-keygen.8.gz
358
318
        gzip --best --to-stdout plugin-runner.8mandos \
359
319
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
320
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
321
                > $(MANDIR)/man8/password-prompt.8mandos.gz
360
322
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
361
323
                > $(MANDIR)/man8/mandos-client.8mandos.gz
362
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
363
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
364
324
        gzip --best --to-stdout plugins.d/usplash.8mandos \
365
325
                > $(MANDIR)/man8/usplash.8mandos.gz
366
326
        gzip --best --to-stdout plugins.d/splashy.8mandos \
367
327
                > $(MANDIR)/man8/splashy.8mandos.gz
368
328
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
369
329
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
370
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
371
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
372
330
 
373
331
install-client: install-client-nokey
374
332
# Post-installation stuff
380
338
 
381
339
uninstall-server:
382
340
        -rm --force $(PREFIX)/sbin/mandos \
383
 
                $(PREFIX)/sbin/mandos-ctl \
384
 
                $(PREFIX)/sbin/mandos-monitor \
385
341
                $(MANDIR)/man8/mandos.8.gz \
386
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
387
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
388
342
                $(MANDIR)/man5/mandos.conf.5.gz \
389
343
                $(MANDIR)/man5/mandos-clients.conf.5.gz
390
344
        update-rc.d -f mandos remove
402
356
                $(PREFIX)/lib/mandos/plugins.d/usplash \
403
357
                $(PREFIX)/lib/mandos/plugins.d/splashy \
404
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
405
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
406
359
                $(INITRAMFSTOOLS)/hooks/mandos \
407
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
408
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
362
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
363
                $(MANDIR)/man8/mandos-keygen.8.gz \
410
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
411
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
412
364
                $(MANDIR)/man8/password-prompt.8mandos.gz \
413
365
                $(MANDIR)/man8/usplash.8mandos.gz \
414
366
                $(MANDIR)/man8/splashy.8mandos.gz \
415
367
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
416
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
368
                $(MANDIR)/man8/mandos-client.8mandos.gz
417
369
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
418
370
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
419
371
        update-initramfs -k all -u
422
374
 
423
375
purge-server: uninstall-server
424
376
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
425
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
426
377
                $(DESTDIR)/etc/default/mandos \
427
378
                $(DESTDIR)/etc/init.d/mandos \
428
379
                $(DESTDIR)/var/run/mandos.pid