/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: 2008-07-22 06:23:29 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080722062329-jaex5y5mslf6sqjx
* mandos-clients.conf ([DEFAULT]): New section.

* plugins.d/mandosclient.c (start_mandos_communication): Only print if
                                                         debugging.
                                                         Print server
                                                         name.
                                                         Bug fix: Loop
                                                         until suc-
                                                         cess.

* server.py (serverName): Set via option, not globally.
  (Client.__init__): Removed argument "options".  Require "timeout"
                     and "interval" arguments.
  (tcp_handler.handle): Set "priority" from self.server.options.
  (main): Removed "--timeout" and "--interval" options.  New options
          "--priority" and "--servicename".  Add defaults for
          "timeout" and "interval".  Set "serviceName" from options.
          Do not pass "options" to "Client()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
 
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
 
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-parameter -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow -Wunsafe-loop-optimizations -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wold-style-definition -Wpacked -Wnested-externs -Wunreachable-code -Winline -Wvolatile-register-var 
9
2
DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
13
3
#COVERAGE=--coverage
14
4
OPTIMIZE=-Os
15
5
LANGUAGE=-std=gnu99
16
6
 
17
7
# Do not change these two
18
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
 
8
CFLAGS=$(WARN) $(COVERAGE) $(DEBUG) $(OPTIMIZE) $(LANGUAGE)
19
9
LDFLAGS=$(COVERAGE)
20
10
 
21
 
DOCBOOKTOMAN=xsltproc --nonet \
22
 
        --param man.charmap.use.subset          0 \
23
 
        --param make.year.ranges                1 \
24
 
        --param make.single.year.ranges         1 \
25
 
        --param man.output.quietly              1 \
26
 
        --param man.authors.section.enabled     0
27
 
 
28
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
29
 
PROGS=mandos-client $(PLUGINS)
30
 
DOCS=mandos.8 mandos-client.8mandos mandos-keygen.8 \
31
 
        plugins.d/password-request.8mandos \
32
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
33
 
         mandos-clients.conf.5
 
11
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
34
12
 
35
13
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
36
14
 
37
15
all: $(PROGS)
38
16
 
39
 
doc: $(DOCS)
40
 
 
41
 
%.5: %.xml
42
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
43
 
 
44
 
%.8: %.xml
45
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
46
 
 
47
 
%.8mandos: %.xml
48
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
49
 
 
50
 
mandos-client: mandos-client.o
 
17
plugbasedclient: plugbasedclient.o
51
18
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
52
19
 
53
 
plugins.d/password-request: plugins.d/password-request.o
54
 
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
55
 
                $(LOADLIBES) $(LDLIBS) -o $@
 
20
plugins.d/mandosclient: plugins.d/mandosclient.o
 
21
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
56
22
 
57
 
plugins.d/password-prompt: plugins.d/password-prompt.o
 
23
plugins.d/passprompt: plugins.d/passprompt.o
58
24
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
59
25
 
60
 
.PHONY : all clean distclean run-client run-server install \
61
 
        install-server install-client uninstall uninstall-server \
62
 
        uninstall-client purge purge-server purge-client
63
 
 
 
26
.PHONY : clean
64
27
clean:
65
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
66
 
 
67
 
distclean: clean
68
 
mostlyclean: clean
69
 
maintainer-clean: clean
70
 
        -rm --force --recursive keydir
71
 
 
72
 
check:
73
 
        ./mandos --check
74
 
 
75
 
run-client: all
76
 
        -mkdir keydir
77
 
        -./mandos-keygen --dir keydir
78
 
        ./mandos-client --plugin-dir=plugins.d \
79
 
                --options-for=password-request:--keydir=keydir
80
 
 
81
 
run-server:
82
 
        ./mandos --debug --configdir=.
83
 
 
84
 
install: install-server install-client
85
 
 
86
 
install-server: doc
87
 
        mkdir --mode=0755 --parents /etc/mandos
88
 
        install --mode=0755 mandos /usr/sbin/mandos
89
 
        install --mode=0644 --target-directory=/etc/mandos mandos.conf
