/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: 2008-09-19 23:31:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080919233134-h56et87wkgisbk85
* mandos-keygen: New "--passfile" option.  Confirm entered password.

* mandos-keygen.xml (SYNOPSIS, OPTIONS): New "--passfile" option.

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 -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
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
13
13
#COVERAGE=--coverage
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
 
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
17
26
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
27
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=$(DESTDIR)/usr/share/man
 
28
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
29
MANDIR=$(PREFIX)/share/man
 
30
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
31
##
22
32
 
23
33
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
32
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
43
LDFLAGS=$(COVERAGE)
34
44
 
35
 
# Commands to format a DocBook refentry document into a manual page
 
45
# Commands to format a DocBook <refentry> document into a manual page
36
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
37
47
        --param man.charmap.use.subset          0 \
38
48
        --param make.year.ranges                1 \
42
52
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
43
53
        $(notdir $<); \
44
54
        $(MANPOST) $(notdir $@)
45
 
# DocBook-to-man post-processing to fix a \n escape bug
 
55
# DocBook-to-man post-processing to fix a '\n' escape bug
46
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
47
57
 
48
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
49
59
PROGS=plugin-runner $(PLUGINS)
50
60
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
51
 
        plugins.d/password-request.8mandos \
 
61
        plugins.d/mandos-client.8mandos \
52
62
        plugins.d/password-prompt.8mandos mandos.conf.5 \
53
63
        mandos-clients.conf.5
54
64
 
67
77
%.8mandos: %.xml legalnotice.xml
68
78
        $(DOCBOOKTOMAN)
69
79
 
70
 
mandos.8: mandos.xml mandos-options.xml
71
 
        $(DOCBOOKTOMAN)
72
 
 
73
 
mandos.conf.5: mandos.conf.xml mandos-options.xml
74
 
        $(DOCBOOKTOMAN)
75
 
 
76
 
plugins.d/password-request: plugins.d/password-request.o
 
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
77
98
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
78
99
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
79
100
 
92
113
check:
93
114
        ./mandos --check
94
115
 
95
 
# Run the server with a local key
96
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
 
        keydir/secring.gpg keydir/pubring.gpg
 
116
# Run the client with a local config and key
 
117
run-client: all keydir/seckey.txt keydir/pubkey.txt
98
118
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
 
119
                --config-file=plugin-runner.conf \
 
120
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
100
121
 
101
122
# Used by run-client
102
 
keydir/secring.gpg: keydir/seckey.txt
103
 
        gpg --homedir $(dir $<) --import $^
104
 
keydir/pubring.gpg: keydir/pubkey.txt
105
 
        gpg --homedir $(dir $<) --import $^
106
123
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
124
        install --directory keydir
108
125
        ./mandos-keygen --dir keydir --force
114
131
# Used by run-server
115
132
confdir/mandos.conf: mandos.conf
116
133
        install --directory confdir
117
 
        install $^ $@
 
134
        install --mode=u=rw,go=r $^ $@
118
135
confdir/clients.conf: clients.conf keydir/seckey.txt
119
136
        install --directory confdir
120
 
        install clients.conf $@
 
137
        install --mode=u=rw $< $@
121
138
# Add a client password
122
139
        ./mandos-keygen --dir keydir --password >> $@
123
140
 
124
 
install: install-server install-client
 
141
install: install-server install-client-nokey
125
142
 
126
143
install-server: doc
127
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
128
 
                $(MANDIR)/man8
129
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
130
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
131
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
144
        install --directory $(CONFDIR)
 
145
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
146
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
 
147
                mandos.conf
 
148
        install --mode=u=rw --target-directory=$(CONFDIR) \
132
149
                clients.conf
 
150
        install --mode=u=rwx,go=rx init.d-mandos \
 
151
                $(DESTDIR)/etc/init.d/mandos
 
152
        install --mode=u=rw,go=r default-mandos \
 
153
                $(DESTDIR)/etc/default/mandos
 
154
        if [ -z $(DESTDIR) ]; then update-rc.d mandos defaults; fi
133
155
        gzip --best --to-stdout mandos.8 \
134
156
                > $(MANDIR)/man8/mandos.8.gz
135
157
        gzip --best --to-stdout mandos.conf.5 \
137
159
        gzip --best --to-stdout mandos-clients.conf.5 \
138
160
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
139
161
 
140
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
141
 
        install --directory --parents $(PREFIX)/lib/mandos \
142
 
                $(CONFDIR) $(MANDIR)/man8
143
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
144
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
145
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
146
 
                plugin-runner
147
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
162
install-client-nokey: all doc
 
163
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
164
        install --directory --mode=u=rwx $(KEYDIR) \
 
165
                $(PREFIX)/lib/mandos/plugins.d
 
166
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
167
                install --mode=u=rwx \
 
168
                        --directory "$(CONFDIR)/plugins.d" && \
 
169
        fi
 
170
        install --mode=u=rwx,go=rx \
 
171
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
172
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
148
173
                mandos-keygen
149
 
        install --mode=0755 \
 
174
        install --mode=u=rwx,go=rx \
150
175
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
151
176
                plugins.d/password-prompt
152
 
        install --mode=4755 \
153
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
154
 
                plugins.d/password-request
 
177
        install --mode=u=rwxs,go=rx \
 
178
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
179
                plugins.d/mandos-client
 
180
        install --mode=u=rwx,go=rx \
 
181
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
182
                plugins.d/usplash
155
183
        install initramfs-tools-hook \
156
 
                /usr/share/initramfs-tools/hooks/mandos
157
 
        install initramfs-tools-hook-conf \
158
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
184
                $(INITRAMFSTOOLS)/hooks/mandos
 
185
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
186
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
159
187
        install initramfs-tools-script \
160
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
188
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
189
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
161
190
        gzip --best --to-stdout mandos-keygen.8 \
162
191
                > $(MANDIR)/man8/mandos-keygen.8.gz
163
192
        gzip --best --to-stdout plugin-runner.8mandos \
164
193
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
165
194
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
166
195
                > $(MANDIR)/man8/password-prompt.8mandos.gz
167
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
168
 
                > $(MANDIR)/man8/password-request.8mandos.gz
169
 
        -$(PREFIX)/sbin/mandos-keygen
 
196
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
197
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
198
 
 
199
install-client: install-client-nokey
 
200
# Post-installation stuff
 
201
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
170
202
        update-initramfs -k all -u
 
203
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
171
204
 
172
205
uninstall: uninstall-server uninstall-client
173
206
 
174
 
uninstall-server: $(PREFIX)/sbin/mandos
 
207
uninstall-server:
175
208
        -rm --force $(PREFIX)/sbin/mandos \
176
209
                $(MANDIR)/man8/mandos.8.gz \
177
210
                $(MANDIR)/man5/mandos.conf.5.gz \
178
211
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
212
        update-rc.d -f mandos remove
179
213
        -rmdir $(CONFDIR)
180
214
 
181
215
uninstall-client:
182
216
# Refuse to uninstall client if /etc/crypttab is explicitly configured
183
217
# to use it.
184
218
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
185
 
                /etc/crypttab
 
219
                $(DESTDIR)/etc/crypttab
186
220
        -rm --force $(PREFIX)/sbin/mandos-keygen \
187
221
                $(PREFIX)/lib/mandos/plugin-runner \
188
222
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
189
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
190
 
                /usr/share/initramfs-tools/hooks/mandos \
191
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
223
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
224
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
225
                $(INITRAMFSTOOLS)/hooks/mandos \
 
226
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
227
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
192
228
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
193
229
                $(MANDIR)/man8/mandos-keygen.8.gz \
194
230
                $(MANDIR)/man8/password-prompt.8mandos.gz \
195
 
                $(MANDIR)/man8/password-request.8mandos.gz
 
231
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
232
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
233
                rm --force $(CONFDIR)/plugins.d/README; \
 
234
        fi
196
235
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
197
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
236
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
198
237
        update-initramfs -k all -u
199
238
 
200
239
purge: purge-server purge-client
201
240
 
202
241
purge-server: uninstall-server
203
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
242
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
243
                $(DESTDIR)/etc/default/mandos \
 
244
                $(DESTDIR)/etc/init.d/mandos \
 
245
                $(DESTDIR)/var/run/mandos.pid
204
246
        -rmdir $(CONFDIR)
205
247
 
206
248
purge-client: uninstall-client
207
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
208
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
249
        -shred --remove $(KEYDIR)/seckey.txt
 
250
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
251
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
252
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)