/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

Added configuration files support for mandos-client
Removed plus argument support for mandos-client

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
 
# PREFIX=/usr/local
17
 
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=$(DESTDIR)/usr/share/man
22
 
 
23
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
25
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
26
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
27
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
28
 
GPGME_LIBS=$(shell gpgme-config --libs)
29
16
 
30
17
# Do not change these two
31
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
32
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
18
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
33
19
LDFLAGS=$(COVERAGE)
34
20
 
35
 
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
21
DOCBOOKTOMAN=xsltproc --nonet \
37
22
        --param man.charmap.use.subset          0 \
38
23
        --param make.year.ranges                1 \
39
24
        --param make.single.year.ranges         1 \
40
25
        --param man.output.quietly              1 \
41
 
        --param man.authors.section.enabled     0 \
42
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
43
 
        $(notdir $<); \
44
 
        $(MANPOST) $(notdir $@)
45
 
# DocBook-to-man post-processing to fix a \n escape bug
46
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
26
        --param man.authors.section.enabled     0
47
27
 
48
28
PLUGINS=plugins.d/password-prompt plugins.d/password-request
49
 
PROGS=plugin-runner $(PLUGINS)
50
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
29
PROGS=mandos-client $(PLUGINS)
 
30
DOCS=mandos.8 mandos-client.8mandos mandos-keygen.8 \
51
31
        plugins.d/password-request.8mandos \
52
32
        plugins.d/password-prompt.8mandos mandos.conf.5 \
53
 
        mandos-clients.conf.5
 
33
         mandos-clients.conf.5
54
34
 
55
 
objects=$(addsuffix .o,$(PROGS))
 
35
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
56
36
 
57
37
all: $(PROGS)
58
38
 
59
39
doc: $(DOCS)
60
40
 
61
 
%.5: %.xml legalnotice.xml
62
 
        $(DOCBOOKTOMAN)
63
 
 
64
 
%.8: %.xml legalnotice.xml
65
 
        $(DOCBOOKTOMAN)
66
 
 
67
 
%.8mandos: %.xml legalnotice.xml
68
 
        $(DOCBOOKTOMAN)
69
 
 
70
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
71
 
        $(DOCBOOKTOMAN)
72
 
 
73
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
74
 
        $(DOCBOOKTOMAN)
75
 
 
76
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
77
 
        $(DOCBOOKTOMAN)
78
 
 
79
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
80
 
        $(DOCBOOKTOMAN)
81
 
 
82
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
83
 
                                        mandos-options.xml \
84
 
                                        overview.xml legalnotice.xml
85
 
        $(DOCBOOKTOMAN)
 
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 $@
86
52
 
87
53
plugins.d/password-request: plugins.d/password-request.o
88
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
89
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
90
 
 
91
 
.PHONY : all doc clean distclean run-client run-server install \
 
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 \
92
61
        install-server install-client uninstall uninstall-server \
93
62
        uninstall-client purge purge-server purge-client
94
63
 
98
67
distclean: clean
99
68
mostlyclean: clean
100
69
maintainer-clean: clean
101
 
        -rm --force --recursive keydir confdir
 
70
        -rm --force --recursive keydir
102
71
 
103
72
check:
104
73
        ./mandos --check
105
74
 
106
 
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
108
 
        keydir/secring.gpg keydir/pubring.gpg
109
 
        ./plugin-runner --plugin-dir=plugins.d \
110
 
                --config-file=plugin-runner.conf \
 
75
run-client: all
 
76
        -mkdir keydir
 
77
        -./mandos-keygen --dir keydir
 
78
        ./mandos-client --plugin-dir=plugins.d \
111
79
                --options-for=password-request:--keydir=keydir
112
80
 
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 $^
118
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
 
        install --directory keydir
120
 
        ./mandos-keygen --dir keydir --force
121
 
 
122
 
# Run the server with a local config
123
 
run-server: confdir/mandos.conf confdir/clients.conf
124
 
        ./mandos --debug --configdir=confdir
125
 
 
126
 
# Used by run-server
127
 
confdir/mandos.conf: mandos.conf
128
 
        install --directory confdir
129
 
        install $^ $@
130
 
confdir/clients.conf: clients.conf keydir/seckey.txt
131
 
        install --directory confdir
132
 
        install clients.conf $@
133
 
# Add a client password
134
 
        ./mandos-keygen --dir keydir --password >> $@
 
81
run-server:
 
82
        ./mandos --debug --configdir=.
135
83
 
136
84
install: install-server install-client
137
85
 
138
86
install-server: doc
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) \
 
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 \
144
91
                clients.conf
145
92
        gzip --best --to-stdout mandos.8 \
