/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

Added configuration files support for mandos-client
Removed plus argument support for mandos-client

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
9
 
#DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
 
8
        -Wvolatile-register-var
 
9
DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
16
 
17
 
## Use these settings for a traditional /usr/local install
18
 
# PREFIX=$(DESTDIR)/usr/local
19
 
# CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
21
 
# MANDIR=$(PREFIX)/man
22
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
23
 
##
24
 
 
25
 
## These settings are for a package-type install
26
 
PREFIX=$(DESTDIR)/usr
27
 
CONFDIR=$(DESTDIR)/etc/mandos
28
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
29
 
MANDIR=$(PREFIX)/share/man
30
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
31
 
##
32
 
 
33
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
34
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
35
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
36
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
37
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
38
 
GPGME_LIBS=$(shell gpgme-config --libs)
39
 
 
40
17
# Do not change these two
41
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
42
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
18
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
43
19
LDFLAGS=$(COVERAGE)
44
20
 
45
 
# Commands to format a DocBook <refentry> document into a manual page
46
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
21
DOCBOOKTOMAN=xsltproc --nonet \
47
22
        --param man.charmap.use.subset          0 \
48
23
        --param make.year.ranges                1 \
49
24
        --param make.single.year.ranges         1 \
50
25
        --param man.output.quietly              1 \
51
 
        --param man.authors.section.enabled     0 \
52
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
53
 
        $(notdir $<); \
54
 
        $(MANPOST) $(notdir $@)
55
 
# DocBook-to-man post-processing to fix a '\n' escape bug
56
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
 
 
58
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
59
 
        --param make.year.ranges                1 \
60
 
        --param make.single.year.ranges         1 \
61
 
        --param man.output.quietly              1 \
62
 
        --param man.authors.section.enabled     0 \
63
 
        --param citerefentry.link               1 \
64
 
        --output $@ \
65
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
66
 
        $<; $(HTMLPOST) $@
67
 
# Fix citerefentry links
68
 
HTMLPOST=sed --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
69
 
 
70
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
71
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
72
 
PROGS=plugin-runner $(PLUGINS)
73
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
74
 
        plugins.d/mandos-client.8mandos \
 
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 \
75
32
        plugins.d/password-prompt.8mandos mandos.conf.5 \
76
 
        mandos-clients.conf.5
77
 
 
78
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
79
 
 
80
 
objects=$(addsuffix .o,$(PROGS))
 
33
         mandos-clients.conf.5
 
34
 
 
35
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
81
36
 
82
37
all: $(PROGS)
83
38
 
84
39
doc: $(DOCS)
85
40
 
86
 
html: $(htmldocs)
87
 
 
88
 
%.5: %.xml legalnotice.xml
89
 
        $(DOCBOOKTOMAN)
90
 
%.5.xhtml: %.xml legalnotice.xml
91
 
        $(DOCBOOKTOHTML)
92
 
 
93
 
%.8: %.xml legalnotice.xml
94
 
        $(DOCBOOKTOMAN)
95
 
%.8.xhtml: %.xml legalnotice.xml
96
 
        $(DOCBOOKTOHTML)
97
 
 
98
 
%.8mandos: %.xml legalnotice.xml
99
 
        $(DOCBOOKTOMAN)
100
 
%.8mandos.xhtml: %.xml legalnotice.xml
101
 
        $(DOCBOOKTOHTML)
102
 
 
103
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
104
 
        $(DOCBOOKTOMAN)
105
 
mandos.8.xhtml: mandos.xml mandos-options.xml overview.xml \
106
 
                legalnotice.xml
107
 
        $(DOCBOOKTOHTML)
108
 
 
109
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
110
 
        $(DOCBOOKTOMAN)
111
 
mandos-keygen.8.xhtml: mandos-keygen.xml overview.xml legalnotice.xml
112
 
        $(DOCBOOKTOHTML)
113
 
 
114
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
115
 
        $(DOCBOOKTOMAN)
116
 
mandos.conf.5.xhtml: mandos.conf.xml mandos-options.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
120
 
        $(DOCBOOKTOMAN)
