/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: 2012-06-22 23:33:56 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120622233356-odoqqt2ki2gssn37
* Makefile (check): Also check mandos-ctl.
* mandos-ctl: All options taking a time interval argument can now take
              an RFC 3339 duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
  (main): New "--check" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new "--check" option.

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