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