/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: 2012-05-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

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.4
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
        if locale --all | grep --regexp='^en_US\.utf8$$' && type man \
 
75
        2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 man \
 
76
        --warnings --encoding=UTF-8 --local-file $(notdir $@); fi \
 
77
        >/dev/null)
69
78
# DocBook-to-man post-processing to fix a '\n' escape bug
70
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
80
 
83
92
        --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
93
 
85
94
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
95
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
96
        plugins.d/plymouth
87
97
CPROGS=plugin-runner $(PLUGINS)
88
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
89
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
98
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
99
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
100
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
90
101
        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
 
102
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
103
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
104
        plugins.d/plymouth.8mandos intro.8mandos
94
105
 
95
106
htmldocs=$(addsuffix .xhtml,$(DOCS))
96
107
 
117
128
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
118
129
        $(DOCBOOKTOHTML)
119
130
 
 
131
intro.8mandos: intro.xml common.ent legalnotice.xml
 
132
        $(DOCBOOKTOMAN)
 
133
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
134
        $(DOCBOOKTOHTML)
 
135
 
120
136
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
121
137
                legalnotice.xml
122
138
        $(DOCBOOKTOMAN)
131
147
                 legalnotice.xml
132
148
        $(DOCBOOKTOHTML)
133
149
 
 
150
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
151
                legalnotice.xml
 
152
        $(DOCBOOKTOMAN)
 
153
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
154
                 legalnotice.xml
 
155
        $(DOCBOOKTOHTML)
 
156
 
 
157
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
158
                legalnotice.xml
 
159
        $(DOCBOOKTOMAN)
 
160
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
161
                 legalnotice.xml
 
162
        $(DOCBOOKTOHTML)
 
163
 
134
164
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
135
165
                legalnotice.xml
136
166
        $(DOCBOOKTOMAN)
177
207
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
208
                $@)
179
209
 
 
210
mandos-monitor: Makefile
 
211
        $(strip $(SED) --in-place \
 
212
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
213
                $@)
 
214
 
180
215
mandos.lsm: Makefile
181
216
        $(strip $(SED) --in-place \
182
217
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
189
224
                $@)
190
225
 
191
226
plugins.d/mandos-client: plugins.d/mandos-client.c
192
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
227
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
228
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
194
229
 
195
230
.PHONY : all doc html clean distclean run-client run-server install \
196
231
        install-server install-client uninstall uninstall-server \
202
237
distclean: clean
203
238
mostlyclean: clean
204
239
maintainer-clean: clean
205
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
206
241
 
207
242
check:  all
208
243
        ./mandos --check
222
257
        @echo "###################################################################"
223
258
        ./plugin-runner --plugin-dir=plugins.d \
224
259
                --config-file=plugin-runner.conf \
225
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
260
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
226
261
                $(CLIENTARGS)
227
262
 
228
263
# Used by run-client
231
266
        ./mandos-keygen --dir keydir --force
232
267
 
233
268
# 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)
 
269
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
270
        ./mandos --debug --no-dbus --configdir=confdir \
 
271
                --statedir=statedir $(SERVERARGS)
243
272
 
244
273
# Used by run-server
245
274
confdir/mandos.conf: mandos.conf
250
279
        install --mode=u=rw $< $@
251
280
# Add a client password
252
281
        ./mandos-keygen --dir keydir --password >> $@
 
282
statedir:
 
283
        install --directory statedir
253
284
 
254
285
install: install-server install-client-nokey
255
286
 
260
291
 
261
292
install-server: doc
262
293
        install --directory $(CONFDIR)
 
294
        install --directory --mode=u=rwx --owner=$(USER) \
 
295
                --group=$(GROUP) $(STATEDIR)
263
296
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
298
                mandos-ctl
 
299
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
300
                mandos-monitor
264
301
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
265
302
                mandos.conf
266
303
        install --mode=u=rw --target-directory=$(CONFDIR) \
267
304
                clients.conf
 
305
        install --mode=u=rw,go=r dbus-mandos.conf \
 
306
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
268
307
        install --mode=u=rwx,go=rx init.d-mandos \
269
308
                $(DESTDIR)/etc/init.d/mandos
