/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-06-23 00:58:49 UTC
  • Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
          duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
  (EXAMPLE): Update to new interval format.
  (SEE ALSO): Reference RFC 3339.

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.14
 
26
version=1.6.0
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
 
43
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
52
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
53
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
54
61
        -DVERSION='"$(version)"'
55
 
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))
56
63
 
57
64
# Commands to format a DocBook <refentry> document into a manual page
58
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
59
66
        --param man.charmap.use.subset          0 \
60
67
        --param make.year.ranges                1 \
61
68
        --param make.single.year.ranges         1 \
62
69
        --param man.output.quietly              1 \
63
70
        --param man.authors.section.enabled     0 \
64
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
65
72
        $(notdir $<); \
66
 
        $(MANPOST) $(notdir $@)
 
73
        $(MANPOST) $(notdir $@);\
 
74
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
75
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
76
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
77
        fi >/dev/null)
67
78
# DocBook-to-man post-processing to fix a '\n' escape bug
68
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
69
80
 
70
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
81
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
71
82
        --param make.year.ranges                1 \
72
83
        --param make.single.year.ranges         1 \
73
84
        --param man.output.quietly              1 \
75
86
        --param citerefentry.link               1 \
76
87
        --output $@ \
77
88
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
78
 
        $<; $(HTMLPOST) $@
 
89
        $<; $(HTMLPOST) $@)
79
90
# Fix citerefentry links
80
91
HTMLPOST=$(SED) --in-place \
81
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'
82
93
 
83
94
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
84
 
        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
85
97
CPROGS=plugin-runner $(PLUGINS)
86
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
87
 
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 \
88
101
        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
 
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
92
105
 
93
106
htmldocs=$(addsuffix .xhtml,$(DOCS))
94
107
 
115
128
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
116
129
        $(DOCBOOKTOHTML)
117
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
 
118
136
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
119
137
                legalnotice.xml
120
138
        $(DOCBOOKTOMAN)
129
147
                 legalnotice.xml
130
148
        $(DOCBOOKTOHTML)
131
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
 
132
164
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
133
165
                legalnotice.xml
134
166
        $(DOCBOOKTOMAN)
156
188
 
157
189
# Update all these files with version number $(version)
158
190
common.ent: Makefile
159
 
        $(SED) --in-place \
 
191
        $(strip $(SED) --in-place \
160
192
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
193
                $@)
162
194
 
163
195
mandos: Makefile
164
 
        $(SED) --in-place \
 
196
        $(strip $(SED) --in-place \
165
197
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
198
                $@)
167
199
 
168
200
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
201
        $(strip $(SED) --in-place \
170
202
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
203
                $@)
172
204
 
173
205
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
206
        $(strip $(SED) --in-place \
 
207
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
208
                $@)
 
209
 
 
210
mandos-monitor: Makefile
 
211
        $(strip $(SED) --in-place \
 
212
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
213
                $@)
177
214
 
178
215
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
216
        $(strip $(SED) --in-place \
180
217
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
218
                $@)
 
219
        $(strip $(SED) --in-place \
183
220
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
221
                $@)
 
222
        $(strip $(SED) --in-place \
186
223
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
224
                $@)
188
225
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
226
plugins.d/mandos-client: plugins.d/mandos-client.c
 
227
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
228
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
192
229
 
193
230
.PHONY : all doc html clean distclean run-client run-server install \
194
231
        install-server install-client uninstall uninstall-server \
200
237
distclean: clean
201
238
mostlyclean: clean
202
239
maintainer-clean: clean
203
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
204
241
 
205
242
check:  all
206
243
        ./mandos --check
 
244
        ./mandos-ctl --check
207
245
 
208
246
# Run the client with a local config and key
209
247
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
248
        @echo "###################################################################"
 
249
        @echo "# The following error messages are harmless and can be safely     #"
 
250
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
251
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
252
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
253
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
254
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
255
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
256
        @echo "#                     seteuid: Operation not permitted            #"
 
257
        @echo "#                     klogctl: Operation not permitted            #"
 
258
        @echo "###################################################################"
210
259
        ./plugin-runner --plugin-dir=plugins.d \
211
260
                --config-file=plugin-runner.conf \
212
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
261
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
213
262
                $(CLIENTARGS)
214
263
 
215
264
# Used by run-client
218
267
        ./mandos-keygen --dir keydir --force
219
268
 
220
269
# Run the server with a local config
221
 
run-server: confdir/mandos.conf confdir/clients.conf
222
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
271
        ./mandos --debug --no-dbus --configdir=confdir \
 
272
                --statedir=statedir $(SERVERARGS)
223
273
 
224
274
# Used by run-server
225
275
confdir/mandos.conf: mandos.conf
230
280
        install --mode=u=rw $< $@
