/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: 2013-10-27 17:42:23 UTC
  • 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
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
14
LINK_FORTIFY_LD=-z relro -z now
14
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
15
18
ifndef BROKEN_PIE
16
19
FORTIFY += -fPIE
17
 
LINK_FORTIFY_LD += -fPIE
18
20
LINK_FORTIFY += -pie
19
21
endif
20
22
#COVERAGE=--coverage
21
23
OPTIMIZE=-Os
22
24
LANGUAGE=-std=gnu99
23
25
htmldir=man
24
 
version=1.0.13
 
26
version=1.6.2
25
27
SED=sed
26
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
 
27
32
## Use these settings for a traditional /usr/local install
28
33
# PREFIX=$(DESTDIR)/usr/local
29
34
# CONFDIR=$(DESTDIR)/etc/mandos
30
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
31
36
# MANDIR=$(PREFIX)/man
32
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
33
39
##
34
40
 
35
41
## These settings are for a package-type install
38
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
39
45
MANDIR=$(PREFIX)/share/man
40
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
41
48
##
42
49
 
 
50
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
51
 
43
52
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
44
53
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
45
54
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
49
58
        getconf LFS_LDFLAGS)
50
59
 
51
60
# Do not change these two
52
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
61
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
53
62
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
54
63
        -DVERSION='"$(version)"'
55
 
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))
56
65
 
57
66
# Commands to format a DocBook <refentry> document into a manual page
58
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
67
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
59
68
        --param man.charmap.use.subset          0 \
60
69
        --param make.year.ranges                1 \
61
70
        --param make.single.year.ranges         1 \
62
71
        --param man.output.quietly              1 \
63
72
        --param man.authors.section.enabled     0 \
64
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
73
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
65
74
        $(notdir $<); \
66
 
        $(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)
67
80
# DocBook-to-man post-processing to fix a '\n' escape bug
68
81
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
69
82
 
70
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
83
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
71
84
        --param make.year.ranges                1 \
72
85
        --param make.single.year.ranges         1 \
73
86
        --param man.output.quietly              1 \
75
88
        --param citerefentry.link               1 \
76
89
        --output $@ \
77
90
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
78
 
        $<; $(HTMLPOST) $@
 
91
        $<; $(HTMLPOST) $@)
79
92
# Fix citerefentry links
80
93
HTMLPOST=$(SED) --in-place \
81
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'
82
95
 
83
96
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
 
        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
85
99
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
87
 
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 \
88
103
        plugins.d/mandos-client.8mandos \
89
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
90
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
91
 
        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
92
107
 
93
108
htmldocs=$(addsuffix .xhtml,$(DOCS))
94
109
 
115
130
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
116
131
        $(DOCBOOKTOHTML)
117
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
 
118
138
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
119
139
                legalnotice.xml
120
140
        $(DOCBOOKTOMAN)
129
149
                 legalnotice.xml
130
150
        $(DOCBOOKTOHTML)
131
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
 
132
166
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
133
167
                legalnotice.xml
134
168
        $(DOCBOOKTOMAN)
156
190
 
157
191
# Update all these files with version number $(version)
158
192
common.ent: Makefile
159
 
        $(SED) --in-place \
 
193
        $(strip $(SED) --in-place \
160
194
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
195
                $@)
162
196
 
163
197
mandos: Makefile
164
 
        $(SED) --in-place \
 
198
        $(strip $(SED) --in-place \
165
199
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
200
                $@)
167
201
 
168
202
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
203
        $(strip $(SED) --in-place \
170
204
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
205
                $@)
172
206
 
173
207
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
208
        $(strip $(SED) --in-place \
 
209
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
210
                $@)
 
211
 
 
212
mandos-monitor: Makefile
 
213
        $(strip $(SED) --in-place \
 
214
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
215
                $@)
177
216
 
178
217
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
218
        $(strip $(SED) --in-place \
180
219
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
220
                $@)
 
221
        $(strip $(SED) --in-place \
183
222
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
223
                $@)
 
224
        $(strip $(SED) --in-place \
186
225
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
226
                $@)
188
227
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
228
plugins.d/mandos-client: plugins.d/mandos-client.c
 
229
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
230
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
192
231
 
193
232
.PHONY : all doc html clean distclean run-client run-server install \
194
233
        install-server install-client uninstall uninstall-server \
200
239
distclean: clean
201
240
mostlyclean: clean
202
241
maintainer-clean: clean
203
 
        -rm --force --recursive keydir confdir
 
242
        -rm --force --recursive keydir confdir statedir
204
243
 
205
244
check:  all
206
245
        ./mandos --check
 
246
        ./mandos-ctl --check
207
247
 
208
248
# Run the client with a local config and key
209
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 "###################################################################"
210
261
        ./plugin-runner --plugin-dir=plugins.d \
211
262
                --config-file=plugin-runner.conf \
212
 
                --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 \
213
264
                $(CLIENTARGS)
214
265
 
215
266
# Used by run-client
218
269
        ./mandos-keygen --dir keydir --force
219
270
 
220
271
# Run the server with a local config
221
 
