/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-12 19:12:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080912191240-edjlcll43eoijkx0
* Makefile (install): Use "install-client-nokey".
  (install-server): Create "/etc/default" and "/usr/sbin", too.
  (install-client): Do not depend on "$(INITRAMFSTOOLS)/hooks/.".
                    Renamed to "install-client-nokey".  Split out
                    post-installation-stuff to new "install-client"
                    target.

* mandos-clients.conf.xml: White space adjustments.
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -

* overview.xml: Improved grammar.

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