/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

  • Committer: Teddy Hogeborn
  • Date: 2013-10-27 17:42:23 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131027174223-mq3a1h8xi5jcv9e6
Bug fix: Make sure systemd service file is installed.

* Makefile (install-server): Fix typo causing syntax error.
* debian/mandos.dirs (lib/systemd/system): New.

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>
17
17
# If BROKEN_PIE is set, do not build with -pie
18
18
ifndef BROKEN_PIE
19
19
FORTIFY += -fPIE
20
 
LINK_FORTIFY_LD += -fPIE
21
20
LINK_FORTIFY += -pie
22
21
endif
23
22
#COVERAGE=--coverage
24
23
OPTIMIZE=-Os
25
24
LANGUAGE=-std=gnu99
26
25
htmldir=man
27
 
version=1.0.14
 
26
version=1.6.2
28
27
SED=sed
29
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
 
30
32
## Use these settings for a traditional /usr/local install
31
33
# PREFIX=$(DESTDIR)/usr/local
32
34
# CONFDIR=$(DESTDIR)/etc/mandos
33
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
34
36
# MANDIR=$(PREFIX)/man
35
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
36
39
##
37
40
 
38
41
## These settings are for a package-type install
41
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
42
45
MANDIR=$(PREFIX)/share/man
43
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
44
48
##
45
49
 
 
50
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
51
 
46
52
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
47
53
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
48
54
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
52
58
        getconf LFS_LDFLAGS)
53
59
 
54
60
# Do not change these two
55
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
61
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
62
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
57
63
        -DVERSION='"$(version)"'
58
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
64
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
59
65
 
60
66
# Commands to format a DocBook <refentry> document into a manual page
61
67
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
64
70
        --param make.single.year.ranges         1 \
65
71
        --param man.output.quietly              1 \
66
72
        --param man.authors.section.enabled     0 \
67
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
73
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
74
        $(notdir $<); \
69
 
        $(MANPOST) $(notdir $@))
 
75
        $(MANPOST) $(notdir $@);\
 
76
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
77
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
78
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
79
        fi >/dev/null)
70
80
# DocBook-to-man post-processing to fix a '\n' escape bug
71
81
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
72
82
 
84
94
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
85
95
 
86
96
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
97
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
98
        plugins.d/plymouth
88
99
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
100
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
101
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
102
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
91
103
        plugins.d/mandos-client.8mandos \
92
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
104
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
105
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
106
        plugins.d/plymouth.8mandos intro.8mandos
95
107
 
96
108
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
109
 
118
130
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
119
131
        $(DOCBOOKTOHTML)
120
132
 
 
133
intro.8mandos: intro.xml common.ent legalnotice.xml
 
134
        $(DOCBOOKTOMAN)
 
135
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
136
        $(DOCBOOKTOHTML)
 
137
 
121
138
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
122
139
                legalnotice.xml
123
140
        $(DOCBOOKTOMAN)
132
149
                 legalnotice.xml
133
150
        $(DOCBOOKTOHTML)
134
151
 
 
152
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
153
                legalnotice.xml
 
154
        $(DOCBOOKTOMAN)
 
155
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
156
                 legalnotice.xml
 
157
        $(DOCBOOKTOHTML)
 
158
 
 
159
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
160
                legalnotice.xml
 
161
        $(DOCBOOKTOMAN)
 
162
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
163
                 legalnotice.xml
 
164
        $(DOCBOOKTOHTML)
 
165
 
135
166
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
136
167
                legalnotice.xml
137
168
        $(DOCBOOKTOMAN)
178
209
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
210
                $@)
180
211
 
 
212
mandos-monitor: Makefile
 
213
        $(strip $(SED) --in-place \
 
214
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
215
                $@)
 
216
 
181
217
mandos.lsm: Makefile
182
218
        $(strip $(SED) --in-place \
183
219
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
190
226
                $@)
191
227
 
192
228
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
229
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
230
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
195
231
 
196
232
.PHONY : all doc html clean distclean run-client run-server install \
197
233
        install-server install-client uninstall uninstall-server \
203
239
distclean: clean
204
240
mostlyclean: clean
205
241
maintainer-clean: clean
206
 
        -rm --force --recursive keydir confdir
 
242
        -rm --force --recursive keydir confdir statedir
207
243
 
208
244
check:  all
209
245
        ./mandos --check
 
246
        ./mandos-ctl --check
210
247
 
211
248
# Run the client with a local config and key
212
249
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
250
        @echo "###################################################################"
 
251
        @echo "# The following error messages are harmless and can be safely     #"
 
252
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
253
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
254
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
255
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
256
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
257
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
258
        @echo "#                     seteuid: Operation not permitted            #"
 
259
        @echo "#                     klogctl: Operation not permitted            #"
 
260
        @echo "###################################################################"
213
261
        ./plugin-runner --plugin-dir=plugins.d \
214
262
                --config-file=plugin-runner.conf \
215
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
263
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
216
264
                $(CLIENTARGS)
217
265
 
218
266
# Used by run-client
221
269
        ./mandos-keygen --dir keydir --force
222
270
 
223
271
# Run the server with a local config
224
 
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
272
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
273
        ./mandos --debug --no-dbus --configdir=confdir \
 
274
                --statedir=statedir $(SERVERARGS)
226
275
 
227
276
# Used by run-server
228
277
confdir/mandos.conf: mandos.conf
233
282
        install --mode=u=rw $< $@
