/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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-05 07:11:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905071124-9dq11jq5rfd6zfxf
* Makefile: Changed to use symbolic instead of octal modes throughout.
  (KEYDIR): New variable for the key directory.
  (install-server): Bug fix: remove "--parents" from install args.
  (install-client): Bug fix: - '' -  Also create key directory.  Do
                    not chmod plugin dir.  Create custom plugin directory
                    if not the same as normal plugin directory.  Add
                    "--dir" option to "mandos-keygen".  Add note about
                    running "mandos-keygen --password".
  (uninstall-server): Do not depend on the installed server binary,
                      since this made it impossible to do a purge
                      after an uninstall.
  (purge-client): Shred seckey.txt.  Use $(KEYDIR).

* README: Improved wording.

* initramfs-tools-hook: Use a loop to find prefix.  Also find keydir.
                        Remove "${DESTDIR}" from "copy_exec".  Do not
                        try to copy literal "*" if no custom plugins
                        are found.  Copy key files from keydir, not
                        config dir.  Only repair mode on directories
                        that actually exist.  Do not run chmod if
                        nothing needs repairing.

* plugin-runner.conf: New file.

Show diffs side-by-side

added added

removed removed

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