/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-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
 
# KEYDIR=/usr/local/lib/mandos/keys
21
28
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
29
MANDIR=$(PREFIX)/share/man
 
30
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
31
##
24
32
 
25
33
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
34
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
43
LDFLAGS=$(COVERAGE)
36
44
 
37
 
# Commands to format a DocBook refentry document into a manual page
 
45
# Commands to format a DocBook <refentry> document into a manual page
38
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
39
47
        --param man.charmap.use.subset          0 \
40
48
        --param make.year.ranges                1 \
44
52
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
53
        $(notdir $<); \
46
54
        $(MANPOST) $(notdir $@)
47
 
# DocBook-to-man post-processing to fix a \n escape bug
 
55
# DocBook-to-man post-processing to fix a '\n' escape bug
48
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
57
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
51
59
PROGS=plugin-runner $(PLUGINS)
52
60
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
 
        plugins.d/password-request.8mandos \
 
61
        plugins.d/mandos-client.8mandos \
54
62
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
63
        mandos-clients.conf.5
56
64
 
81
89
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
90
        $(DOCBOOKTOMAN)
83
91
 
84
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
 
92
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
85
93
                                        mandos-options.xml \
86
94
                                        overview.xml legalnotice.xml
87
95
        $(DOCBOOKTOMAN)
88
96
 
89
 
plugins.d/password-request: plugins.d/password-request.o
 
97
plugins.d/mandos-client: plugins.d/mandos-client.o
90
98
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
99
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
100
 
109
117
run-client: all keydir/seckey.txt keydir/pubkey.txt
110
118
        ./plugin-runner --plugin-dir=plugins.d \
111
119
                --config-file=plugin-runner.conf \
112
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
120
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
113
121
 
114
122
# Used by run-client
115
123
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
126
134
        install --mode=u=rw,go=r $^ $@
127
135
confdir/clients.conf: clients.conf keydir/seckey.txt
128
136
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
137
        install --mode=u=rw $< $@
130
138
# Add a client password
131
139
        ./mandos-keygen --dir keydir --password >> $@
132
140
 
138
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
147
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
148
                mandos.conf
141
 
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
 
149
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
150
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
 
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
145
155
        update-rc.d mandos defaults
146
156
        gzip --best --to-stdout mandos.8 \
147
157
                > $(MANDIR)/man8/mandos.8.gz
150
160
        gzip --best --to-stdout mandos-clients.conf.5 \
151
161
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
162
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
163
install-client: all doc $(INITRAMFSTOOLS)/hooks/.
154
164
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
165
                $(MANDIR)/man8
156
166
        install --directory --mode=u=rwx $(KEYDIR)
157
167
        install --directory --mode=u=rwx \
158
168
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)/plugins.d" \
160
 
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                        install --directory "$(CONFDIR)/plugins.d"; \
162
 
                fi
 
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
163
175
        install --mode=u=rwx,go=rx \
164
176
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
165
177
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
169
181
                plugins.d/password-prompt
170
182
        install --mode=u=rwxs,go=rx \
171
183
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
172
 
                plugins.d/password-request
 
184
                plugins.d/mandos-client
173
185
        install --mode=u=rwx,go=rx \
174
186
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
175
187
                plugins.d/usplash
176
188
        install initramfs-tools-hook \
177
 
                /usr/share/initramfs-tools/hooks/mandos
 
189
                $(INITRAMFSTOOLS)/hooks/mandos
178
190
        install initramfs-tools-hook-conf \
179
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
191
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
180
192
        install initramfs-tools-script \
181
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
193
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
182
194
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
183
195
        gzip --best --to-stdout mandos-keygen.8 \
184
196
                > $(MANDIR)/man8/mandos-keygen.8.gz
186
198
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
187
199
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
188
200
                > $(MANDIR)/man8/password-prompt.8mandos.gz
189
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
190
 
                > $(MANDIR)/man8/password-request.8mandos.gz
 
201
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
202
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
203
# Post-installation stuff
191
204
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
192
205
        update-initramfs -k all -u
193
206
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
206
219
# Refuse to uninstall client if /etc/crypttab is explicitly configured
207
220
# to use it.
208
221
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
209
 
                /etc/crypttab
 
222
                $(DESTDIR)/etc/crypttab
210
223
        -rm --force $(PREFIX)/sbin/mandos-keygen \
211
224
                $(PREFIX)/lib/mandos/plugin-runner \
212
225
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
213
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
214
 
                /usr/share/initramfs-tools/hooks/mandos \
215
 
                /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 \
216
231
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
217
232
                $(MANDIR)/man8/mandos-keygen.8.gz \
218
233
                $(MANDIR)/man8/password-prompt.8mandos.gz \
219
 
                $(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
220
238
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
221
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
239
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
222
240
        update-initramfs -k all -u
223
241
 
224
242
purge: purge-server purge-client
225
243
 
226
244
purge-server: uninstall-server
227
245
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
228
 
                /etc/default/mandos /etc/init.d/mandos
 
246
                $(DESTDIR)/etc/default/mandos \
 
247
                $(DESTDIR)/etc/init.d/mandos \
 
248
                $(DESTDIR)/var/run/mandos.pid
229
249
        -rmdir $(CONFDIR)
230
250
 
231
251
purge-client: uninstall-client