121
 
plugin-runner.8mandos.xhtml: plugin-runner.xml overview.xml \
122
 
                legalnotice.xml
123
 
        $(DOCBOOKTOHTML)
124
 
 
125
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
126
 
                                        mandos-options.xml \
127
 
                                        overview.xml legalnotice.xml
128
 
        $(DOCBOOKTOMAN)
129
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
130
 
                                        mandos-options.xml \
131
 
                                        overview.xml legalnotice.xml
132
 
        $(DOCBOOKTOHTML)
133
 
 
134
 
plugins.d/mandos-client: plugins.d/mandos-client.o
135
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
136
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
137
 
 
138
 
.PHONY : all doc html clean distclean run-client run-server install \
 
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
 
51
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
52
 
 
53
plugins.d/password-request: plugins.d/password-request.o
 
54
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
 
55
                $(LOADLIBES) $(LDLIBS) -o $@
 
56
 
 
57
plugins.d/password-prompt: plugins.d/password-prompt.o
 
58
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
59
 
 
60
.PHONY : all clean distclean run-client run-server install \
139
61
        install-server install-client uninstall uninstall-server \
140
62
        uninstall-client purge purge-server purge-client
141
63
 
142
64
clean:
143
 
        -rm --force $(PROGS) $(objects) $(htmldocs) $(DOCS) core
 
65
        -rm --force $(PROGS) $(objects) $(DOCS) core
144
66
 
145
67
distclean: clean
146
68
mostlyclean: clean
147
69
maintainer-clean: clean
148
 
        -rm --force --recursive keydir confdir
 
70
        -rm --force --recursive keydir
149
71
 
150
72
check:
151
73
        ./mandos --check
152
74
 
153
 
# Run the client with a local config and key
154
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
155
 
        ./plugin-runner --plugin-dir=plugins.d \
156
 
                --config-file=plugin-runner.conf \
157
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
158
 
 
159
 
# Used by run-client
160
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
161
 
        install --directory keydir
162
 
        ./mandos-keygen --dir keydir --force
163
 
 
164
 
# Run the server with a local config
165
 
run-server: confdir/mandos.conf confdir/clients.conf
166
 
        ./mandos --debug --configdir=confdir
167
 
 
168
 
# Used by run-server
169
 
confdir/mandos.conf: mandos.conf
170
 
        install --directory confdir
171
 
        install --mode=u=rw,go=r $^ $@
172
 
confdir/clients.conf: clients.conf keydir/seckey.txt
173
 
        install --directory confdir
174
 
        install --mode=u=rw $< $@
175
 
# Add a client password
176
 
        ./mandos-keygen --dir keydir --password >> $@
177
 
 
178
 
install: install-server install-client-nokey
179
 
 
180
 
install-html: $(htmldocs)
181
 
        install --directory man
182
 
        install --mode=u=rw,go=r --target-directory=man $(htmldocs)
 
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
183
85
 
184
86
install-server: doc
185
 
        install --directory $(CONFDIR)
186
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
187
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
188
 
                mandos.conf
189
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
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 \
190
91
                clients.conf
191
 
        install --mode=u=rwx,go=rx init.d-mandos \
192
 
                $(DESTDIR)/etc/init.d/mandos
193
 
        install --mode=u=rw,go=r default-mandos \
194
 
                $(DESTDIR)/etc/default/mandos
195
 
        if [ -z $(DESTDIR) ]; then \
196
 
                update-rc.d mandos defaults 25 15;\
197
 
        fi
198
92
        gzip --best --to-stdout mandos.8 \
199
 
                > $(MANDIR)/man8/mandos.8.gz
 
93
                > /usr/share/man/man8/mandos.8.gz
200
94
        gzip --best --to-stdout mandos.conf.5 \
201
 
                > $(MANDIR)/man5/mandos.conf.5.gz
 
95
                > /usr/share/man/man5/mandos.conf.5.gz
202
96
        gzip --best --to-stdout mandos-clients.conf.5 \
203
 
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
97
                > /usr/share/man/man5/mandos-clients.conf.5.gz
204
98
 
