/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: 2014-03-10 06:55:54 UTC
  • Revision ID: teddy@recompile.se-20140310065554-of3kz8jdhlll42l3
Use "struct sockaddr_storage" instead of a union in mandos-client.

Apparently using struct sockaddr_storage the way POSIX intended is
incompatible with strict aliasing, so turn that off in the Makefile.

* plugins.d/mandos-client.c (start_mandos_communication): Change "to"
                                                          from a union
                                                          to a struct
                                                          sockaddr_storage.
* Makefile (OPTIMIZE): Add "-fno-strict-aliasing".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
 
8
        -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
10
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
11
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
13
LINK_FORTIFY_LD=-z relro -z now
20
19
LINK_FORTIFY += -pie
21
20
endif
22
21
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
 
22
OPTIMIZE=-Os -fno-strict-aliasing
24
23
LANGUAGE=-std=gnu99
25
24
htmldir=man
26
 
version=1.4.1
 
25
version=1.6.4
27
26
SED=sed
28
27
 
 
28
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
29
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
30
 
29
31
## Use these settings for a traditional /usr/local install
30
32
# PREFIX=$(DESTDIR)/usr/local
31
33
# CONFDIR=$(DESTDIR)/etc/mandos
32
34
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
35
# MANDIR=$(PREFIX)/man
34
36
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
37
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
38
# LIBDIR=$(PREFIX)/lib
35
39
##
36
40
 
37
41
## These settings are for a package-type install
40
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
45
MANDIR=$(PREFIX)/share/man
42
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
 
48
LIBDIR=$(shell \
 
49
        for d in \
 
50
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
51
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
52
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
53
                        echo "$(DESTDIR)$$d"; \
 
54
                        break; \
 
55
                fi; \
 
56
        done)
43
57
##
44
58
 
 
59
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
60
 
45
61
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
62
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
63
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
51
67
        getconf LFS_LDFLAGS)
52
68
 
53
69
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
71
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
72
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
73
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
74
 
59
75
# Commands to format a DocBook <refentry> document into a manual page
60
76
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
79
        --param make.single.year.ranges         1 \
64
80
        --param man.output.quietly              1 \
65
81
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
82
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
83
        $(notdir $<); \
68
84
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
85
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
86
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
87
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
88
        fi >/dev/null)
71
89
# DocBook-to-man post-processing to fix a '\n' escape bug
72
90
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
91
 
220
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
222
240
 
223
 
.PHONY : all doc html clean distclean run-client run-server install \
224
 
        install-server install-client uninstall uninstall-server \
225
 
        uninstall-client purge purge-server purge-client
 
241
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
242
        check run-client run-server install install-html \
 
243
        install-server install-client-nokey install-client uninstall \
 
244
        uninstall-server uninstall-client purge purge-server \
 
245
        purge-client
226
246
 
227
247
clean:
228
248
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
230
250
distclean: clean
231
251
mostlyclean: clean
232
252
maintainer-clean: clean
233
 
        -rm --force --recursive keydir confdir
 
253
        -rm --force --recursive keydir confdir statedir
234
254
 
235
255
check:  all
236
256
        ./mandos --check
 
257
        ./mandos-ctl --check
237
258
 
238
259
# Run the client with a local config and key
239
260
run-client: all keydir/seckey.txt keydir/pubkey.txt
250
271
        @echo "###################################################################"
251
272
        ./plugin-runner --plugin-dir=plugins.d \
252
273
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
274
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
254
275
                $(CLIENTARGS)
255
276
 
256
277
# Used by run-client
259
280
        ./mandos-keygen --dir keydir --force
260
281
 
261
282
# Run the server with a local config
262
 
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
283
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
284
        ./mandos --debug --no-dbus --configdir=confdir \
 
285
                --statedir=statedir $(SERVERARGS)
270
286
 
271
287
# Used by run-server
272
288
confdir/mandos.conf: mandos.conf
277
293
        install --mode=u=rw $< $@
278
294
# Add a client password
279
295
        ./mandos-keygen --dir keydir --password >> $@
 
296
statedir:
 
297
        install --directory statedir
280
298
 
281
299
install: install-server install-client-nokey
282
300
 
287
305
 
288
306
install-server: doc
289
307
        install --directory $(CONFDIR)
 
