/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-04 13:36:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080904133659-0omre4j6luosb20q
* mandos-clients.conf.xml (OPTIONS): Improved spelling.

* mandos.conf.xml (BUGS): - '' -

* mandos.xml (BUGS): - '' -

* plugin-runner.xml (NAME): Fix spelling by changing wording.
  (OPTIONS): Improved spelling.
  (EXAMPLE): Do not use obsolete "--keydir" option.  Improved wording.

* plugins.d/password-prompt.xml (DESCRIPTION): Improved spelling.
  (EXAMPLE): Add <acronym> tag.
  (SECURITY): Improved spelling.

* plugins.d/password-request.xml (SYNOPSIS): Changed replaceable to
                                             match OPTIONS section.
  (DESCRIPTION, OVERVIEW): Improved spelling.

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
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
59
 
        plugins.d/usplash plugins.d/splashy
 
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
60
49
PROGS=plugin-runner $(PLUGINS)
61
50
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
62
 
        plugins.d/mandos-client.8mandos \
 
51
        plugins.d/password-request.8mandos \
63
52
        plugins.d/password-prompt.8mandos mandos.conf.5 \
64
53
        mandos-clients.conf.5
65
54
 
90
79
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
91
80
        $(DOCBOOKTOMAN)
92
81
 
93
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
82
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
94
83
                                        mandos-options.xml \
95
84
                                        overview.xml legalnotice.xml
96
85
        $(DOCBOOKTOMAN)
97
86
 
98
 
plugins.d/mandos-client: plugins.d/mandos-client.o
 
87
plugins.d/password-request: plugins.d/password-request.o
99
88
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
100
89
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
101
90
 
115
104
        ./mandos --check
116
105
 
117
106
# Run the client with a local config and key
118
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
107
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
108
        keydir/secring.gpg keydir/pubring.gpg
119
109
        ./plugin-runner --plugin-dir=plugins.d \
120
110
                --config-file=plugin-runner.conf \
121
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
111
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
122
112
 
123
113
# Used by run-client
 
114
keydir/secring.gpg: keydir/seckey.txt
 
115
        gpg --homedir $(dir $<) --import $^
 
116
keydir/pubring.gpg: keydir/pubkey.txt
 
117
        gpg --homedir $(dir $<) --import $^
124
118
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
125
119
        install --directory keydir
126
120
        ./mandos-keygen --dir keydir --force
132
126
# Used by run-server
133
127
confdir/mandos.conf: mandos.conf
134
128
        install --directory confdir
135
 
        install --mode=u=rw,go=r $^ $@
 
129
        install $^ $@
136
130
confdir/clients.conf: clients.conf keydir/seckey.txt
137
131
        install --directory confdir
138
 
        install --mode=u=rw $< $@
 
132
        install clients.conf $@
139
133
# Add a client password
140
134
        ./mandos-keygen --dir keydir --password >> $@
141
135
 
142
 
install: install-server install-client-nokey
 
136
install: install-server install-client
143
137
 
144
138
install-server: doc
145
 
        install --directory $(CONFDIR)
146
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
147
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
148
 
                mandos.conf
149
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
139
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
140
                $(MANDIR)/man8
 
141
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
142
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
143
        install --mode=0640 --target-directory=$(CONFDIR) \
150
144
                clients.conf
151
 
        install --mode=u=rwx,go=rx init.d-mandos \
152
 
                $(DESTDIR)/etc/init.d/mandos
153
 
        install --mode=u=rw,go=r default-mandos \
154
 
                $(DESTDIR)/etc/default/mandos
155
 
        if [ -z $(DESTDIR) ]; then \
156
 
                update-rc.d mandos defaults 25 15;\
157
 
        fi
158
145
        gzip --best --to-stdout mandos.8 \
159
146
                > $(MANDIR)/man8/mandos.8.gz
160
147
        gzip --best --to-stdout mandos.conf.5 \
162
149
        gzip --best --to-stdout mandos-clients.conf.5 \
163
150
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
164
151
 
165
 
install-client-nokey: all doc
166
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
167
 
        install --directory --mode=u=rwx $(KEYDIR) \
168
 
                $(PREFIX)/lib/mandos/plugins.d
169
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
170
 
                install --mode=u=rwx \
171
 
                        --directory "$(CONFDIR)/plugins.d"; \
