/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: 2013-10-22 19:24:01 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131022192401-op6mwsb7f7gygjyh
http://bugs.debian.org/702120
* mandos (priority): Bug fix: Add even more magic to make the old
                     DSA/ELG 2048-bit keys work with GnuTLS.
* mandos-keygen (KEYCOMMENT): Changed default to "".
* mandos-keygen (OPTIONS): Document new default value of "--comment".
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.2
 
26
version=1.6.1
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
36
# MANDIR=$(PREFIX)/man
37
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
 
# LIBDIR=$(PREFIX)/lib
40
39
##
41
40
 
42
41
## These settings are for a package-type install
46
45
MANDIR=$(PREFIX)/share/man
47
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
48
47
STATEDIR=$(DESTDIR)/var/lib/mandos
49
 
LIBDIR=$(shell \
50
 
        for d in \
51
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
52
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
53
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
54
 
                        echo "$(DESTDIR)$$d"; \
55
 
                        break; \
56
 
                fi; \
57
 
        done)
58
48
##
59
49
 
60
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
61
 
 
62
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
63
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
64
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
304
292
 
305
293
install-server: doc
306
294
        install --directory $(CONFDIR)
307
 
        if install --directory --mode=u=rwx --owner=$(USER) \
308
 
                --group=$(GROUP) $(STATEDIR); then \
309
 
                :; \
310
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
311
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
312
 
        fi
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
313
297
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
314
298
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
315
299
                mandos-ctl
323
307
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
324
308
        install --mode=u=rwx,go=rx init.d-mandos \
325
309
                $(DESTDIR)/etc/init.d/mandos
326
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
327
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
328
 
        fi
329
310
        install --mode=u=rw,go=r default-mandos \
330
311
                $(DESTDIR)/etc/default/mandos
331
312
        if [ -z $(DESTDIR) ]; then \
345
326
                > $(MANDIR)/man8/intro.8mandos.gz
346
327
 
347
328
install-client-nokey: all doc
348
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
349
330
        install --directory --mode=u=rwx $(KEYDIR) \
350
 
                $(LIBDIR)/mandos/plugins.d
351
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
331
                $(PREFIX)/lib/mandos/plugins.d
 
332
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
352
333
                install --mode=u=rwx \
353
334
                        --directory "$(CONFDIR)/plugins.d"; \
354
335
        fi
355
336
        install --mode=u=rwx,go=rx --directory \
356
337
                "$(CONFDIR)/network-hooks.d"
357
338
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
359
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
341
                mandos-keygen
 
342
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
343
                mandos-change-keytype
361
344
        install --mode=u=rwx,go=rx \
362
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
363
346
                plugins.d/password-prompt
364
347
        install --mode=u=rwxs,go=rx \
365
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
366
349
                plugins.d/mandos-client
367
350
        install --mode=u=rwxs,go=rx \
368
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
369
352
                plugins.d/usplash
370
353
        install --mode=u=rwxs,go=rx \
371
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
354
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
372
355
                plugins.d/splashy
373
356
        install --mode=u=rwxs,go=rx \
374
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
357
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
375
358
                plugins.d/askpass-fifo
376
359
        install --mode=u=rwxs,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
360
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
361
                plugins.d/plymouth
379
362
        install initramfs-tools-hook \
380
363
                $(INITRAMFSTOOLS)/hooks/mandos
426
409
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
427
410
                $(DESTDIR)/etc/crypttab
428
411
        -rm --force $(PREFIX)/sbin/mandos-keygen \
429
 
                $(LIBDIR)/mandos/plugin-runner \
430
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
431
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
432
 
                $(LIBDIR)/mandos/plugins.d/usplash \
433
 
                $(LIBDIR)/mandos/plugins.d/splashy \
434
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
435
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
412
                $(PREFIX)/sbin/mandos-change-keytype \
 
413
                $(PREFIX)/lib/mandos/plugin-runner \
 
414
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
415
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
416
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
417
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
418
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
419
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
436
420
                $(INITRAMFSTOOLS)/hooks/mandos \
437
421
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
438
422
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
444
428
                $(MANDIR)/man8/splashy.8mandos.gz \
445
429
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
446
430
                $(MANDIR)/man8/plymouth.8mandos.gz \
447
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
448
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
431
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
432
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
449
433
        update-initramfs -k all -u
450
434
 
451
435
purge: purge-server purge-client
455
439
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
456
440
                $(DESTDIR)/etc/default/mandos \
457
441
                $(DESTDIR)/etc/init.d/mandos \
458
 
                $(SYSTEMD)/mandos.service \
459
 
                $(DESTDIR)/run/mandos.pid \
460
 
                $(DESTDIR)/var/run/mandos.pid
 
442
                $(DESTDIR)/run/mandos.pid
461
443
        -rmdir $(CONFDIR)
462
444
 
463
445
purge-client: uninstall-client