146
 
                > $(MANDIR)/man8/mandos.8.gz
 
93
                > /usr/share/man/man8/mandos.8.gz
147
94
        gzip --best --to-stdout mandos.conf.5 \
148
 
                > $(MANDIR)/man5/mandos.conf.5.gz
 
95
                > /usr/share/man/man5/mandos.conf.5.gz
149
96
        gzip --best --to-stdout mandos-clients.conf.5 \
150
 
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
97
                > /usr/share/man/man5/mandos-clients.conf.5.gz
151
98
 
152
99
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 \
160
 
                mandos-keygen
 
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
161
106
        install --mode=0755 \
162
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
107
                --target-directory=/usr/lib/mandos/plugins.d \
163
108
                plugins.d/password-prompt
164
109
        install --mode=4755 \
165
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
110
                --target-directory=/usr/lib/mandos/plugins.d \
166
111
                plugins.d/password-request
167
112
        install initramfs-tools-hook \
168
113
                /usr/share/initramfs-tools/hooks/mandos
169
114
        install initramfs-tools-hook-conf \
170
115
                /usr/share/initramfs-tools/conf-hooks.d/mandos
171
 
        install initramfs-tools-script \
172
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
173
116
        gzip --best --to-stdout mandos-keygen.8 \
174
 
                > $(MANDIR)/man8/mandos-keygen.8.gz
175
 
        gzip --best --to-stdout plugin-runner.8mandos \
176
 
                > $(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
177
120
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
178
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
 
121
                > /usr/share/man/man8/password-prompt.8mandos.gz
179
122
        gzip --best --to-stdout plugins.d/password-request.8mandos \
180
 
                > $(MANDIR)/man8/password-request.8mandos.gz
181
 
        -$(PREFIX)/sbin/mandos-keygen
 
123
                > /usr/share/man/man8/password-request.8mandos.gz
 
124
        -/usr/sbin/mandos-keygen
182
125
        update-initramfs -k all -u
183
126
 
184
127
uninstall: uninstall-server uninstall-client
185
128
 
186
 
uninstall-server: $(PREFIX)/sbin/mandos
187
 
        -rm --force $(PREFIX)/sbin/mandos \
188
 
                $(MANDIR)/man8/mandos.8.gz \
189
 
                $(MANDIR)/man5/mandos.conf.5.gz \
190
 
                $(MANDIR)/man5/mandos-clients.conf.5.gz
191
 
        -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 /etc/mandos
192
134
 
193
135
uninstall-client:
194
 
# Refuse to uninstall client if /etc/crypttab is explicitly configured
195
 
# to use it.
196
 
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
 
136
# Refuse to uninstall client if /etc/crypttab is configured to use it
 
137
        ! grep --regexp='^ *[^ #].*keyscript=/usr/lib/mandos/mandos-client' \
197
138
                /etc/crypttab
198
 
        -rm --force $(PREFIX)/sbin/mandos-keygen \
199
 
                $(PREFIX)/lib/mandos/plugin-runner \
200
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
201
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
139
        -rm --force /usr/sbin/mandos-keygen \
 
140
                /usr/lib/mandos/mandos-client \
 
141
                /usr/lib/mandos/plugins.d/password-prompt \
 
142
                /usr/lib/mandos/plugins.d/password-request \
202
143
                /usr/share/initramfs-tools/hooks/mandos \
203
144
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
204
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
205
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
206
 
                $(MANDIR)/man8/password-prompt.8mandos.gz \
207
 
                $(MANDIR)/man8/password-request.8mandos.gz
208
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
209
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
210
 
        update-initramfs -k all -u
 
145
                /usr/share/man/man8/mandos-client.8mandos.gz \
 
146
                /usr/share/man/man8/mandos-keygen.8.gz \
 
147
                /usr/share/man/man8/password-prompt.8mandos.gz \
 
148
                /usr/share/man/man8/password-request.8mandos.gz
 
149
        -rmdir /usr/lib/mandos/plugins.d /usr/lib/mandos \
 
150
                /etc/mandos/plugins.d /etc/mandos
211
151
 
212
152
purge: purge-server purge-client
213
153
 
214
154
purge-server: uninstall-server
215
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
216
 
        -rmdir $(CONFDIR)
 
155
        -rm --force /etc/mandos/mandos.conf /etc/mandos/clients.conf
 
156
        -rmdir /etc/mandos
217
157
 
218
158
purge-client: uninstall-client
219
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
220
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
159
        -rm --force /etc/mandos/seckey.txt /etc/mandos/pubkey.txt
 
160
        -rmdir /etc/mandos /etc/mandos/plugins.d