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