/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-24 23:03:31 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080924230331-2qvhppypeo852ksr
* Makefile (PLUGINS): Added "plugins.d/usplash".
  (install-client-nokey): Add setuid bit on "plugins.d/usplash".

* plugins.d/splashy.c (main): Move "sret" to top.

* plugins.d/usplash: Removed.
* plugins.d/usplash.c: New.

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