/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: 2012-06-23 00:58:49 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
          duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
  (EXAMPLE): Update to new interval format.
  (SEE ALSO): Reference RFC 3339.

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.4.1
 
26
version=1.6.0
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
68
68
        --param make.single.year.ranges         1 \
69
69
        --param man.output.quietly              1 \
70
70
        --param man.authors.section.enabled     0 \
71
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
72
        $(notdir $<); \
73
73
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
 
74
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
75
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
76
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
77
        fi >/dev/null)
76
78
# DocBook-to-man post-processing to fix a '\n' escape bug
77
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
78
80
 
239
241
 
240
242
check:  all
241
243
        ./mandos --check
 
244
        ./mandos-ctl --check
242
245
 
243
246
# Run the client with a local config and key
244
247
run-client: all keydir/seckey.txt keydir/pubkey.txt
255
258
        @echo "###################################################################"
256
259
        ./plugin-runner --plugin-dir=plugins.d \
257
260
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
261
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
259
262
                $(CLIENTARGS)
260
263
 
261
264
# Used by run-client
264
267
        ./mandos-keygen --dir keydir --force
265
268
 
266
269
# Run the server with a local config
267
 
run-server: confdir/mandos.conf confdir/clients.conf
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
268
271
        ./mandos --debug --no-dbus --configdir=confdir \
269
272
                --statedir=statedir $(SERVERARGS)
270
273
 
319
322
                > $(MANDIR)/man5/mandos.conf.5.gz
320
323
        gzip --best --to-stdout mandos-clients.conf.5 \
321
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
322
327
 
323
328
install-client-nokey: all doc
324
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
328
333
                install --mode=u=rwx \
329
334
                        --directory "$(CONFDIR)/plugins.d"; \
330
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
331
338
        install --mode=u=rwx,go=rx \
332
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
333
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \