/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-07 15:42:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080907154211-sc90y38lazc4ewfq
* initramfs-tools-script: Fix permissions of "/tmp" in initrd.

* plugin-runner.c (parse_opt): Ignore empty argument strings.

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
 
79
89
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
80
90
        $(DOCBOOKTOMAN)
81
91
 
82
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
 
92
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
83
93
                                        mandos-options.xml \
84
94
                                        overview.xml legalnotice.xml
85
95
        $(DOCBOOKTOMAN)
86
96
 
87
 
plugins.d/password-request: plugins.d/password-request.o
 
97
plugins.d/mandos-client: plugins.d/mandos-client.o
88
98
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
89
99
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
90
100
 
104
114
        ./mandos --check
105
115
 
106
116
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
108
 
        keydir/secring.gpg keydir/pubring.gpg
 
117
run-client: all keydir/seckey.txt keydir/pubkey.txt
109
118
        ./plugin-runner --plugin-dir=plugins.d \
110
119
                --config-file=plugin-runner.conf \
111
 
                --options-for=password-request:--keydir=keydir
 
120
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
112
121
 
113
122
# Used by run-client
114
 
keydir/secring.gpg: keydir/seckey.txt
115
 
        gpg --homedir $(dir $<) --import $^
116
 
keydir/pubring.gpg: keydir/pubkey.txt
117
 
        gpg --homedir $(dir $<) --import $^
118
123
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
124
        install --directory keydir
120
125
        ./mandos-keygen --dir keydir --force
126
131
# Used by run-server
127
132
confdir/mandos.conf: mandos.conf
128
133
        install --directory confdir
129
 
        install $^ $@
 
134
        install --mode=u=rw,go=r $^ $@
130
135
confdir/clients.conf: clients.conf keydir/seckey.txt
131
136
        install --directory confdir
132
 
        install clients.conf $@
 
137
        install --mode=u=rw $< $@
133
138
# Add a client password
134
139
        ./mandos-keygen --dir keydir --password >> $@
135
140
 
136
141
install: install-server install-client
137
142
 
138
143
install-server: doc
139
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
144
        install --directory $(CONFDIR) $(MANDIR)/man5 \
140
145
                $(MANDIR)/man8
141
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
142
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
143
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
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) \
144
150
                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
145
156
        gzip --best --to-stdout mandos.8 \
146
157
                > $(MANDIR)/man8/mandos.8.gz
147
158
        gzip --best --to-stdout mandos.conf.5 \
149
160
        gzip --best --to-stdout mandos-clients.conf.5 \
150
161
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
151
162
 
152
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
153
 
        install --directory --parents $(PREFIX)/lib/mandos \
154
 
                $(CONFDIR) $(MANDIR)/man8
155
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
156
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
157
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
158
 
                plugin-runner
159
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
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 \
160
178
                mandos-keygen
161
 
        install --mode=0755 \
 
179
        install --mode=u=rwx,go=rx \
162
180
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
163
181
                plugins.d/password-prompt
164
 
        install --mode=4755 \
165
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
166
 
                plugins.d/password-request
 
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
167
188
        install initramfs-tools-hook \
168
 
                /usr/share/initramfs-tools/hooks/mandos
 
189
                $(INITRAMFSTOOLS)/hooks/mandos
169
190
        install initramfs-tools-hook-conf \
170
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
191
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
171
192
        install initramfs-tools-script \
172
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
193
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
194
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
173
195
        gzip --best --to-stdout mandos-keygen.8 \
174
196
                > $(MANDIR)/man8/mandos-keygen.8.gz
175
197
        gzip --best --to-stdout plugin-runner.8mandos \
176
198
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
177
199
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
178
200
                > $(MANDIR)/man8/password-prompt.8mandos.gz
179
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
180
 
                > $(MANDIR)/man8/password-request.8mandos.gz
181
 
        -$(PREFIX)/sbin/mandos-keygen
 
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)"
182
205
        update-initramfs -k all -u
 
206
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
183
207
 
184
208
uninstall: uninstall-server uninstall-client
185
209
 
186
 
uninstall-server: $(PREFIX)/sbin/mandos
 
210
uninstall-server:
187
211
        -rm --force $(PREFIX)/sbin/mandos \
188
212
                $(MANDIR)/man8/mandos.8.gz \
189
213
                $(MANDIR)/man5/mandos.conf.5.gz \
190
214
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
215
        update-rc.d -f mandos remove
191
216
        -rmdir $(CONFDIR)
192
217
 
193
218
uninstall-client:
194
219
# Refuse to uninstall client if /etc/crypttab is explicitly configured
195
220
# to use it.
196
221
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
197
 
                /etc/crypttab
 
222
                $(DESTDIR)/etc/crypttab
198
223
        -rm --force $(PREFIX)/sbin/mandos-keygen \
199
224
                $(PREFIX)/lib/mandos/plugin-runner \
200
225
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
201
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
202
 
                /usr/share/initramfs-tools/hooks/mandos \
203
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
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 \
204
231
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
205
232
                $(MANDIR)/man8/mandos-keygen.8.gz \
206
233
                $(MANDIR)/man8/password-prompt.8mandos.gz \
207
 
                $(MANDIR)/man8/password-request.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
208
238
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
209
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
239
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
210
240
        update-initramfs -k all -u
211
241
 
212
242
purge: purge-server purge-client
213
243
 
214
244
purge-server: uninstall-server
215
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
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
216
249
        -rmdir $(CONFDIR)
217
250
 
218
251
purge-client: uninstall-client
219
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
220
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
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)