/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: 2012-06-17 02:30:59 UTC
  • Revision ID: teddy@recompile.se-20120617023059-em4nfnxg1tsn64xj
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
                                                        non-specified
                                                        interfaces.
  (main): Use lower_privileges() consistently.  Bug fix: Don't remove
          "none" from list of interfaces.  Make --interface=none work
          again by not bringing up interfaces specified after "none".
* plugins.d/mandos-client.xml (OPTIONS): Document new meaning of
                                         specifying --interface=none
                                         together with other
                                         interface names,

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.3.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)
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
248
257
        @echo "###################################################################"
249
258
        ./plugin-runner --plugin-dir=plugins.d \
250
259
                --config-file=plugin-runner.conf \
251
 
                --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 \
252
261
                $(CLIENTARGS)
253
262
 
254
263
# Used by run-client
257
266
        ./mandos-keygen --dir keydir --force
258
267
 
259
268
# 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)
 
269
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
270
        ./mandos --debug --no-dbus --configdir=confdir \
 
271
                --statedir=statedir $(SERVERARGS)
268
272
 
269
273
# Used by run-server
270
274
confdir/mandos.conf: mandos.conf
275
279
        install --mode=u=rw $< $@
276
280
# Add a client password
277
281
        ./mandos-keygen --dir keydir --password >> $@
 
282
statedir:
 
283
        install --directory statedir
278
284
 
279
285
install: install-server install-client-nokey
280
286
 
285
291
 
286
292
install-server: doc
287
293
        install --directory $(CONFDIR)
 
294
        install --directory --mode=u=rwx --owner=$(USER) \
 
295
                --group=$(GROUP) $(STATEDIR)
288
296
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
289
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
290
298
                mandos-ctl
313
321
                > $(MANDIR)/man5/mandos.conf.5.gz
314
322
        gzip --best --to-stdout mandos-clients.conf.5 \
315
323
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
324
        gzip --best --to-stdout intro.8mandos \
 
325
                > $(MANDIR)/man8/intro.8mandos.gz
316
326
 
317
327
install-client-nokey: all doc
318
328
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
322
332
                install --mode=u=rwx \
323
333
                        --directory "$(CONFDIR)/plugins.d"; \
324
334
        fi
 
335
        install --mode=u=rwx,go=rx --directory \
 
336
                "$(CONFDIR)/network-hooks.d"
325
337
        install --mode=u=rwx,go=rx \
326
338
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
327
339
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \