/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-02 17:42:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080902174253-p3wxrq7z6ccnv7fs
* plugins.d/password-request.c (main): Change default GnuTLS priority
                                       string to
                             "SECURE256":!CTYPE-X.509:+CTYPE-OPENPGP".

* plugins.d/password-request.xml (DESCRIPTION): Improve wording.
  (PURPOSE, OVERVIEW): New sections.
  (OPTIONS): Improved wording.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Commented out.

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