231
281
# Add a client password
232
282
        ./mandos-keygen --dir keydir --password >> $@
 
283
statedir:
 
284
        install --directory statedir
233
285
 
234
286
install: install-server install-client-nokey
235
287
 
240
292
 
241
293
install-server: doc
242
294
        install --directory $(CONFDIR)
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
243
297
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
298
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
299
                mandos-ctl
 
300
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
301
                mandos-monitor
244
302
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
245
303
                mandos.conf
246
304
        install --mode=u=rw --target-directory=$(CONFDIR) \
247
305
                clients.conf
 
306
        install --mode=u=rw,go=r dbus-mandos.conf \
 
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
248
308
        install --mode=u=rwx,go=rx init.d-mandos \
249
309
                $(DESTDIR)/etc/init.d/mandos
250
310
        install --mode=u=rw,go=r default-mandos \
254
314
        fi
255
315
        gzip --best --to-stdout mandos.8 \
256
316
                > $(MANDIR)/man8/mandos.8.gz
 
317
        gzip --best --to-stdout mandos-monitor.8 \
 
318
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
319
        gzip --best --to-stdout mandos-ctl.8 \
 
320
                > $(MANDIR)/man8/mandos-ctl.8.gz
257
321
        gzip --best --to-stdout mandos.conf.5 \
258
322
                > $(MANDIR)/man5/mandos.conf.5.gz
259
323
        gzip --best --to-stdout mandos-clients.conf.5 \
260
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
261
327
 
262
328
install-client-nokey: all doc
263
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
267
333
                install --mode=u=rwx \
268
334
                        --directory "$(CONFDIR)/plugins.d"; \
269
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
270
338
        install --mode=u=rwx,go=rx \
271
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
272
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
286
354
        install --mode=u=rwxs,go=rx \
287
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
288
356
                plugins.d/askpass-fifo
 
357
        install --mode=u=rwxs,go=rx \
 
358
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
359
                plugins.d/plymouth
289
360
        install initramfs-tools-hook \
290
361
                $(INITRAMFSTOOLS)/hooks/mandos
291
362
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
297
368
                > $(MANDIR)/man8/mandos-keygen.8.gz
298
369
        gzip --best --to-stdout plugin-runner.8mandos \
299
370
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
371
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
372
                > $(MANDIR)/man8/mandos-client.8mandos.gz
300
373
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
301
374
                > $(MANDIR)/man8/password-prompt.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
303
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
304
375
        gzip --best --to-stdout plugins.d/usplash.8mandos \
305
376
                > $(MANDIR)/man8/usplash.8mandos.gz
306
377
        gzip --best --to-stdout plugins.d/splashy.8mandos \
307
378
                > $(MANDIR)/man8/splashy.8mandos.gz
308
379
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
309
380
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
381
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
382
                > $(MANDIR)/man8/plymouth.8mandos.gz
310
383
 
311
384
install-client: install-client-nokey
312
385
# Post-installation stuff
318
391
 
319
392
uninstall-server:
320
393
        -rm --force $(PREFIX)/sbin/mandos \
 
394
                $(PREFIX)/sbin/mandos-ctl \
 
395
                $(PREFIX)/sbin/mandos-monitor \
321
396
                $(MANDIR)/man8/mandos.8.gz \
 
397
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
398
                $(MANDIR)/man8/mandos-ctl.8.gz \
322
399
                $(MANDIR)/man5/mandos.conf.5.gz \
323
400
                $(MANDIR)/man5/mandos-clients.conf.5.gz
324
401
        update-rc.d -f mandos remove
336
413
                $(PREFIX)/lib/mandos/plugins.d/usplash \
337
414
                $(PREFIX)/lib/mandos/plugins.d/splashy \
338
415
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
416
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
339
417
                $(INITRAMFSTOOLS)/hooks/mandos \
340
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
341
419
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
420
                $(MANDIR)/man8/mandos-keygen.8.gz \
342
421
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
343
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
422
                $(MANDIR)/man8/mandos-client.8mandos.gz
344
423
                $(MANDIR)/man8/password-prompt.8mandos.gz \
345
424
                $(MANDIR)/man8/usplash.8mandos.gz \
346
425
                $(MANDIR)/man8/splashy.8mandos.gz \
347
426
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
348
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
427
                $(MANDIR)/man8/plymouth.8mandos.gz \
349
428
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
350
429
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
351
430
        update-initramfs -k all -u
354
433
 
355
434
purge-server: uninstall-server
356
435
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
357
437
                $(DESTDIR)/etc/default/mandos \
358
438
                $(DESTDIR)/etc/init.d/mandos \
359
439
                $(DESTDIR)/var/run/mandos.pid