/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

fixed two bugs:
      A overbuffer flow in enviro variables causing seg fault
      A incorrect use of strsep causing seg fault

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