172
 
        fi
173
 
        install --mode=u=rwx,go=rx \
174
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
175
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
152
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
153
        install --directory --parents $(PREFIX)/lib/mandos \
 
154
                $(CONFDIR) $(MANDIR)/man8
 
155
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
156
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
157
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
158
                plugin-runner
 
159
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
176
160
                mandos-keygen
177
 
        install --mode=u=rwx,go=rx \
 
161
        install --mode=0755 \
178
162
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
179
163
                plugins.d/password-prompt
180
 
        install --mode=u=rwxs,go=rx \
181
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
182
 
                plugins.d/mandos-client
183
 
        install --mode=u=rwxs,go=rx \
184
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
185
 
                plugins.d/usplash
186
 
        install --mode=u=rwxs,go=rx \
187
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
188
 
                plugins.d/splashy
 
164
        install --mode=4755 \
 
165
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
166
                plugins.d/password-request
189
167
        install initramfs-tools-hook \
190
 
                $(INITRAMFSTOOLS)/hooks/mandos
191
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
192
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
168
                /usr/share/initramfs-tools/hooks/mandos
 
169
        install initramfs-tools-hook-conf \
 
170
                /usr/share/initramfs-tools/conf-hooks.d/mandos
193
171
        install initramfs-tools-script \
194
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
195
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
172
                /usr/share/initramfs-tools/scripts/local-top/mandos
196
173
        gzip --best --to-stdout mandos-keygen.8 \
197
174
                > $(MANDIR)/man8/mandos-keygen.8.gz
198
175
        gzip --best --to-stdout plugin-runner.8mandos \
199
176
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
200
177
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
201
178
                > $(MANDIR)/man8/password-prompt.8mandos.gz
202
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
203
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
204
 
 
205
 
install-client: install-client-nokey
206
 
# Post-installation stuff
207
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
179
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
180
                > $(MANDIR)/man8/password-request.8mandos.gz
 
181
        -$(PREFIX)/sbin/mandos-keygen
208
182
        update-initramfs -k all -u
209
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
210
183
 
211
184
uninstall: uninstall-server uninstall-client
212
185
 
213
 
uninstall-server:
 
186
uninstall-server: $(PREFIX)/sbin/mandos
214
187
        -rm --force $(PREFIX)/sbin/mandos \
215
188
                $(MANDIR)/man8/mandos.8.gz \
216
189
                $(MANDIR)/man5/mandos.conf.5.gz \
217
190
                $(MANDIR)/man5/mandos-clients.conf.5.gz
218
 
        update-rc.d -f mandos remove
219
191
        -rmdir $(CONFDIR)
220
192
 
221
193
uninstall-client:
222
194
# Refuse to uninstall client if /etc/crypttab is explicitly configured
223
195
# to use it.
224
196
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
225
 
                $(DESTDIR)/etc/crypttab
 
197
                /etc/crypttab
226
198
        -rm --force $(PREFIX)/sbin/mandos-keygen \
227
199
                $(PREFIX)/lib/mandos/plugin-runner \
228
200
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
229
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
230
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
231
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
232
 
                $(INITRAMFSTOOLS)/hooks/mandos \
233
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
234
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
201
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
202
                /usr/share/initramfs-tools/hooks/mandos \
 
203
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
235
204
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
236
205
                $(MANDIR)/man8/mandos-keygen.8.gz \
237
206
                $(MANDIR)/man8/password-prompt.8mandos.gz \
238
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
239
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
240
 
                rm --force $(CONFDIR)/plugins.d/README; \
241
 
        fi
 
207
                $(MANDIR)/man8/password-request.8mandos.gz
242
208
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
243
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
209
                 $(PREFIX)/lib/mandos $(CONFDIR)
244
210
        update-initramfs -k all -u
245
211
 
246
212
purge: purge-server purge-client
247
213
 
248
214
purge-server: uninstall-server
249
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
250
 
                $(DESTDIR)/etc/default/mandos \
251
 
                $(DESTDIR)/etc/init.d/mandos \
252
 
                $(DESTDIR)/var/run/mandos.pid
 
215
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
253
216
        -rmdir $(CONFDIR)
254
217
 
255
218
purge-client: uninstall-client
256
 
        -shred --remove $(KEYDIR)/seckey.txt
257
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
258
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
259
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
219
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
220
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d