/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-07 15:42:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080907154211-sc90y38lazc4ewfq
* initramfs-tools-script: Fix permissions of "/tmp" in initrd.

* plugin-runner.c (parse_opt): Ignore empty argument strings.

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