/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 21:42:02 UTC
  • mfrom: (24.1.89 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080904214202-md7u3n1yqng8vz82
* Makefile (run-client): Do not depend on the key ring files.
  (keydir/secring.gpg, keydir/pubring.gpg): Removed.
  (confdir/mandos.conf): Install with proper mode.
  (confdir/clients.conf): - '' -

* mandos-keygen: Use a temporary directory with key ring files instead
                 of separate temporary key ring files.  Removed
                 "--no-random-seed" and "--no-permission-warning" from
                 all gpg invocations.

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