run-server: confdir/mandos.conf confdir/clients.conf
222
 
        ./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)
223
275
 
224
276
# Used by run-server
225
277
confdir/mandos.conf: mandos.conf
230
282
        install --mode=u=rw $< $@
231
283
# Add a client password
232
284
        ./mandos-keygen --dir keydir --password >> $@
 
285
statedir:
 
286
        install --directory statedir
233
287
 
234
288
install: install-server install-client-nokey
235
289
 
240
294
 
241
295
install-server: doc
242
296
        install --directory $(CONFDIR)
 
297
        install --directory --mode=u=rwx --owner=$(USER) \
 
298
                --group=$(GROUP) $(STATEDIR)
243
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
244
304
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
245
305
                mandos.conf
246
306
        install --mode=u=rw --target-directory=$(CONFDIR) \
247
307
                clients.conf
 
308
        install --mode=u=rw,go=r dbus-mandos.conf \
 
309
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
248
310
        install --mode=u=rwx,go=rx init.d-mandos \
249
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
250
315
        install --mode=u=rw,go=r default-mandos \
251
316
                $(DESTDIR)/etc/default/mandos
252
317
        if [ -z $(DESTDIR) ]; then \
254
319
        fi
255
320
        gzip --best --to-stdout mandos.8 \
256
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
257
326
        gzip --best --to-stdout mandos.conf.5 \
258
327
                > $(MANDIR)/man5/mandos.conf.5.gz
259
328
        gzip --best --to-stdout mandos-clients.conf.5 \
260
329
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
330
        gzip --best --to-stdout intro.8mandos \
 
331
                > $(MANDIR)/man8/intro.8mandos.gz
261
332
 
262
333
install-client-nokey: all doc
263
334
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
267
338
                install --mode=u=rwx \
268
339
                        --directory "$(CONFDIR)/plugins.d"; \
269
340
        fi
 
341
        install --mode=u=rwx,go=rx --directory \
 
342
                "$(CONFDIR)/network-hooks.d"
270
343
        install --mode=u=rwx,go=rx \
271
344
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
272
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
286
359
        install --mode=u=rwxs,go=rx \
287
360
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
288
361
                plugins.d/askpass-fifo
 
362
        install --mode=u=rwxs,go=rx \
 
363
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                plugins.d/plymouth
289
365
        install initramfs-tools-hook \
290
366
                $(INITRAMFSTOOLS)/hooks/mandos
291
367
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
297
373
                > $(MANDIR)/man8/mandos-keygen.8.gz
298
374
        gzip --best --to-stdout plugin-runner.8mandos \
299
375
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
376
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
377
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
378
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
301
379
                > $(MANDIR)/man8/password-prompt.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
303
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
304
380
        gzip --best --to-stdout plugins.d/usplash.8mandos \
305
381
                > $(MANDIR)/man8/usplash.8mandos.gz
306
382
        gzip --best --to-stdout plugins.d/splashy.8mandos \
307
383
                > $(MANDIR)/man8/splashy.8mandos.gz
308
384
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
309
385
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
386
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
387
                > $(MANDIR)/man8/plymouth.8mandos.gz
310
388
 
311
389
install-client: install-client-nokey
312
390
# Post-installation stuff
318
396
 
319
397
uninstall-server:
320
398
        -rm --force $(PREFIX)/sbin/mandos \
 
399
                $(PREFIX)/sbin/mandos-ctl \
 
400
                $(PREFIX)/sbin/mandos-monitor \
321
401
                $(MANDIR)/man8/mandos.8.gz \
 
402
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
403
                $(MANDIR)/man8/mandos-ctl.8.gz \
322
404
                $(MANDIR)/man5/mandos.conf.5.gz \
323
405
                $(MANDIR)/man5/mandos-clients.conf.5.gz
324
406
        update-rc.d -f mandos remove
336
418
                $(PREFIX)/lib/mandos/plugins.d/usplash \
337
419
                $(PREFIX)/lib/mandos/plugins.d/splashy \
338
420
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
421
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
339
422
                $(INITRAMFSTOOLS)/hooks/mandos \
340
423
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
424
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
425
                $(MANDIR)/man8/mandos-keygen.8.gz \
342
426
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
427
                $(MANDIR)/man8/mandos-client.8mandos.gz
344
428
                $(MANDIR)/man8/password-prompt.8mandos.gz \
345
429
                $(MANDIR)/man8/usplash.8mandos.gz \
346
430
                $(MANDIR)/man8/splashy.8mandos.gz \
347
431
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
348
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
432
                $(MANDIR)/man8/plymouth.8mandos.gz \
349
433
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
350
434
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
351
435
        update-initramfs -k all -u
354
438
 
355
439
purge-server: uninstall-server
356
440
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
441
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
357
442
                $(DESTDIR)/etc/default/mandos \
358
443
                $(DESTDIR)/etc/init.d/mandos \
 
444
                $(SYSTEMD)/mandos.service \
 
445
                $(DESTDIR)/run/mandos.pid \
359
446
                $(DESTDIR)/var/run/mandos.pid
360
447
        -rmdir $(CONFDIR)
361
448