/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-05 23:39:07 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905233907-3rz7kuwyjwma0pjx
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
  (install-server): Set mode of "/etc/mandos/clients.conf" to
                             "u=rw".
  (install-client): Set mode of "/etc/mandos/plugins.d" to "u=rwx".
  (uninstall-client): Also remove "/usr/lib/mandos/plugins.d/usplash",
                "/usr/share/initramfs-tools/scripts/local-top/mandos",
                      and "/etc/keys/mandos".
  (purge-server): Also remove "/var/run/mandos.pid".

* initramfs-tools-hook: Use "install" instead of "mkdir".  Change
                        owner of "/lib/mandos/plugins.d" and key
                        files.  Bug fix: do not repair permissions of
                        "/lib/mandos/plugins.d".  Bug fix: Really
                        avoid deliberately unreadable files and/or
                        directories.

* mandos-keygen (umask): Changed to "077".

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