/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-06 02:26:04 UTC
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

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
23
22
OPTIMIZE=-Os
24
23
LANGUAGE=-std=gnu99
25
24
htmldir=man
26
 
version=1.6.0
 
25
version=1.6.4
27
26
SED=sed
28
27
 
29
28
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
35
# MANDIR=$(PREFIX)/man
37
36
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
37
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
38
# LIBDIR=$(PREFIX)/lib
39
39
##
40
40
 
41
41
## These settings are for a package-type install
45
45
MANDIR=$(PREFIX)/share/man
46
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
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)
48
57
##
49
58
 
 
59
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
60
 
50
61
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
62
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
63
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
56
67
        getconf LFS_LDFLAGS)
57
68
 
58
69
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
71
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
72
        -DVERSION='"$(version)"'
62
 
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))
63
74
 
64
75
# Commands to format a DocBook <refentry> document into a manual page
65
76
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
227
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
240
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        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
233
246
 
234
247
clean:
235
248
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
292
305
 
293
306
install-server: doc
294
307
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
 
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
297
314
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
315
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
316
                mandos-ctl
307
324
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
325
        install --mode=u=rwx,go=rx init.d-mandos \
309
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
310
330
        install --mode=u=rw,go=r default-mandos \
311
331
                $(DESTDIR)/etc/default/mandos
312
332
        if [ -z $(DESTDIR) ]; then \
326
346
                > $(MANDIR)/man8/intro.8mandos.gz
327
347
 
328
348
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
330
350
        install --directory --mode=u=rwx $(KEYDIR) \
331
 
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
351
                $(LIBDIR)/mandos/plugins.d
 
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
353
                install --mode=u=rwx \
334
354
                        --directory "$(CONFDIR)/plugins.d"; \
335
355
        fi
336
356
        install --mode=u=rwx,go=rx --directory \
337
357
                "$(CONFDIR)/network-hooks.d"
338
358
        install --mode=u=rwx,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
359
                --target-directory=$(LIBDIR)/mandos plugin-runner
340
360
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
361
                mandos-keygen
342
362
        install --mode=u=rwx,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
363
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
364
                plugins.d/password-prompt
345
365
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
366
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
367
                plugins.d/mandos-client
348
368
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
369
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
370
                plugins.d/usplash
351
371
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
372
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
373
                plugins.d/splashy
354
374
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
375
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
376
                plugins.d/askpass-fifo
357
377
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
359
379
                plugins.d/plymouth
360
380
        install initramfs-tools-hook \
361
381
                $(INITRAMFSTOOLS)/hooks/mandos
407
427
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
408
428
                $(DESTDIR)/etc/crypttab
409
429
        -rm --force $(PREFIX)/sbin/mandos-keygen \
410
 
                $(PREFIX)/lib/mandos/plugin-runner \
411
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
412
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
413
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(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 \
417
437
                $(INITRAMFSTOOLS)/hooks/mandos \
418
438
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
439
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
425
445
                $(MANDIR)/man8/splashy.8mandos.gz \
426
446
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
447
                $(MANDIR)/man8/plymouth.8mandos.gz \
428
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
448
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
449
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
430
450
        update-initramfs -k all -u
431
451
 
432
452
purge: purge-server purge-client
436
456
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
457
                $(DESTDIR)/etc/default/mandos \
438
458
                $(DESTDIR)/etc/init.d/mandos \
 
459
                $(SYSTEMD)/mandos.service \
 
460
                $(DESTDIR)/run/mandos.pid \
439
461
                $(DESTDIR)/var/run/mandos.pid
440
462
        -rmdir $(CONFDIR)
441
463