/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: 2011-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.0
 
26
version=1.3.1
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
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
68
63
        --param make.single.year.ranges         1 \
69
64
        --param man.output.quietly              1 \
70
65
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(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)
 
68
        $(MANPOST) $(notdir $@))
78
69
# DocBook-to-man post-processing to fix a '\n' escape bug
79
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
71
 
237
228
distclean: clean
238
229
mostlyclean: clean
239
230
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
231
        -rm --force --recursive keydir confdir
241
232
 
242
233
check:  all
243
234
        ./mandos --check
244
 
        ./mandos-ctl --check
245
235
 
246
236
# Run the client with a local config and key
247
237
run-client: all keydir/seckey.txt keydir/pubkey.txt
258
248
        @echo "###################################################################"
259
249
        ./plugin-runner --plugin-dir=plugins.d \
260
250
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
262
252
                $(CLIENTARGS)
263
253
 
264
254
# Used by run-client
267
257
        ./mandos-keygen --dir keydir --force
268
258
 
269
259
# Run the server with a local config
270
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
271
 
        ./mandos --debug --no-dbus --configdir=confdir \
272
 
                --statedir=statedir $(SERVERARGS)
 
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)
273
268
 
274
269
# Used by run-server
275
270
confdir/mandos.conf: mandos.conf
280
275
        install --mode=u=rw $< $@
281
276
# Add a client password
282
277
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
278
 
286
279
install: install-server install-client-nokey
287
280
 
292
285
 
293
286
install-server: doc
294
287
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
288
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
289
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
290
                mandos-ctl
322
313
                > $(MANDIR)/man5/mandos.conf.5.gz
323
314
        gzip --best --to-stdout mandos-clients.conf.5 \
324
315
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
316
 
328
317
install-client-nokey: all doc
329
318
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
322
                install --mode=u=rwx \
334
323
                        --directory "$(CONFDIR)/plugins.d"; \
335
324
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
325
        install --mode=u=rwx,go=rx \
339
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \