/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

* mandos (peer_certificate): Handle NULL pointer from
                             "gnutls_certificate_get_peers" slightly
                             better.
  (TCP_handler.handle): Added some extra debug output.

  (MandosServer.GetAllClients,
  MandosServer.GetAllClientsWithProperties,
  MandosServer.RemoveClient): Added doc string.

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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://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
 
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
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.4.0
 
19
version=1.0.5
27
20
SED=sed
28
21
 
29
22
## Use these settings for a traditional /usr/local install
42
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
36
##
44
37
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
52
44
 
53
45
# Do not change these two
54
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
48
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
50
 
59
51
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
53
        --param man.charmap.use.subset          0 \
62
54
        --param make.year.ranges                1 \
63
55
        --param make.single.year.ranges         1 \
65
57
        --param man.authors.section.enabled     0 \
66
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
59
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
60
        $(MANPOST) $(notdir $@)
69
61
# DocBook-to-man post-processing to fix a '\n' escape bug
70
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
63
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
65
        --param make.year.ranges                1 \
74
66
        --param make.single.year.ranges         1 \
75
67
        --param man.output.quietly              1 \
77
69
        --param citerefentry.link               1 \
78
70
        --output $@ \
79
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
81
73
# Fix citerefentry links
82
74
HTMLPOST=$(SED) --in-place \
83
75
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
76
 
85
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
79
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
91
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
92
82
        plugins.d/mandos-client.8mandos \
93
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos intro.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
96
86
 
97
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
88
 
119
109
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
110
        $(DOCBOOKTOHTML)
121
111
 
122
 
intro.8mandos: intro.xml common.ent legalnotice.xml
123
 
        $(DOCBOOKTOMAN)
124
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOHTML)
126
 
 
127
112
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
128
113
                legalnotice.xml
129
114
        $(DOCBOOKTOMAN)
138
123
                 legalnotice.xml
139
124
        $(DOCBOOKTOHTML)
140
125
 
141
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
142
 
                legalnotice.xml
143
 
        $(DOCBOOKTOMAN)
144
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
145
 
                 legalnotice.xml
146
 
        $(DOCBOOKTOHTML)
147
 
 
148
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
149
 
                legalnotice.xml
150
 
        $(DOCBOOKTOMAN)
151
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
152
 
                 legalnotice.xml
153
 
        $(DOCBOOKTOHTML)
154
 
 
155
126
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
156
127
                legalnotice.xml
157
128
        $(DOCBOOKTOMAN)
179
150
 
180
151
# Update all these files with version number $(version)
181
152
common.ent: Makefile
182
 
        $(strip $(SED) --in-place \
183
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
184
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
185
156
 
186
157
mandos: Makefile
187
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
188
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
189
 
                $@)
 
160
                $@
190
161
 
191
162
mandos-keygen: Makefile
192
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
193
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
194
 
                $@)
 
165
                $@
195
166
 
196
167
mandos-ctl: Makefile
197
 
        $(strip $(SED) --in-place \
198
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
199
 
                $@)
200
 
 
201
 
mandos-monitor: Makefile
202
 
        $(strip $(SED) --in-place \
203
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
204
 
                $@)
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
205
171
 
206
172
mandos.lsm: Makefile
207
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
208
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
209
 
                $@)
210
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
211
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
212
 
                $@)
213
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
214
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
215
 
                $@)
 
181
                $@
216
182
 
217
 
plugins.d/mandos-client: plugins.d/mandos-client.c
218
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
219
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
183
plugins.d/mandos-client: plugins.d/mandos-client.o
 
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
220
186
 
221
187
.PHONY : all doc html clean distclean run-client run-server install \
222
188
        install-server install-client uninstall uninstall-server \
235
201
 
236
202
# Run the client with a local config and key
237
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
238
 
        @echo "###################################################################"
239
 
        @echo "# The following error messages are harmless and can be safely     #"
240
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
241
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
242
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
243
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
244
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
245
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
246
 
        @echo "#                     seteuid: Operation not permitted            #"
247
 
        @echo "#                     klogctl: Operation not permitted            #"
248
 
        @echo "###################################################################"
