/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

* init.d-mandos: Bug fix: Correct the LSB header.

* mandos.xml (CHECKING): Add text about client disabling requiring
                         manual intervention to reverse.

* plugin-runner.c: Cast return value of TEMP_FAILURE_RETRY to "int"
                   where necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
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
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
13
15
#COVERAGE=--coverage
14
16
OPTIMIZE=-Os
15
17
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
 
18
htmldir=man
 
19
version=1.0.11
 
20
SED=sed
 
21
 
 
22
## Use these settings for a traditional /usr/local install
 
23
# PREFIX=$(DESTDIR)/usr/local
 
24
# CONFDIR=$(DESTDIR)/etc/mandos
 
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
26
# MANDIR=$(PREFIX)/man
 
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
28
##
 
29
 
 
30
## These settings are for a package-type install
17
31
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
32
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
34
MANDIR=$(PREFIX)/share/man
 
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
36
##
24
37
 
25
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
27
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
28
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
29
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
30
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
31
45
 
32
46
# Do not change these two
33
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
34
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
 
LDFLAGS=$(COVERAGE)
 
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
49
        -DVERSION='"$(version)"'
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
36
51
 
37
 
# Commands to format a DocBook refentry document into a manual page
 
52
# Commands to format a DocBook <refentry> document into a manual page
38
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
39
54
        --param man.charmap.use.subset          0 \
40
55
        --param make.year.ranges                1 \
44
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
60
        $(notdir $<); \