234
283
# Add a client password
235
284
        ./mandos-keygen --dir keydir --password >> $@
 
285
statedir:
 
286
        install --directory statedir
236
287
 
237
288
install: install-server install-client-nokey
238
289
 
243
294
 
244
295
install-server: doc
245
296
        install --directory $(CONFDIR)
 
297
        install --directory --mode=u=rwx --owner=$(USER) \
 
298
                --group=$(GROUP) $(STATEDIR)
246
299
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
300
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
301
                mandos-ctl
 
302
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
303
                mandos-monitor
247
304
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
248
305
                mandos.conf
249
306
        install --mode=u=rw --target-directory=$(CONFDIR) \
250
307
                clients.conf
 
308
        install --mode=u=rw,go=r dbus-mandos.conf \
 
309
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
251
310
        install --mode=u=rwx,go=rx init.d-mandos \
252
311
                $(DESTDIR)/etc/init.d/mandos
 
312
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
313
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
314
        fi
253
315
        install --mode=u=rw,go=r default-mandos \
254
316
                $(DESTDIR)/etc/default/mandos
255
317
        if [ -z $(DESTDIR) ]; then \
257
319
        fi
258
320
        gzip --best --to-stdout mandos.8 \
259
321
                > $(MANDIR)/man8/mandos.8.gz
 
322
        gzip --best --to-stdout mandos-monitor.8 \
 
323
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
324
        gzip --best --to-stdout mandos-ctl.8 \
 
325
                > $(MANDIR)/man8/mandos-ctl.8.gz
260
326
        gzip --best --to-stdout mandos.conf.5 \
261
327
                > $(MANDIR)/man5/mandos.conf.5.gz
262
328
        gzip --best --to-stdout mandos-clients.conf.5 \
263
329
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
330
        gzip --best --to-stdout intro.8mandos \
 
331
                > $(MANDIR)/man8/intro.8mandos.gz
264
332
 
265
333
install-client-nokey: all doc
266
334
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
270
338
                install --mode=u=rwx \
271
339
                        --directory "$(CONFDIR)/plugins.d"; \
272
340
        fi
 
341
        install --mode=u=rwx,go=rx --directory \
 
342
                "$(CONFDIR)/network-hooks.d"
273
343
        install --mode=u=rwx,go=rx \
274
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
275
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
289
359
        install --mode=u=rwxs,go=rx \
290
360
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
291
361
                plugins.d/askpass-fifo
 
362
        install --mode=u=rwxs,go=rx \
 
363
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                plugins.d/plymouth
292
365
        install initramfs-tools-hook \
293
366
                $(INITRAMFSTOOLS)/hooks/mandos
294
367
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
300
373
                > $(MANDIR)/man8/mandos-keygen.8.gz
301
374
        gzip --best --to-stdout plugin-runner.8mandos \
302
375
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
376
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
377
                > $(MANDIR)/man8/mandos-client.8mandos.gz
303
378
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
304
379
                > $(MANDIR)/man8/password-prompt.8mandos.gz
305
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
306
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
307
380
        gzip --best --to-stdout plugins.d/usplash.8mandos \
308
381
                > $(MANDIR)/man8/usplash.8mandos.gz
309
382
        gzip --best --to-stdout plugins.d/splashy.8mandos \
310
383
                > $(MANDIR)/man8/splashy.8mandos.gz
311
384
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
312
385
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
386
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
387
                > $(MANDIR)/man8/plymouth.8mandos.gz
313
388
 
314
389
install-client: install-client-nokey
315
390
# Post-installation stuff
321
396
 
322
397
uninstall-server:
323
398
        -rm --force $(PREFIX)/sbin/mandos \
 
399
                $(PREFIX)/sbin/mandos-ctl \
 
400
                $(PREFIX)/sbin/mandos-monitor \
324
401
                $(MANDIR)/man8/mandos.8.gz \
 
402
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
403
                $(MANDIR)/man8/mandos-ctl.8.gz \
325
404
                $(MANDIR)/man5/mandos.conf.5.gz \
326
405
                $(MANDIR)/man5/mandos-clients.conf.5.gz
327
406
        update-rc.d -f mandos remove
339
418
                $(PREFIX)/lib/mandos/plugins.d/usplash \
340
419
                $(PREFIX)/lib/mandos/plugins.d/splashy \
341
420
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
421
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
342
422
                $(INITRAMFSTOOLS)/hooks/mandos \
343
423
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
424
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
425
                $(MANDIR)/man8/mandos-keygen.8.gz \
345
426
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
427
                $(MANDIR)/man8/mandos-client.8mandos.gz
347
428
                $(MANDIR)/man8/password-prompt.8mandos.gz \
348
429
                $(MANDIR)/man8/usplash.8mandos.gz \
349
430
                $(MANDIR)/man8/splashy.8mandos.gz \
350
431
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
351
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
432
                $(MANDIR)/man8/plymouth.8mandos.gz \
352
433
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
353
434
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
354
435
        update-initramfs -k all -u
357
438
 
358
439
purge-server: uninstall-server
359
440
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
441
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
360
442
                $(DESTDIR)/etc/default/mandos \
361
443
                $(DESTDIR)/etc/init.d/mandos \
 
444
                $(SYSTEMD)/mandos.service \
 
445
                $(DESTDIR)/run/mandos.pid \
362
446
                $(DESTDIR)/var/run/mandos.pid
363
447
        -rmdir $(CONFDIR)
364
448