249
204
        ./plugin-runner --plugin-dir=plugins.d \
250
205
                --config-file=plugin-runner.conf \
251
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
258
213
 
259
214
# Run the server with a local config
260
215
run-server: confdir/mandos.conf confdir/clients.conf
261
 
        @echo "#################################################################"
262
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
263
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
264
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
265
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
266
 
        @echo "#################################################################"
267
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
268
217
 
269
218
# Used by run-server
270
219
confdir/mandos.conf: mandos.conf
286
235
install-server: doc
287
236
        install --directory $(CONFDIR)
288
237
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
289
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
290
 
                mandos-ctl
291
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
 
                mandos-monitor
293
238
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
294
239
                mandos.conf
295
240
        install --mode=u=rw --target-directory=$(CONFDIR) \
296
241
                clients.conf
297
 
        install --mode=u=rw,go=r dbus-mandos.conf \
298
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
299
242
        install --mode=u=rwx,go=rx init.d-mandos \
300
243
                $(DESTDIR)/etc/init.d/mandos
301
244
        install --mode=u=rw,go=r default-mandos \
305
248
        fi
306
249
        gzip --best --to-stdout mandos.8 \
307
250
                > $(MANDIR)/man8/mandos.8.gz
308
 
        gzip --best --to-stdout mandos-monitor.8 \
309
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
310
 
        gzip --best --to-stdout mandos-ctl.8 \
311
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
312
251
        gzip --best --to-stdout mandos.conf.5 \
313
252
                > $(MANDIR)/man5/mandos.conf.5.gz
314
253
        gzip --best --to-stdout mandos-clients.conf.5 \
341
280
        install --mode=u=rwxs,go=rx \
342
281
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
282
                plugins.d/askpass-fifo
344
 
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
346
 
                plugins.d/plymouth
347
283
        install initramfs-tools-hook \
348
284
                $(INITRAMFSTOOLS)/hooks/mandos
349
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
350
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
351
287
        install initramfs-tools-script \
352
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
353
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
354
290
        gzip --best --to-stdout mandos-keygen.8 \
355
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
356
292
        gzip --best --to-stdout plugin-runner.8mandos \
357
293
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
294
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
295
                > $(MANDIR)/man8/password-prompt.8mandos.gz
358
296
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
359
297
                > $(MANDIR)/man8/mandos-client.8mandos.gz
360
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
361
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
362
298
        gzip --best --to-stdout plugins.d/usplash.8mandos \
363
299
                > $(MANDIR)/man8/usplash.8mandos.gz
364
300
        gzip --best --to-stdout plugins.d/splashy.8mandos \
365
301
                > $(MANDIR)/man8/splashy.8mandos.gz
366
302
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
367
303
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
368
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
369
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
370
304
 
371
305
install-client: install-client-nokey
372
306
# Post-installation stuff
378
312
 
379
313
uninstall-server:
380
314
        -rm --force $(PREFIX)/sbin/mandos \
381
 
                $(PREFIX)/sbin/mandos-ctl \
382
 
                $(PREFIX)/sbin/mandos-monitor \
383
315
                $(MANDIR)/man8/mandos.8.gz \
384
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
385
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
386
316
                $(MANDIR)/man5/mandos.conf.5.gz \
387
317
                $(MANDIR)/man5/mandos-clients.conf.5.gz
388
318
        update-rc.d -f mandos remove
400
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
401
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
402
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
403
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
404
333
                $(INITRAMFSTOOLS)/hooks/mandos \
405
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
406
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
407
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
408
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
409
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
410
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \
411
339
                $(MANDIR)/man8/usplash.8mandos.gz \
412
340
                $(MANDIR)/man8/splashy.8mandos.gz \
413
341
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
414
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
342
                $(MANDIR)/man8/mandos-client.8mandos.gz
415
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
416
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
417
345
        update-initramfs -k all -u
420
348
 
421
349
purge-server: uninstall-server
422
350
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
423
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
424
351
                $(DESTDIR)/etc/default/mandos \
425
352
                $(DESTDIR)/etc/init.d/mandos \
426
353
                $(DESTDIR)/var/run/mandos.pid