/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 16:24:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905162433-58fgx91ae9foxlh1
* Makefile (PIDDIR, USER, GROUP): Removed.
  (install-server): Do not create $(PIDDIR).
  (uninstall-server): Do not remove $(PIDDIR).

* init.d-mandos (PIDFILE): Changed to "/var/run/$NAME.pid".

* mandos (IPv6_TCPServer.enabled): New attribute.
  (IPv6_TCPServer.server_activate): Only call method of superclass if
                                    "self.enabled".
  (IPv6_TCPServer.enable): Set "self.enabled" to True.
  (main): Create client Set() early.  Create IPv6_TCPServer object
          early.  Switch to user and group "mandos", "nobody" or
          65534, if possible.  Enable IPv6_TCPServer *after* switching
          user.

* mandos-keygen (KEYDIR): Changed to "/etc/keys/mandos".

* mandos.xml (FILES): Changed PID file.
  (SECURITY): The server does need to be privileged, but switches to a
              non-privileged user.

* plugin-runner.xml (EXAMPLE): Changed long example to something more
                               realistic.

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