/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-08-29 05:53:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080829055359-wkdasnyxtylmnxus
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
                        "&COMMANDNAME;".

* plugins.d/password-prompt.c (main): Improved some documentation
                                      strings.  Do perror() of
                                      tcgetattr() fails.  Add debug
                                      output if interrupted by signal.
                                      Loop over write() instead of
                                      using fwrite() when outputting
                                      password.  Add debug output if
                                      getline() returns 0, unless it
                                      was caused by a signal.  Add
                                      exit status code to debug
                                      output.

* plugins.d/password-prompt.xml: Changed all single quotes to double
                                 quotes for consistency.  Removed
                                 <?xml-stylesheet>.
  (ENTITY TIMESTAMP): New.  Automatically updated by Emacs time-stamp
                      by using Emacs local variables.
  (/refentry/refentryinfo/title): Changed to "Mandos Manual".
  (/refentry/refentryinfo/productname): Changed to "Mandos".
  (/refentry/refentryinfo/date): New; set to "&TIMESTAMP;".
  (/refentry/refentryinfo/copyright): Split copyright holders.
  (/refentry/refnamediv/refpurpose): Improved wording.
  (SYNOPSIS): Fix to use correct markup.  Add short options.
  (DESCRIPTION, OPTIONS): Improved wording.
  (OPTIONS): Improved wording.  Use more correct markup.  Document
             short options.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Document use of "cryptsource" and "crypttarget".
  (FILES): REMOVED.
  (BUGS): Add text.
  (EXAMPLE): Added some examples.
  (SECURITY): Added text.
  (SEE ALSO): Remove reference to mandos(8).  Add reference to
              crypttab(5).

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