205
 
install-client-nokey: all doc
206
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
207
 
        install --directory --mode=u=rwx $(KEYDIR) \
208
 
                $(PREFIX)/lib/mandos/plugins.d
209
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
210
 
                install --mode=u=rwx \
211
 
                        --directory "$(CONFDIR)/plugins.d"; \
212
 
        fi
213
 
        install --mode=u=rwx,go=rx \
214
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
215
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
216
 
                mandos-keygen
217
 
        install --mode=u=rwx,go=rx \
218
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
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 \
219
108
                plugins.d/password-prompt
220
 
        install --mode=u=rwxs,go=rx \
221
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
222
 
                plugins.d/mandos-client
223
 
        install --mode=u=rwxs,go=rx \
224
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
225
 
                plugins.d/usplash
226
 
        install --mode=u=rwxs,go=rx \
227
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
228
 
                plugins.d/splashy
229
 
        install --mode=u=rwxs,go=rx \
230
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
231
 
                plugins.d/askpass-fifo
 
109
        install --mode=4755 \
 
110
                --target-directory=/usr/lib/mandos/plugins.d \
 
111
                plugins.d/password-request
232
112
        install initramfs-tools-hook \
233
 
                $(INITRAMFSTOOLS)/hooks/mandos
234
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
235
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
236
 
        install initramfs-tools-script \
237
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
238
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
113
                /usr/share/initramfs-tools/hooks/mandos
 
114
        install initramfs-tools-hook-conf \
 
115
                /usr/share/initramfs-tools/conf-hooks.d/mandos
239
116
        gzip --best --to-stdout mandos-keygen.8 \
240
 
                > $(MANDIR)/man8/mandos-keygen.8.gz
241
 
        gzip --best --to-stdout plugin-runner.8mandos \
242
 
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
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
243
120
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
244
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
245
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
246
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
247
 
 
248
 
install-client: install-client-nokey
249
 
# Post-installation stuff
250
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
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
251
125
        update-initramfs -k all -u
252
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
253
126
 
254
127
uninstall: uninstall-server uninstall-client
255
128
 
256
 
uninstall-server:
257
 
        -rm --force $(PREFIX)/sbin/mandos \
258
 
                $(MANDIR)/man8/mandos.8.gz \
259
 
                $(MANDIR)/man5/mandos.conf.5.gz \
260
 
                $(MANDIR)/man5/mandos-clients.conf.5.gz
261
 
        update-rc.d -f mandos remove
262
 
        -rmdir $(CONFDIR)
 
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
263
134
 
264
135
uninstall-client:
265
 
# Refuse to uninstall client if /etc/crypttab is explicitly configured
266
 
# to use it.
267
 
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
268
 
                $(DESTDIR)/etc/crypttab
269
 
        -rm --force $(PREFIX)/sbin/mandos-keygen \
270
 
                $(PREFIX)/lib/mandos/plugin-runner \
271
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
272
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
273
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
274
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
275
 
                $(INITRAMFSTOOLS)/hooks/mandos \
276
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
277
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
278
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
279
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
280
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
281
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
282
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
283
 
                rm --force $(CONFDIR)/plugins.d/README; \
284
 
        fi
285
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
286
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
287
 
        update-initramfs -k all -u
 
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
288
151
 
289
152
purge: purge-server purge-client
290
153
 
291
154
purge-server: uninstall-server
292
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
293
 
                $(DESTDIR)/etc/default/mandos \
294
 
                $(DESTDIR)/etc/init.d/mandos \
295
 
                $(DESTDIR)/var/run/mandos.pid
296
 
        -rmdir $(CONFDIR)
 
155
        -rm --force /etc/mandos/mandos.conf /etc/mandos/clients.conf
 
156
        -rmdir /etc/mandos
297
157
 
298
158
purge-client: uninstall-client
299
 
        -shred --remove $(KEYDIR)/seckey.txt
300
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
301
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
302
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
159
        -rm --force /etc/mandos/seckey.txt /etc/mandos/pubkey.txt
 
160
        -rmdir /etc/mandos /etc/mandos/plugins.d