/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
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
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>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
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>.
 
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
14
22
#COVERAGE=--coverage
15
23
OPTIMIZE=-Os
16
24
LANGUAGE=-std=gnu99
17
25
htmldir=man
18
 
version=1.0.2
 
26
version=1.6.0
19
27
SED=sed
20
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
 
21
32
## Use these settings for a traditional /usr/local install
22
33
# PREFIX=$(DESTDIR)/usr/local
23
34
# CONFDIR=$(DESTDIR)/etc/mandos
24
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
25
36
# MANDIR=$(PREFIX)/man
26
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
27
39
##
28
40
 
29
41
## These settings are for a package-type install
32
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
33
45
MANDIR=$(PREFIX)/share/man
34
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
35
48
##
36
49
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
53
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
54
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
55
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
56
        getconf LFS_LDFLAGS)
43
57
 
44
58
# Do not change these two
45
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
61
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
63
 
50
64
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
66
        --param man.charmap.use.subset          0 \
53
67
        --param make.year.ranges                1 \
54
68
        --param make.single.year.ranges         1 \
55
69
        --param man.output.quietly              1 \
56
70
        --param man.authors.section.enabled     0 \
57
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
72
        $(notdir $<); \
59
 
        $(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)
60
78
# DocBook-to-man post-processing to fix a '\n' escape bug
61
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
62
80
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
81
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
82
        --param make.year.ranges                1 \
65
83
        --param make.single.year.ranges         1 \
66
84
        --param man.output.quietly              1 \
68
86
        --param citerefentry.link               1 \
69
87
        --output $@ \
70
88
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
89
        $<; $(HTMLPOST) $@)
72
90
# Fix citerefentry links
73
91
HTMLPOST=$(SED) --in-place \
74
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'
75
93
 
76
94
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
 
        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
78
97
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen $(CPROGS)
80
 
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 \
81
101
        plugins.d/mandos-client.8mandos \
82
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
83
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
84
 
        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
85
105
 
86
106
htmldocs=$(addsuffix .xhtml,$(DOCS))
87
107
 
108
128
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
109
129
        $(DOCBOOKTOHTML)
110
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
 
111
136
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
112
137
                legalnotice.xml
113
138
        $(DOCBOOKTOMAN)
122
147
                 legalnotice.xml
123
148
        $(DOCBOOKTOHTML)
124
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
 
125
164
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
126
165
                legalnotice.xml
127
166
        $(DOCBOOKTOMAN)
149
188
 
150
189
# Update all these files with version number $(version)
151
190
common.ent: Makefile
152
 
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
154
 
                $@
 
191
        $(strip $(SED) --in-place \
 
192
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
193
                $@)
155
194
 
156
195
mandos: Makefile
157
 
        $(SED) --in-place \
 
196
        $(strip $(SED) --in-place \
158
197
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
159
 
                $@
 
198
                $@)
160
199
 
161
200
mandos-keygen: Makefile
162
 
        $(SED) --in-place \
 
201
        $(strip $(SED) --in-place \
163
202
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
 
                $@
 
203
                $@)
 
204
 
 
205
mandos-ctl: Makefile
 
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
                $@)
165
214
 
166
215
mandos.lsm: Makefile
167
 
        $(SED) --in-place \
 
216
        $(strip $(SED) --in-place \
168
217
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
169
 
                $@
170
 
        $(SED) --in-place \
 
218
                $@)
 
219
        $(strip $(SED) --in-place \
171
220
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
172
 
                $@
 
221
                $@)
 
222
        $(strip $(SED) --in-place \
 
223
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
224
                $@)
173
225
 
174
 