308
        if install --directory --mode=u=rwx --owner=$(USER) \
 
309
                --group=$(GROUP) $(STATEDIR); then \
 
310
                :; \
 
311
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
312
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
313
        fi
290
314
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
315
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
316
                mandos-ctl
300
324
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
301
325
        install --mode=u=rwx,go=rx init.d-mandos \
302
326
                $(DESTDIR)/etc/init.d/mandos
 
327
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
328
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
329
        fi
303
330
        install --mode=u=rw,go=r default-mandos \
304
331
                $(DESTDIR)/etc/default/mandos
305
332
        if [ -z $(DESTDIR) ]; then \
315
342
                > $(MANDIR)/man5/mandos.conf.5.gz
316
343
        gzip --best --to-stdout mandos-clients.conf.5 \
317
344
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
345
        gzip --best --to-stdout intro.8mandos \
 
346
                > $(MANDIR)/man8/intro.8mandos.gz
318
347
 
319
348
install-client-nokey: all doc
320
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
321
350
        install --directory --mode=u=rwx $(KEYDIR) \
322
 
                $(PREFIX)/lib/mandos/plugins.d
323
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
351
                $(LIBDIR)/mandos/plugins.d
 
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
324
353
                install --mode=u=rwx \
325
354
                        --directory "$(CONFDIR)/plugins.d"; \
326
355
        fi
 
356
        install --mode=u=rwx,go=rx --directory \
 
357
                "$(CONFDIR)/network-hooks.d"
327
358
        install --mode=u=rwx,go=rx \
328
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
359
                --target-directory=$(LIBDIR)/mandos plugin-runner
329
360
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
330
361
                mandos-keygen
331
362
        install --mode=u=rwx,go=rx \
332
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
363
                --target-directory=$(LIBDIR)/mandos/plugins.d \
333
364
                plugins.d/password-prompt
334
365
        install --mode=u=rwxs,go=rx \
335
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
366
                --target-directory=$(LIBDIR)/mandos/plugins.d \
336
367
                plugins.d/mandos-client
337
368
        install --mode=u=rwxs,go=rx \
338
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
369
                --target-directory=$(LIBDIR)/mandos/plugins.d \
339
370
                plugins.d/usplash
340
371
        install --mode=u=rwxs,go=rx \
341
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
372
                --target-directory=$(LIBDIR)/mandos/plugins.d \
342
373
                plugins.d/splashy
343
374
        install --mode=u=rwxs,go=rx \
344
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
375
                --target-directory=$(LIBDIR)/mandos/plugins.d \
345
376
                plugins.d/askpass-fifo
346
377
        install --mode=u=rwxs,go=rx \
347
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
348
379
                plugins.d/plymouth
349
380
        install initramfs-tools-hook \
350
381
                $(INITRAMFSTOOLS)/hooks/mandos
396
427
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
397
428
                $(DESTDIR)/etc/crypttab
398
429
        -rm --force $(PREFIX)/sbin/mandos-keygen \
399
 
                $(PREFIX)/lib/mandos/plugin-runner \
400
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
401
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
402
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
403
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
404
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
405
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
430
                $(LIBDIR)/mandos/plugin-runner \
 
431
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
432
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
433
                $(LIBDIR)/mandos/plugins.d/usplash \
 
434
                $(LIBDIR)/mandos/plugins.d/splashy \
 
435
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
436
                $(LIBDIR)/mandos/plugins.d/plymouth \
406
437
                $(INITRAMFSTOOLS)/hooks/mandos \
407
438
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
408
439
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
414
445
                $(MANDIR)/man8/splashy.8mandos.gz \
415
446
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
416
447
                $(MANDIR)/man8/plymouth.8mandos.gz \
417
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
418
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
448
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
449
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
419
450
        update-initramfs -k all -u
420
451
 
421
452
purge: purge-server purge-client
425
456
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
426
457
                $(DESTDIR)/etc/default/mandos \
427
458
                $(DESTDIR)/etc/init.d/mandos \
 
459
                $(SYSTEMD)/mandos.service \
 
460
                $(DESTDIR)/run/mandos.pid \
428
461
                $(DESTDIR)/var/run/mandos.pid
429
462
        -rmdir $(CONFDIR)
430
463