/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-22 23:33:56 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120622233356-odoqqt2ki2gssn37
* Makefile (check): Also check mandos-ctl.
* mandos-ctl: All options taking a time interval argument can now take
              an RFC 3339 duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
  (main): New "--check" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new "--check" option.

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.3.1
 
26
version=1.6.0
27
27
SED=sed
28
28
 
 
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
30
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
31
 
29
32
## Use these settings for a traditional /usr/local install
30
33
# PREFIX=$(DESTDIR)/usr/local
31
34
# CONFDIR=$(DESTDIR)/etc/mandos
32
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
36
# MANDIR=$(PREFIX)/man
34
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
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
43
48
##
44
49
 
45
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
63
68
        --param make.single.year.ranges         1 \
64
69
        --param man.output.quietly              1 \
65
70
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
72
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
73
        $(MANPOST) $(notdir $@);\
 
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)
69
78
# DocBook-to-man post-processing to fix a '\n' escape bug
70
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
80
 
228
237
distclean: clean
229
238
mostlyclean: clean
230
239
maintainer-clean: clean
231
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
232
241
 
233
242
check:  all
234
243
        ./mandos --check
 
244
        ./mandos-ctl --check
235
245
 
236
246
# Run the client with a local config and key
237
247
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
258
        @echo "###################################################################"
249
259
        ./plugin-runner --plugin-dir=plugins.d \
250
260
                --config-file=plugin-runner.conf \
251
 
                --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 \
252
262
                $(CLIENTARGS)
253
263
 
254
264
# Used by run-client
257
267
        ./mandos-keygen --dir keydir --force
258
268
 
259
269
# Run the server with a local config
260
 
run-server: confdir/mandos.conf confdir/clients.conf
261
 
        @echo "#################################################################"
262
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
263
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
264
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
265
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
266
 
        @echo "#################################################################"
267
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
271
        ./mandos --debug --no-dbus --configdir=confdir \
 
272
                --statedir=statedir $(SERVERARGS)
268
273
 
269
274
# Used by run-server
270
275
confdir/mandos.conf: mandos.conf
275
280
        install --mode=u=rw $< $@
276
281
# Add a client password
277
282
        ./mandos-keygen --dir keydir --password >> $@
 
283
statedir:
 
284
        install --directory statedir
278
285
 
279
286
install: install-server install-client-nokey
280
287
 
285
292
 
286
293
install-server: doc
287
294
        install --directory $(CONFDIR)
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
288
297
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
289
298
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
290
299
                mandos-ctl
313
322
                > $(MANDIR)/man5/mandos.conf.5.gz
314
323
        gzip --best --to-stdout mandos-clients.conf.5 \
315
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
316
327
 
317
328
install-client-nokey: all doc
318
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
322
333
                install --mode=u=rwx \
323
334
                        --directory "$(CONFDIR)/plugins.d"; \
324
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
325
338
        install --mode=u=rwx,go=rx \
326
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
327
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \