/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-13 22:06:57 UTC
  • mto: (237.7.144 trunk)
  • mto: This revision was merged to the branch mainline in revision 302.
  • Revision ID: teddy@recompile.se-20120613220657-qvq7c7nrndl3t413
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
  (up_interface): Removed; replaced with "interface_is_up".
  (interface_is_up, interface_is_running,
   lower_privileges_permanently, take_down_interface): New.
  (bring_up_interface): Return "error_t".  Use new functions
                        "interface_is_up", "get_flags", and
                        "interface_is_running".
  (main): Save all interfaces either autodetected or specified with
          --interface in argz vector "interfaces".  Save interfaces to
          take down on exit in argz vector "interfaces_to_take_down".
          Save interface names for DEVICE variable to network hooks as
          argz_vector "interfaces_hooks".  Bug fix: Be privileged
          while stopping network hooks.
* plugins.d/mandos-client.xml (SYNOPSIS): Changed --interface synopsis.
  (DESCRIPTION): Updated to document use of all interfaces.
  (OPTIONS): Updated description of "--interface".
* network-hooks.d/bridge: Parse comma-separated DEVICE environment
                          variable.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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.5.5
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)
66
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
72
        $(notdir $<); \
68
73
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
74
        if locale --all | grep --regexp='^en_US\.utf8$$' && type man \
 
75
        2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 man \
 
76
        --warnings --encoding=UTF-8 --local-file $(notdir $@); fi \
 
77
        >/dev/null)
71
78
# DocBook-to-man post-processing to fix a '\n' escape bug
72
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
80
 
230
237
distclean: clean
231
238
mostlyclean: clean
232
239
maintainer-clean: clean
233
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
234
241
 
235
242
check:  all
236
243
        ./mandos --check
250
257
        @echo "###################################################################"
251
258
        ./plugin-runner --plugin-dir=plugins.d \
252
259
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
260
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
254
261
                $(CLIENTARGS)
255
262
 
256
263
# Used by run-client
259
266
        ./mandos-keygen --dir keydir --force
260
267
 
261
268
# Run the server with a local config
262
 
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
269
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
270
        ./mandos --debug --no-dbus --configdir=confdir \
 
271
                --statedir=statedir $(SERVERARGS)
270
272
 
271
273
# Used by run-server
272
274
confdir/mandos.conf: mandos.conf
277
279
        install --mode=u=rw $< $@
278
280
# Add a client password
279
281
        ./mandos-keygen --dir keydir --password >> $@
 
282
statedir:
 
283
        install --directory statedir
280
284
 
281
285
install: install-server install-client-nokey
282
286
 
287
291
 
288
292
install-server: doc
289
293
        install --directory $(CONFDIR)
 
294
        install --directory --mode=u=rwx --owner=$(USER) \
 
295
                --group=$(GROUP) $(STATEDIR)
290
296
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
298
                mandos-ctl
315
321
                > $(MANDIR)/man5/mandos.conf.5.gz
316
322
        gzip --best --to-stdout mandos-clients.conf.5 \
317
323
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
324
        gzip --best --to-stdout intro.8mandos \
 
325
                > $(MANDIR)/man8/intro.8mandos.gz
318
326
 
319
327
install-client-nokey: all doc
320
328
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
324
332
                install --mode=u=rwx \
325
333
                        --directory "$(CONFDIR)/plugins.d"; \
326
334
        fi
 
335
        install --mode=u=rwx,go=rx --directory \
 
336
                "$(CONFDIR)/network-hooks.d"
327
337
        install --mode=u=rwx,go=rx \
328
338
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
329
339
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \