/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'
 
26
        --param man.authors.section.enabled     0
57
27
 
58
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
59
 
PROGS=plugin-runner $(PLUGINS)
60
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
61
 
        plugins.d/mandos-client.8mandos \
 
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 \
62
32
        plugins.d/password-prompt.8mandos mandos.conf.5 \
63
 
        mandos-clients.conf.5
 
33
         mandos-clients.conf.5
64
34
 
65
 
objects=$(addsuffix .o,$(PROGS))
 
35
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
66
36
 
67
37
all: $(PROGS)
68
38
 
69
39
doc: $(DOCS)
70
40
 
71
 
%.5: %.xml legalnotice.xml
72
 
        $(DOCBOOKTOMAN)
73
 
 
74
 
%.8: %.xml legalnotice.xml
75
 
        $(DOCBOOKTOMAN)
76
 
 
77
 
%.8mandos: %.xml legalnotice.xml
78
 
        $(DOCBOOKTOMAN)
79
 
 
80
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
81
 
        $(DOCBOOKTOMAN)
82
 
 
83
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
84
 
        $(DOCBOOKTOMAN)
85
 
 
86
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
87
 
        $(DOCBOOKTOMAN)
88
 
 
89
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
90
 
        $(DOCBOOKTOMAN)
91
 
 
92
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
93
 
                                        mandos-options.xml \
94
 
                                        overview.xml legalnotice.xml
95
 
        $(DOCBOOKTOMAN)
96
 
 
97
 
plugins.d/mandos-client: plugins.d/mandos-client.o
98
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
99
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
100
 
 
101
 
.PHONY : all doc 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 \
102
61
        install-server install-client uninstall uninstall-server \
103
62
        uninstall-client purge purge-server purge-client
104
63
 
108
67
distclean: clean
109
68
mostlyclean: clean
110
69
maintainer-clean: clean
111
 
        -rm --force --recursive keydir confdir
 
70
        -rm --force --recursive keydir
112
71
 
113
72
check:
114
73
        ./mandos --check
115
74
 
116
 
# Run the client with a local config and key
117
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
118
 
        ./plugin-runner --plugin-dir=plugins.d \
119
 
                --config-file=plugin-runner.conf \
120
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
121
 
 
122
 
# Used by run-client
123
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
124
 
        install --directory keydir
125
 
        ./mandos-keygen --dir keydir --force
126
 
 
127
 
# Run the server with a local config
128
 
run-server: confdir/mandos.conf confdir/clients.conf
129
 
        ./mandos --debug --configdir=confdir
130
 
 
131
 
# Used by run-server
132
 
confdir/mandos.conf: mandos.conf
133
 
        install --directory confdir
134
 
        install --mode=u=rw,go=r $^ $@
135
 
confdir/clients.conf: clients.conf keydir/seckey.txt
136
 
        install --directory confdir
137
 
        install --mode=u=rw $< $@
138
 
# Add a client password
139
 
        ./mandos-keygen --dir keydir --password >> $@
 
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=.
140
83
 
141
84
install: install-server install-client
142
85
 
143
86
install-server: doc
144
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
145
 
                $(MANDIR)/man8
146
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
147
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
148
 
                mandos.conf
149
 
        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 \
150
91
                clients.conf
151
 
        install --mode=u=rwx,go=rx init.d-mandos \
152
 
                $(DESTDIR)/etc/init.d/mandos
153
 
        install --mode=u=rw,go=r default-mandos \
154
 
                $(DESTDIR)/etc/default/mandos
155
 
        update-rc.d mandos defaults
156
92
        gzip --best --to-stdout mandos.8 \
157
 
                > $(MANDIR)/man8/mandos.8.gz
 
93
                > /usr/share/man/man8/mandos.8.gz
158
94
        gzip --best --to-stdout mandos.conf.5 \
159
 
                > $(MANDIR)/man5/mandos.conf.5.gz
 
95
                > /usr/share/man/man5/mandos.conf.5.gz
