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
- browse files at revision 69
- compare with another revision
- download diff
- download tarball
- view history from revision 69
- Committer: Teddy Hogeborn
- Date: 2008-08-12 19:39:36 UTC
- mfrom: (24.1.47 mandos)
- Revision ID: teddy@fukt.bsnet.se-20080812193936-hk8sas7p4j1miwl4
Merge.
- files added:
- network-protocol.txt
- files removed:
- .bzr-builddeb
- debian
- debian/po
- files renamed:
- plugin-runner.c => mandos-client.c
- plugin-runner.xml => mandos-client.xml
- plugins.d/mandos-client.c => plugins.d/password-request.c
- plugins.d/mandos-client.xml => plugins.d/password-request.xml
- files modified:
- Makefile
added
removed
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
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
LINK_FORTIFY_LD=-z relro -fPIE
14
LINK_FORTIFY=-pie
15
#COVERAGE=--coverage
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
13
#COVERAGE=-fprofile-arcs -ftest-coverage
16
14
OPTIMIZE=-Os
17
15
LANGUAGE=-std=gnu99
18
htmldir=man
19
version=1.0.4
20
SED=sed
21
22
## Use these settings for a traditional /usr/local install
23
# PREFIX=$(DESTDIR)/usr/local
24
# CONFDIR=$(DESTDIR)/etc/mandos
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
26
# MANDIR=$(PREFIX)/man
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
28
##
29
30
## These settings are for a package-type install
31
PREFIX=$(DESTDIR)/usr
32
CONFDIR=$(DESTDIR)/etc/mandos
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
34
MANDIR=$(PREFIX)/share/man
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
##
37
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
GPGME_LIBS=$(shell gpgme-config --libs)
44
16
45
17
# Do not change these two
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
-DVERSION='"$(version)"'
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
18
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
19
LDFLAGS=$(COVERAGE)
50
20
51
# Commands to format a DocBook <refentry> document into a manual page
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
21
DOCBOOKTOMAN=xsltproc --nonet \
53
22
--param man.charmap.use.subset 0 \
54
23
--param make.year.ranges 1 \
55
24
--param make.single.year.ranges 1 \
56
25
--param man.output.quietly 1 \
57
--param man.authors.section.enabled 0 \
58
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
$(notdir $<); \
60
$(MANPOST) $(notdir $@)
61
# DocBook-to-man post-processing to fix a '\n' escape bug
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
65
--param make.year.ranges 1 \
66
--param make.single.year.ranges 1 \
67
--param man.output.quietly 1 \
68
--param man.authors.section.enabled 0 \
69
--param citerefentry.link 1 \
70
--output $@ \
71
/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
$<; $(HTMLPOST) $@
73
# Fix citerefentry links
74
HTMLPOST=$(SED) --in-place \
75
--expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
76
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
CPROGS=plugin-runner $(PLUGINS)
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
plugins.d/mandos-client.8mandos \
26
--param man.authors.section.enabled 0
27
28
PLUGINS=plugins.d/password-prompt plugins.d/password-request
29
PROGS=mandos-client $(PLUGINS)
30
DOCS=mandos.8 mandos-client.8mandos mandos-keygen.8 \
31
plugins.d/password-request.8mandos \
83
32
plugins.d/password-prompt.8mandos mandos.conf.5 \
84
plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
86
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
89
objects=$(addsuffix .o,$(CPROGS))
90
91
all: $(PROGS) mandos.lsm
33
mandos-clients.conf.5
34
35
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
36
37
all: $(PROGS)
92
38
93
39
doc: $(DOCS)
94
40
95
html: $(htmldocs)
96
97
%.5: %.xml common.ent legalnotice.xml
98
$(DOCBOOKTOMAN)
99
%.5.xhtml: %.xml common.ent legalnotice.xml
100
$(DOCBOOKTOHTML)
101
102
%.8: %.xml common.ent legalnotice.xml
103
$(DOCBOOKTOMAN)
104
%.8.xhtml: %.xml common.ent legalnotice.xml
105
$(DOCBOOKTOHTML)
106
107
%.8mandos: %.xml common.ent legalnotice.xml
108
$(DOCBOOKTOMAN)
109
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
$(DOCBOOKTOHTML)
111
112
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
legalnotice.xml
114
$(DOCBOOKTOMAN)
115
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
116
overview.xml legalnotice.xml
117
$(DOCBOOKTOHTML)
118
119
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
120
legalnotice.xml
121
$(DOCBOOKTOMAN)
122
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
123
legalnotice.xml
124
$(DOCBOOKTOHTML)
125
126
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
legalnotice.xml
128
$(DOCBOOKTOMAN)
129
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
130
legalnotice.xml
131
$(DOCBOOKTOHTML)
132
133
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
134
legalnotice.xml
135
$(DOCBOOKTOMAN)
136
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
137
overview.xml legalnotice.xml
138
$(DOCBOOKTOHTML)
139
140
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
141
common.ent \
142
mandos-options.xml \
143
overview.xml legalnotice.xml
144
$(DOCBOOKTOMAN)
145
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
146
common.ent \
147
mandos-options.xml \
148
overview.xml legalnotice.xml
149
$(DOCBOOKTOHTML)
150
151
# Update all these files with version number $(version)
152
common.ent: Makefile
153
$(SED) --in-place \
154
--expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
$@
156
157
mandos: Makefile
158
$(SED) --in-place \
159
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
$@
161
162
mandos-keygen: Makefile
163
$(SED) --in-place \
164
--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
$@
166
167
mandos-ctl: Makefile
168
$(SED) --in-place \
169
--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
$@
171
172
mandos.lsm: Makefile
173
$(SED) --in-place \
174
--expression='s/^\(Version:\).*/\1\t$(version)/' \
175
$@
176
$(SED) --in-place \
177
--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
$@
179
$(SED) --in-place \
180
--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
$@
182
183
plugins.d/mandos-client: plugins.d/mandos-client.o
184
$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
186
187
.PHONY : all doc html clean distclean run-client run-server install \
41
%.5: %.xml
42
cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
43
44
%.8: %.xml
45
cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
46
47
%.8mandos: %.xml
48
cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
49
50
mandos-client: mandos-client.o
51
$(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
52
53
plugins.d/password-request: plugins.d/password-request.o
54
$(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
55
$(LOADLIBES) $(LDLIBS) -o $@
56
57
plugins.d/password-prompt: plugins.d/password-prompt.o
58
$(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
59
60
.PHONY : all clean distclean run-client run-server install \
188
61
install-server install-client uninstall uninstall-server \
189
62
uninstall-client purge purge-server purge-client
190
63
191
64
clean:
192
-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
65
-rm --force $(PROGS) $(objects) $(DOCS) core
193
66
194
67
distclean: clean
195
68
mostlyclean: clean
196
69
maintainer-clean: clean
197
-rm --force --recursive keydir confdir
70
-rm --force --recursive keydir
198
71
199
check: all
72
check:
200
73
./mandos --check
201
74
202
# Run the client with a local config and key
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
./plugin-runner --plugin-dir=plugins.d \
205
--config-file=plugin-runner.conf \
206
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
$(CLIENTARGS)
208
209
# Used by run-client
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
211
install --directory keydir
212
./mandos-keygen --dir keydir --force
213
214
# Run the server with a local config
215
run-server: confdir/mandos.conf confdir/clients.conf
216
./mandos --debug --configdir=confdir $(SERVERARGS)
217
218
# Used by run-server
219
confdir/mandos.conf: mandos.conf
220
install --directory confdir
221
install --mode=u=rw,go=r $^ $@
222
confdir/clients.conf: clients.conf keydir/seckey.txt
223
install --directory confdir
224
install --mode=u=rw $< $@
225
# Add a client password
226
./mandos-keygen --dir keydir --password >> $@
227
228
install: install-server install-client-nokey
229
230
install-html: html
231
install --directory $(htmldir)
232
install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
$(htmldocs)
75
run-client: all
76
-mkdir keydir
77
-./mandos-keygen --dir keydir
78
./mandos-client --plugin-dir=plugins.d \
79
--options-for=password-request:--keydir=keydir
80
81
run-server:
82
./mandos --debug --configdir=.
83
84
install: install-server install-client
234
85
235
86
install-server: doc
236
install --directory $(CONFDIR)
237
install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
238
install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
239
mandos.conf
240
install --mode=u=rw --target-directory=$(CONFDIR) \
87
mkdir --mode=0755 --parents /etc/mandos
88
install --mode=0755 mandos /usr/sbin/mandos
89
install --mode=0644 --target-directory=/etc/mandos mandos.conf
90
install --mode=0640 --target-directory=/etc/mandos \
241
91
clients.conf
242
install --mode=u=rwx,go=rx init.d-mandos \
243
$(DESTDIR)/etc/init.d/mandos
244
install --mode=u=rw,go=r default-mandos \
245
$(DESTDIR)/etc/default/mandos
246
if [ -z $(DESTDIR) ]; then \
247
update-rc.d mandos defaults 25 15;\
248
fi
249
92
gzip --best --to-stdout mandos.8 \
250
> $(MANDIR)/man8/mandos.8.gz
93
> /usr/share/man/man8/mandos.8.gz
251
94
gzip --best --to-stdout mandos.conf.5 \
252
> $(MANDIR)/man5/mandos.conf.5.gz
95
> /usr/share/man/man5/mandos.conf.5.gz
253
96
gzip --best --to-stdout mandos-clients.conf.5 \
254
> $(MANDIR)/man5/mandos-clients.conf.5.gz
97
> /usr/share/man/man5/mandos-clients.conf.5.gz
255
98
256
install-client-nokey: all doc
257
install --directory $(PREFIX)/lib/mandos $(CONFDIR)
258
install --directory --mode=u=rwx $(KEYDIR) \
259
$(PREFIX)/lib/mandos/plugins.d
260
if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
261
install --mode=u=rwx \
262
--directory "$(CONFDIR)/plugins.d"; \
263
fi
264
install --mode=u=rwx,go=rx \
265
--target-directory=$(PREFIX)/lib/mandos plugin-runner
266
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
267
mandos-keygen
268
install --mode=u=rwx,go=rx \
269
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
99
install-client: all doc /usr/share/initramfs-tools/hooks/.
100
mkdir --mode=0755 --parents /usr/lib/mandos /etc/mandos
101
mkdir --mode=0700 /usr/lib/mandos/plugins.d
102
chmod u=rwx,g=,o= /usr/lib/mandos/plugins.d
103
install --mode=0755 --target-directory=/usr/lib/mandos \
104
mandos-client
105
install --mode=0755 --target-directory=/usr/sbin mandos-keygen
106
install --mode=0755 \
107
--target-directory=/usr/lib/mandos/plugins.d \
270
108
plugins.d/password-prompt
271
install --mode=u=rwxs,go=rx \
272
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
273
plugins.d/mandos-client
274
install --mode=u=rwxs,go=rx \
275
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
276
plugins.d/usplash
277
install --mode=u=rwxs,go=rx \
278
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
279
plugins.d/splashy
280
install --mode=u=rwxs,go=rx \
281
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
282
plugins.d/askpass-fifo
109
install --mode=4755 \
110
--target-directory=/usr/lib/mandos/plugins.d \
111
plugins.d/password-request
283
112
install initramfs-tools-hook \
284
$(INITRAMFSTOOLS)/hooks/mandos
285
install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
$(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
install initramfs-tools-script \
288
$(INITRAMFSTOOLS)/scripts/local-top/mandos
289
install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
113
/usr/share/initramfs-tools/hooks/mandos
114
install initramfs-tools-hook-conf \
115
/usr/share/initramfs-tools/conf-hooks.d/mandos
290
116
gzip --best --to-stdout mandos-keygen.8 \
291
> $(MANDIR)/man8/mandos-keygen.8.gz
292
gzip --best --to-stdout plugin-runner.8mandos \
293
> $(MANDIR)/man8/plugin-runner.8mandos.gz
117
> /usr/share/man/man8/mandos-keygen.8.gz
118
gzip --best --to-stdout mandos-client.8mandos \
119
> /usr/share/man/man8/mandos-client.8mandos.gz
294
120
gzip --best --to-stdout plugins.d/password-prompt.8mandos \
295
> $(MANDIR)/man8/password-prompt.8mandos.gz
296
gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
> $(MANDIR)/man8/mandos-client.8mandos.gz
298
gzip --best --to-stdout plugins.d/usplash.8mandos \
299
> $(MANDIR)/man8/usplash.8mandos.gz
300
gzip --best --to-stdout plugins.d/splashy.8mandos \
301
> $(MANDIR)/man8/splashy.8mandos.gz
302
gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
> $(MANDIR)/man8/askpass-fifo.8mandos.gz
304
305
install-client: install-client-nokey
306
# Post-installation stuff
307
-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
121
> /usr/share/man/man8/password-prompt.8mandos.gz
122
gzip --best --to-stdout plugins.d/password-request.8mandos \
123
> /usr/share/man/man8/password-request.8mandos.gz
124
/usr/sbin/mandos-keygen
308
125
update-initramfs -k all -u
309
echo "Now run mandos-keygen --password --dir $(KEYDIR)"
310
126
311
127
uninstall: uninstall-server uninstall-client
312
128
313
uninstall-server:
314
-rm --force $(PREFIX)/sbin/mandos \
315
$(MANDIR)/man8/mandos.8.gz \
316
$(MANDIR)/man5/mandos.conf.5.gz \
317
$(MANDIR)/man5/mandos-clients.conf.5.gz
318
update-rc.d -f mandos remove
319
-rmdir $(CONFDIR)
129
uninstall-server: /usr/sbin/mandos
130
-rm --force /usr/sbin/mandos /usr/share/man/man8/mandos.8.gz \
131
/usr/share/man/man5/mandos.conf.5.gz \
132
/usr/share/man/man5/mandos-clients.conf.5.gz
133
-rmdir --force /etc/mandos
320
134
321
135
uninstall-client:
322
# Refuse to uninstall client if /etc/crypttab is explicitly configured
323
# to use it.
324
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
325
$(DESTDIR)/etc/crypttab
326
-rm --force $(PREFIX)/sbin/mandos-keygen \
327
$(PREFIX)/lib/mandos/plugin-runner \
328
$(PREFIX)/lib/mandos/plugins.d/password-prompt \
329
$(PREFIX)/lib/mandos/plugins.d/mandos-client \
330
$(PREFIX)/lib/mandos/plugins.d/usplash \
331
$(PREFIX)/lib/mandos/plugins.d/splashy \
332
$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
$(INITRAMFSTOOLS)/hooks/mandos \
334
$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
$(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
$(MANDIR)/man8/plugin-runner.8mandos.gz \
337
$(MANDIR)/man8/mandos-keygen.8.gz \
338
$(MANDIR)/man8/password-prompt.8mandos.gz \
339
$(MANDIR)/man8/usplash.8mandos.gz \
340
$(MANDIR)/man8/splashy.8mandos.gz \
341
$(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
$(MANDIR)/man8/mandos-client.8mandos.gz
343
-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
345
update-initramfs -k all -u
136
-rm --force /usr/sbin/mandos-keygen \
137
/usr/lib/mandos/mandos-client \
138
/usr/lib/mandos/plugins.d/password-prompt \
139
/usr/lib/mandos/plugins.d/password-request \
140
/usr/share/initramfs-tools/hooks/mandos \
141
/usr/share/initramfs-tools/conf-hooks.d/mandos \
142
/usr/share/man/man8/mandos-client.8mandos.gz \
143
/usr/share/man/man8/mandos-keygen.8.gz \
144
/usr/share/man/man8/password-prompt.8mandos.gz \
145
/usr/share/man/man8/password-request.8mandos.gz
146
-rmdir --force /usr/lib/mandos/plugins.d /usr/lib/mandos \
147
/etc/mandos/plugins.d /etc/mandos
346
148
347
149
purge: purge-server purge-client
348
150
349
151
purge-server: uninstall-server
350
-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
351
$(DESTDIR)/etc/default/mandos \
352
$(DESTDIR)/etc/init.d/mandos \
353
$(DESTDIR)/var/run/mandos.pid
354
-rmdir $(CONFDIR)
152
-rm --force /etc/mandos/server.conf /etc/mandos/clients.conf
153
-rmdir --force /etc/mandos
355
154
356
155
purge-client: uninstall-client
357
-shred --remove $(KEYDIR)/seckey.txt
358
-rm --force $(CONFDIR)/plugin-runner.conf \
359
$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
360
-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
156
-rm --force /etc/mandos/seckey.txt /etc/mandos/pubkey.txt
157
-rmdir --force /etc/mandos
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0