/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-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

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