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