/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-20 21:04:35 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020210435-jc94ovr5i4sve16r
* Makefile (install-client-nokey): Install "mandos-change-keytype".
  (uninstall-client): Uninstall "mandos-change-keytype".
* mandos (priority): Changed back default GnuTLS priority string to
                     "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP".
* mandos-change-keytype: New script which, assuming the Mandos server
                         is responding, will generate a new key with
                         the new mandos-keygen default parameters
                         (currently 4096-bit RSA), and output a
                         replacement section for clients.conf on the
                         Mandos server.
* mandos-keygen: Bug fix: output password prompt even when redirecting
                 stdout.
* 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.5.5
 
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)))
56
56
        getconf LFS_LDFLAGS)
57
57
 
58
58
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
59
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
61
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(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))
63
63
 
64
64
# Commands to format a DocBook <refentry> document into a manual page
65
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
241
241
 
242
242
check:  all
243
243
        ./mandos --check
 
244
        ./mandos-ctl --check
244
245
 
245
246
# Run the client with a local config and key
246
247
run-client: all keydir/seckey.txt keydir/pubkey.txt
338
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
339
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
340
341
                mandos-keygen
 
342
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
343
                mandos-change-keytype
341
344
        install --mode=u=rwx,go=rx \
342
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
343
346
                plugins.d/password-prompt
406
409
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
407
410
                $(DESTDIR)/etc/crypttab
408
411
        -rm --force $(PREFIX)/sbin/mandos-keygen \
 
412
                $(PREFIX)/sbin/mandos-change-keytype \
409
413
                $(PREFIX)/lib/mandos/plugin-runner \
410
414
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
411
415
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
435
439
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
436
440
                $(DESTDIR)/etc/default/mandos \
437
441
                $(DESTDIR)/etc/init.d/mandos \
438
 
                $(DESTDIR)/var/run/mandos.pid
 
442
                $(DESTDIR)/run/mandos.pid
439
443
        -rmdir $(CONFDIR)
440
444
 
441
445
purge-client: uninstall-client