160
96
        gzip --best --to-stdout mandos-clients.conf.5 \
161
 
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
97
                > /usr/share/man/man5/mandos-clients.conf.5.gz
162
98
 
163
 
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
164
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
165
 
                $(MANDIR)/man8
166
 
        install --directory --mode=u=rwx $(KEYDIR)
167
 
        install --directory --mode=u=rwx \
168
 
                $(PREFIX)/lib/mandos/plugins.d
169
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
170
 
                install --mode=u=rwx \
171
 
                        --directory "$(CONFDIR)/plugins.d"; \
172
 
                install --mode=u=rw,go=r etc-plugins.d-README \
173
 
                        $(CONFDIR)/plugins.d/README ; \
174
 
        fi
175
 
        install --mode=u=rwx,go=rx \
176
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
177
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
178
 
                mandos-keygen
179
 
        install --mode=u=rwx,go=rx \
180
 
                --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 \
181
108
                plugins.d/password-prompt
182
 
        install --mode=u=rwxs,go=rx \
183
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
184
 
                plugins.d/mandos-client
185
 
        install --mode=u=rwx,go=rx \
186
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
187
 
                plugins.d/usplash
 
109
        install --mode=4755 \
 
110
                --target-directory=/usr/lib/mandos/plugins.d \
 
111
                plugins.d/password-request
188
112
        install initramfs-tools-hook \
189
 
                $(INITRAMFSTOOLS)/hooks/mandos
 
113
                /usr/share/initramfs-tools/hooks/mandos
190
114
        install initramfs-tools-hook-conf \
191
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
192
 
        install initramfs-tools-script \
193
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
194
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
115
                /usr/share/initramfs-tools/conf-hooks.d/mandos
195
116
        gzip --best --to-stdout mandos-keygen.8 \
196
 
                > $(MANDIR)/man8/mandos-keygen.8.gz
197
 
        gzip --best --to-stdout plugin-runner.8mandos \
198
 
                > $(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
199
120
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
200
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
201
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
202
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
203
 
# Post-installation stuff
204
 
        -$(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
205
125
        update-initramfs -k all -u
206
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
207
126
 
208
127
uninstall: uninstall-server uninstall-client
209
128
 
210
 
uninstall-server:
211
 
        -rm --force $(PREFIX)/sbin/mandos \
212
 
                $(MANDIR)/man8/mandos.8.gz \
213
 
                $(MANDIR)/man5/mandos.conf.5.gz \
214
 
                $(MANDIR)/man5/mandos-clients.conf.5.gz
215
 
        update-rc.d -f mandos remove
216
 
        -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
217
134
 
218
135
uninstall-client:
219
 
# Refuse to uninstall client if /etc/crypttab is explicitly configured
220
 
# to use it.
221
 
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
222
 
                $(DESTDIR)/etc/crypttab
223
 
        -rm --force $(PREFIX)/sbin/mandos-keygen \
224
 
                $(PREFIX)/lib/mandos/plugin-runner \
225
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
226
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
227
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
228
 
                $(INITRAMFSTOOLS)/hooks/mandos \
229
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
230
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
231
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
232
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
233
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
234
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
235
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
236
 
                rm --force $(CONFDIR)/plugins.d/README; \
237
 
        fi
238
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
239
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
240
 
        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
241
151
 
242
152
purge: purge-server purge-client
243
153
 
244
154
purge-server: uninstall-server
245
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
246
 
                $(DESTDIR)/etc/default/mandos \
247
 
                $(DESTDIR)/etc/init.d/mandos \
248
 
                $(DESTDIR)/var/run/mandos.pid
249
 
        -rmdir $(CONFDIR)
 
155
        -rm --force /etc/mandos/mandos.conf /etc/mandos/clients.conf
 
156
        -rmdir /etc/mandos
250
157
 
251
158
purge-client: uninstall-client
252
 
        -shred --remove $(KEYDIR)/seckey.txt
253
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
254
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
255
 
        -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