plugins.d/mandos-client: plugins.d/mandos-client.o
175
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
176
 
                $(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 $@
177
229
 
178
230
.PHONY : all doc html clean distclean run-client run-server install \
179
231
        install-server install-client uninstall uninstall-server \
185
237
distclean: clean
186
238
mostlyclean: clean
187
239
maintainer-clean: clean
188
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
189
241
 
190
242
check:  all
191
243
        ./mandos --check
 
244
        ./mandos-ctl --check
192
245
 
193
246
# Run the client with a local config and key
194
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 "###################################################################"
195
259
        ./plugin-runner --plugin-dir=plugins.d \
196
260
                --config-file=plugin-runner.conf \
197
 
                --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 \
 
262
                $(CLIENTARGS)
198
263
 
199
264
# Used by run-client
200
265
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
202
267
        ./mandos-keygen --dir keydir --force
203
268
 
204
269
# Run the server with a local config
205
 
run-server: confdir/mandos.conf confdir/clients.conf
206
 
        ./mandos --debug --configdir=confdir
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
271
        ./mandos --debug --no-dbus --configdir=confdir \
 
272
                --statedir=statedir $(SERVERARGS)
207
273
 
208
274
# Used by run-server
209
275
confdir/mandos.conf: mandos.conf
214
280
        install --mode=u=rw $< $@
215
281
# Add a client password
216
282
        ./mandos-keygen --dir keydir --password >> $@
 
283
statedir:
 
284
        install --directory statedir
217
285
 
218
286
install: install-server install-client-nokey
219
287
 
224
292
 
225
293
install-server: doc
226
294
        install --directory $(CONFDIR)
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
227
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
228
302
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
229
303
                mandos.conf
230
304
        install --mode=u=rw --target-directory=$(CONFDIR) \
231
305
                clients.conf
 
306
        install --mode=u=rw,go=r dbus-mandos.conf \
 
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
232
308
        install --mode=u=rwx,go=rx init.d-mandos \
233
309
                $(DESTDIR)/etc/init.d/mandos
234
310
        install --mode=u=rw,go=r default-mandos \
238
314
        fi
239
315
        gzip --best --to-stdout mandos.8 \
240
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
241
321
        gzip --best --to-stdout mandos.conf.5 \
242
322
                > $(MANDIR)/man5/mandos.conf.5.gz
243
323
        gzip --best --to-stdout mandos-clients.conf.5 \
244
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
245
327
 
246
328
install-client-nokey: all doc
247
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
251
333
                install --mode=u=rwx \
252
334
                        --directory "$(CONFDIR)/plugins.d"; \
253
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
254
338
        install --mode=u=rwx,go=rx \
255
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
256
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
270
354
        install --mode=u=rwxs,go=rx \
271
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
272
356
                plugins.d/askpass-fifo
 
357
        install --mode=u=rwxs,go=rx \
 
358
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
359
                plugins.d/plymouth
273
360
        install initramfs-tools-hook \
274
361
                $(INITRAMFSTOOLS)/hooks/mandos
275
362
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
276
363
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
277
364
        install initramfs-tools-script \
278
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
365
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
279
366
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
280
367
        gzip --best --to-stdout mandos-keygen.8 \
281
368
                > $(MANDIR)/man8/mandos-keygen.8.gz
282
369
        gzip --best --to-stdout plugin-runner.8mandos \
283
370
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
371
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
372
                > $(MANDIR)/man8/mandos-client.8mandos.gz
284
373
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
285
374
                > $(MANDIR)/man8/password-prompt.8mandos.gz
286
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
287
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
288
375
        gzip --best --to-stdout plugins.d/usplash.8mandos \
289
376
                > $(MANDIR)/man8/usplash.8mandos.gz
290
377
        gzip --best --to-stdout plugins.d/splashy.8mandos \
291
378
                > $(MANDIR)/man8/splashy.8mandos.gz
292
379
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
293
380
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
381
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
382
                > $(MANDIR)/man8/plymouth.8mandos.gz
294
383
 
295
384
install-client: install-client-nokey
296
385
# Post-installation stuff
302
391
 
303
392
uninstall-server:
304
393
        -rm --force $(PREFIX)/sbin/mandos \
 
394
                $(PREFIX)/sbin/mandos-ctl \
 
395
                $(PREFIX)/sbin/mandos-monitor \
305
396
                $(MANDIR)/man8/mandos.8.gz \
 
397
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
398
                $(MANDIR)/man8/mandos-ctl.8.gz \
306
399
                $(MANDIR)/man5/mandos.conf.5.gz \
307
400
                $(MANDIR)/man5/mandos-clients.conf.5.gz
308
401
        update-rc.d -f mandos remove
320
413
                $(PREFIX)/lib/mandos/plugins.d/usplash \
321
414
                $(PREFIX)/lib/mandos/plugins.d/splashy \
322
415
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
416
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
323
417
                $(INITRAMFSTOOLS)/hooks/mandos \
324
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
325
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
419
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
420
                $(MANDIR)/man8/mandos-keygen.8.gz \
326
421
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
327
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
422
                $(MANDIR)/man8/mandos-client.8mandos.gz
328
423
                $(MANDIR)/man8/password-prompt.8mandos.gz \
329
424
                $(MANDIR)/man8/usplash.8mandos.gz \
330
425
                $(MANDIR)/man8/splashy.8mandos.gz \
331
426
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
332
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
427
                $(MANDIR)/man8/plymouth.8mandos.gz \
333
428
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
334
429
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
335
430
        update-initramfs -k all -u
338
433
 
339
434
purge-server: uninstall-server
340
435
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
436
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
341
437
                $(DESTDIR)/etc/default/mandos \
342
438
                $(DESTDIR)/etc/init.d/mandos \
343
439
                $(DESTDIR)/var/run/mandos.pid