46
61
        $(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'
49
 
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
51
 
PROGS=plugin-runner $(PLUGINS)
 
62
# DocBook-to-man post-processing to fix a '\n' escape bug
 
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
64
 
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
66
        --param make.year.ranges                1 \
 
67
        --param make.single.year.ranges         1 \
 
68
        --param man.output.quietly              1 \
 
69
        --param man.authors.section.enabled     0 \
 
70
        --param citerefentry.link               1 \
 
71
        --output $@ \
 
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
73
        $<; $(HTMLPOST) $@
 
74
# Fix citerefentry links
 
75
HTMLPOST=$(SED) --in-place \
 
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
77
 
 
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
80
CPROGS=plugin-runner $(PLUGINS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
52
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
83
        plugins.d/mandos-client.8mandos \
54
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
 
        mandos-clients.conf.5
56
 
 
57
 
objects=$(addsuffix .o,$(PROGS))
58
 
 
59
 
all: $(PROGS)
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
87
 
 
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
89
 
 
90
objects=$(addsuffix .o,$(CPROGS))
 
91
 
 
92
all: $(PROGS) mandos.lsm
60
93
 
61
94
doc: $(DOCS)
62
95
 
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)
 
96
html: $(htmldocs)
 
97
 
 
98
%.5: %.xml common.ent legalnotice.xml
 
99
        $(DOCBOOKTOMAN)
 
100
%.5.xhtml: %.xml common.ent legalnotice.xml
 
101
        $(DOCBOOKTOHTML)
 
102
 
 
103
%.8: %.xml common.ent legalnotice.xml
 
104
        $(DOCBOOKTOMAN)
 
105
%.8.xhtml: %.xml common.ent legalnotice.xml
 
106
        $(DOCBOOKTOHTML)
 
107
 
 
108
%.8mandos: %.xml common.ent legalnotice.xml
 
109
        $(DOCBOOKTOMAN)
 
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
111
        $(DOCBOOKTOHTML)
 
112
 
 
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
114
                legalnotice.xml
 
115
        $(DOCBOOKTOMAN)
 
116
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
117
                overview.xml legalnotice.xml
 
118
        $(DOCBOOKTOHTML)
 
119
 
 
120
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
121
                legalnotice.xml
 
122
        $(DOCBOOKTOMAN)
 
123
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
124
                 legalnotice.xml
 
125
        $(DOCBOOKTOHTML)
 
126
 
 
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
128
                legalnotice.xml
 
129
        $(DOCBOOKTOMAN)
 
130
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
131
                legalnotice.xml
 
132
        $(DOCBOOKTOHTML)
 
133
 
 
134
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
135
                legalnotice.xml
 
136
        $(DOCBOOKTOMAN)
 
137
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
138
                overview.xml legalnotice.xml
 
139
        $(DOCBOOKTOHTML)
83
140
 
84
141
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
142
                                        common.ent \
85
143
                                        mandos-options.xml \
86
144
                                        overview.xml legalnotice.xml
87
145
        $(DOCBOOKTOMAN)
 
146
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
147
                                        common.ent \
 
148
                                        mandos-options.xml \
 
149
                                        overview.xml legalnotice.xml
 
150
        $(DOCBOOKTOHTML)
 
151
 
 
152
# Update all these files with version number $(version)
 
153
common.ent: Makefile
 
154
        $(SED) --in-place \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
156
                $@
 
157
 
 
158
mandos: Makefile
 
159
        $(SED) --in-place \
 
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
161
                $@
 
162
 
 
163
mandos-keygen: Makefile
 
164
        $(SED) --in-place \
 
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
166
                $@
 
167
 
 
168
mandos-ctl: Makefile
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
 
172
 
 
173
mandos.lsm: Makefile
 
174
        $(SED) --in-place \
 
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
176
                $@
 
177
        $(SED) --in-place \
 
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
179
                $@
 
180
        $(SED) --in-place \
 
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
182
                $@
88
183
 
89
184
plugins.d/mandos-client: plugins.d/mandos-client.o
90
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
187
 
93
 
.PHONY : all doc clean distclean run-client run-server install \
 
188
.PHONY : all doc html clean distclean run-client run-server install \
94
189
        install-server install-client uninstall uninstall-server \
95
190
        uninstall-client purge purge-server purge-client
96
191
 
97
192
clean:
98
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
193
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
99
194
 
100
195
distclean: clean
101
196
mostlyclean: clean
102
197
maintainer-clean: clean
103
198
        -rm --force --recursive keydir confdir
104
199
 
105
 
check:
 
200
check:  all
106
201
        ./mandos --check
107
202
 
108
203
# Run the client with a local config and key
109
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
110
205
        ./plugin-runner --plugin-dir=plugins.d \
111
206
                --config-file=plugin-runner.conf \
112
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
208
                $(CLIENTARGS)
113
209
 
114
210
# Used by run-client
115
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
118
214
 
119
215
# Run the server with a local config
120
216
run-server: confdir/mandos.conf confdir/clients.conf
121
 
        ./mandos --debug --configdir=confdir
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
122
218
 
123
219
# Used by run-server
124
220
confdir/mandos.conf: mandos.conf
130
226
# Add a client password
131
227
        ./mandos-keygen --dir keydir --password >> $@
132
228
 
133
 
install: install-server install-client
 
229
install: install-server install-client-nokey
 
230
 
 
231
install-html: html
 
232
        install --directory $(htmldir)
 
233
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
234
                $(htmldocs)
134
235
 
135
236
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
 
                $(MANDIR)/man8
 
237
        install --directory $(CONFDIR)
138
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
240
                mandos.conf
141
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
242
                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
 
243
        install --mode=u=rwx,go=rx init.d-mandos \
 
244
                $(DESTDIR)/etc/init.d/mandos
 
245
        install --mode=u=rw,go=r default-mandos \
 
246
                $(DESTDIR)/etc/default/mandos
 
247
        if [ -z $(DESTDIR) ]; then \
 
248
                update-rc.d mandos defaults 25 15;\
 
249
        fi
146
250
        gzip --best --to-stdout mandos.8 \
147
251
                > $(MANDIR)/man8/mandos.8.gz
148
252
        gzip --best --to-stdout mandos.conf.5 \
150
254
        gzip --best --to-stdout mandos-clients.conf.5 \
151
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
256
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
 
257
install-client-nokey: all doc
 
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
259
        install --directory --mode=u=rwx $(KEYDIR) \
158
260
                $(PREFIX)/lib/mandos/plugins.d
159
261
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
160
262
                install --mode=u=rwx \
161
263
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
264
        fi
165
265
        install --mode=u=rwx,go=rx \
166
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
172
272
        install --mode=u=rwxs,go=rx \
173
273
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
274
                plugins.d/mandos-client
175
 
        install --mode=u=rwx,go=rx \
 
275
        install --mode=u=rwxs,go=rx \
176
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
277
                plugins.d/usplash
 
278
        install --mode=u=rwxs,go=rx \
 
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
280
                plugins.d/splashy
 
281
        install --mode=u=rwxs,go=rx \
 
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
283
                plugins.d/askpass-fifo
178
284
        install initramfs-tools-hook \
179
 
                /usr/share/initramfs-tools/hooks/mandos
180
 
        install initramfs-tools-hook-conf \
181
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
285
                $(INITRAMFSTOOLS)/hooks/mandos
 
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
182
288
        install initramfs-tools-script \
183
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
184
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
291
        gzip --best --to-stdout mandos-keygen.8 \
186
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
190
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
192
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
300
                > $(MANDIR)/man8/usplash.8mandos.gz
 
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
302
                > $(MANDIR)/man8/splashy.8mandos.gz
 
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
305
 
 
306
install-client: install-client-nokey
193
307
# Post-installation stuff
194
308
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
195
309
        update-initramfs -k all -u
209
323
# Refuse to uninstall client if /etc/crypttab is explicitly configured
210
324
# to use it.
211
325
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
212
 
                /etc/crypttab
 
326
                $(DESTDIR)/etc/crypttab
213
327
        -rm --force $(PREFIX)/sbin/mandos-keygen \
214
328
                $(PREFIX)/lib/mandos/plugin-runner \
215
329
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
217
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
 
                /usr/share/initramfs-tools/hooks/mandos \
219
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
 
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
334
                $(INITRAMFSTOOLS)/hooks/mandos \
 
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
221
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
340
                $(MANDIR)/man8/usplash.8mandos.gz \
 
341
                $(MANDIR)/man8/splashy.8mandos.gz \
 
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
224
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
228
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
230
346
        update-initramfs -k all -u
233
349
 
234
350
purge-server: uninstall-server
235
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
352
                $(DESTDIR)/etc/default/mandos \
 
353
                $(DESTDIR)/etc/init.d/mandos \
 
354
                $(DESTDIR)/var/run/mandos.pid
238
355
        -rmdir $(CONFDIR)
239
356
 
240
357
purge-client: uninstall-client