270
309
        install --mode=u=rw,go=r default-mandos \
274
313
        fi
275
314
        gzip --best --to-stdout mandos.8 \
276
315
                > $(MANDIR)/man8/mandos.8.gz
 
316
        gzip --best --to-stdout mandos-monitor.8 \
 
317
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
318
        gzip --best --to-stdout mandos-ctl.8 \
 
319
                > $(MANDIR)/man8/mandos-ctl.8.gz
277
320
        gzip --best --to-stdout mandos.conf.5 \
278
321
                > $(MANDIR)/man5/mandos.conf.5.gz
279
322
        gzip --best --to-stdout mandos-clients.conf.5 \
280
323
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
324
        gzip --best --to-stdout intro.8mandos \
 
325
                > $(MANDIR)/man8/intro.8mandos.gz
281
326
 
282
327
install-client-nokey: all doc
283
328
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
287
332
                install --mode=u=rwx \
288
333
                        --directory "$(CONFDIR)/plugins.d"; \
289
334
        fi
 
335
        install --mode=u=rwx,go=rx --directory \
 
336
                "$(CONFDIR)/network-hooks.d"
290
337
        install --mode=u=rwx,go=rx \
291
338
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
292
339
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
306
353
        install --mode=u=rwxs,go=rx \
307
354
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
308
355
                plugins.d/askpass-fifo
 
356
        install --mode=u=rwxs,go=rx \
 
357
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
358
                plugins.d/plymouth
309
359
        install initramfs-tools-hook \
310
360
                $(INITRAMFSTOOLS)/hooks/mandos
311
361
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
317
367
                > $(MANDIR)/man8/mandos-keygen.8.gz
318
368
        gzip --best --to-stdout plugin-runner.8mandos \
319
369
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
370
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
371
                > $(MANDIR)/man8/mandos-client.8mandos.gz
320
372
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
321
373
                > $(MANDIR)/man8/password-prompt.8mandos.gz
322
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
323
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
324
374
        gzip --best --to-stdout plugins.d/usplash.8mandos \
325
375
                > $(MANDIR)/man8/usplash.8mandos.gz
326
376
        gzip --best --to-stdout plugins.d/splashy.8mandos \
327
377
                > $(MANDIR)/man8/splashy.8mandos.gz
328
378
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
329
379
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
380
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
381
                > $(MANDIR)/man8/plymouth.8mandos.gz
330
382
 
331
383
install-client: install-client-nokey
332
384
# Post-installation stuff
338
390
 
339
391
uninstall-server:
340
392
        -rm --force $(PREFIX)/sbin/mandos \
 
393
                $(PREFIX)/sbin/mandos-ctl \
 
394
                $(PREFIX)/sbin/mandos-monitor \
341
395
                $(MANDIR)/man8/mandos.8.gz \
 
396
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
397
                $(MANDIR)/man8/mandos-ctl.8.gz \
342
398
                $(MANDIR)/man5/mandos.conf.5.gz \
343
399
                $(MANDIR)/man5/mandos-clients.conf.5.gz
344
400
        update-rc.d -f mandos remove
356
412
                $(PREFIX)/lib/mandos/plugins.d/usplash \
357
413
                $(PREFIX)/lib/mandos/plugins.d/splashy \
358
414
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
415
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
359
416
                $(INITRAMFSTOOLS)/hooks/mandos \
360
417
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
361
418
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
419
                $(MANDIR)/man8/mandos-keygen.8.gz \
362
420
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
363
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
421
                $(MANDIR)/man8/mandos-client.8mandos.gz
364
422
                $(MANDIR)/man8/password-prompt.8mandos.gz \
365
423
                $(MANDIR)/man8/usplash.8mandos.gz \
366
424
                $(MANDIR)/man8/splashy.8mandos.gz \
367
425
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
368
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
426
                $(MANDIR)/man8/plymouth.8mandos.gz \
369
427
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
370
428
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
371
429
        update-initramfs -k all -u
374
432
 
375
433
purge-server: uninstall-server
376
434
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
435
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
377
436
                $(DESTDIR)/etc/default/mandos \
378
437
                $(DESTDIR)/etc/init.d/mandos \
379
438
                $(DESTDIR)/var/run/mandos.pid