/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-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

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