90
 
        install --mode=0640 --target-directory=/etc/mandos \
91
 
                clients.conf
92
 
        gzip --best --to-stdout mandos.8 \
93
 
                > /usr/share/man/man8/mandos.8.gz
94
 
        gzip --best --to-stdout mandos.conf.5 \
95
 
                > /usr/share/man/man5/mandos.conf.5.gz
96
 
        gzip --best --to-stdout mandos-clients.conf.5 \
97
 
                > /usr/share/man/man5/mandos-clients.conf.5.gz
98
 
 
99
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
100
 
        mkdir --mode=0755 --parents /usr/lib/mandos /etc/mandos
101
 
        -mkdir --mode=0700 /usr/lib/mandos/plugins.d
102
 
        chmod u=rwx,g=,o= /usr/lib/mandos/plugins.d
103
 
        install --mode=0755 --target-directory=/usr/lib/mandos \
104
 
                mandos-client
105
 
        install --mode=0755 --target-directory=/usr/sbin mandos-keygen
106
 
        install --mode=0755 \
107
 
                --target-directory=/usr/lib/mandos/plugins.d \
108
 
                plugins.d/password-prompt
109
 
        install --mode=4755 \
110
 
                --target-directory=/usr/lib/mandos/plugins.d \
111
 
                plugins.d/password-request
112
 
        install initramfs-tools-hook \
113
 
                /usr/share/initramfs-tools/hooks/mandos
114
 
        install initramfs-tools-hook-conf \
115
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
116
 
        gzip --best --to-stdout mandos-keygen.8 \
117
 
                > /usr/share/man/man8/mandos-keygen.8.gz
118
 
        gzip --best --to-stdout mandos-client.8mandos \
119
 
                > /usr/share/man/man8/mandos-client.8mandos.gz
120
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
121
 
                > /usr/share/man/man8/password-prompt.8mandos.gz
122
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
123
 
                > /usr/share/man/man8/password-request.8mandos.gz
124
 
        -/usr/sbin/mandos-keygen
125
 
        update-initramfs -k all -u
126
 
 
127
 
uninstall: uninstall-server uninstall-client
128
 
 
129
 
uninstall-server: /usr/sbin/mandos
130
 
        -rm --force /usr/sbin/mandos /usr/share/man/man8/mandos.8.gz \
131
 
                /usr/share/man/man5/mandos.conf.5.gz \
132
 
                /usr/share/man/man5/mandos-clients.conf.5.gz
133
 
        -rmdir /etc/mandos
134
 
 
135
 
uninstall-client:
136
 
# Refuse to uninstall client if /etc/crypttab is configured to use it
137
 
        ! grep --regexp='^ *[^ #].*keyscript=/usr/lib/mandos/mandos-client' \
138
 
                /etc/crypttab
139
 
        -rm --force /usr/sbin/mandos-keygen \
140
 
                /usr/lib/mandos/mandos-client \
141
 
                /usr/lib/mandos/plugins.d/password-prompt \
142
 
                /usr/lib/mandos/plugins.d/password-request \
143
 
                /usr/share/initramfs-tools/hooks/mandos \
144
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
145
 
                /usr/share/man/man8/mandos-client.8mandos.gz \
146
 
                /usr/share/man/man8/mandos-keygen.8.gz \
147
 
                /usr/share/man/man8/password-prompt.8mandos.gz \
148
 
                /usr/share/man/man8/password-request.8mandos.gz
149
 
        -rmdir /usr/lib/mandos/plugins.d /usr/lib/mandos \
150
 
                /etc/mandos/plugins.d /etc/mandos
151
 
 
152
 
purge: purge-server purge-client
153
 
 
154
 
purge-server: uninstall-server
155
 
        -rm --force /etc/mandos/mandos.conf /etc/mandos/clients.conf
156
 
        -rmdir /etc/mandos
157
 
 
158
 
purge-client: uninstall-client
159
 
        -rm --force /etc/mandos/seckey.txt /etc/mandos/pubkey.txt
160
 
        -rmdir /etc/mandos /etc/mandos/plugins.d
 
28
        -rm -f $(PROGS) $(objects) core